public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project
@ 2023-10-20  9:55 Dodji Seketeli
  2023-10-20  9:57 ` [PATCH 1/7, applied] suppression: Add "changed_enumerators_regexp" property Dodji Seketeli
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20  9:55 UTC (permalink / raw)
  To: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala; +Cc: libabigail, dodji

Hello,

The check-uapi.sh script uses abidiff to validate backwards
compatibility of the Linux Kernel UAPI headers.  It does so by
comparing modified headers' ABI before and after a patch is applied.

The script is being reviewed upstream, notably at
https://lore.kernel.org/lkml/20230407203456.27141-1-quic_johmoo@quicinc.com/.

During that review, it appeared that libabigail needs a number of
improvements to support this Linux Kernel UAPI checker project.

From a discussion on the mailing list[1], John Moon laid out the 3
areas that need improvement in libabigail:

    1. Extend the suppression specification engine to better support enum
    expansion by adding support for this kind type suppression:

	[suppress_type]
	  type_kind = enum

    2. Extend the suppression specification engine to support suppressing
    change reports involving new data members being added right before
    flexible array data members with this kind of type suppression:

	[suppress_type]
	  type_kind = struct
	  name = foo
	  has_data_member_inserted_at = offset_of_flexible_array_data_member
	  has_size_change = yes

    3. Better support representing changes to anonymous enum, union and
    struct types.


Item 1/ is handled by the first patch:
    suppression: Add "changed_enumerators_regexp" property

Item 2/ is handled by the sixth patch:
    Support suppressing data member insertion before a flexible array
    member

Item 3/ is handled by patches three to five:
    ir,comparison,corpus: Better support anonymous enums comparison

    ir,comparison: Represent changed anonymous enums

    comparison: Represent changed unreachable anonymous unions,
    structs & enums

The last patch is a rewrite of the support of the (existing) handling
of the "end" keyword in terms of the concept of "named boundary"
introduced by the sixth patch.  Note that the "end" keyword is used in
suppression specifications like this one:

    [suppress_type]
      type_kind = struct
      name = foo
      has_data_member_inserted_at = end
      has_size_change = yes

That last patch thus makes the new "named boundary" concept used in a
consistent way in the source code, making it more maintainable.

This patch set has been applied to the master branch.

Thanks.

Dodji Seketeli (6):
  default-reporter,reporter-priv: Do not report names of anonymous enums
  ir,comparison,corpus: Better support anonymous enums comparison
  ir,comparison: Represent changed anonymous enums
  comparison: Represent changed unreachable anonymous unions, structs &
    enums
  Support suppressing data member insertion before a flexible array
    member
  suppression: Make the "end" data member offset selector be named
    boundary

John Moon (1):
  suppression: Add "changed_enumerators_regexp" property

 doc/manuals/libabigail-concepts.rst           |    30 +
 include/abg-fwd.h                             |    53 +
 include/abg-ir.h                              |    11 +
 include/abg-suppression.h                     |    33 +
 src/abg-comparison.cc                         |   152 +-
 src/abg-corpus.cc                             |     4 +-
 src/abg-default-reporter.cc                   |    12 +-
 src/abg-ir.cc                                 |   358 +-
 src/abg-reporter-priv.cc                      |    11 +-
 src/abg-suppression-priv.h                    |     1 +
 src/abg-suppression.cc                        |   187 +-
 tests/data/Makefile.am                        |    44 +
 .../test-anon-types-report-1.txt              |    31 +
 .../test-abidiff-exit/test-anon-types-v0.c    |    42 +
 .../test-abidiff-exit/test-anon-types-v0.o    |   Bin 0 -> 3240 bytes
 .../test-abidiff-exit/test-anon-types-v1.c    |    33 +
 .../test-abidiff-exit/test-anon-types-v1.o    |   Bin 0 -> 3168 bytes
 .../test-anonymous-enums-change-report-v0.txt |    16 +
 .../test-anonymous-enums-change-report-v1.txt |    21 +
 .../test-anonymous-enums-change-v0.c          |    36 +
 .../test-anonymous-enums-change-v0.o          |   Bin 0 -> 3296 bytes
 .../test-anonymous-enums-change-v1.c          |    41 +
 .../test-anonymous-enums-change-v1.o          |   Bin 0 -> 3336 bytes
 .../test-abidiff-exit/test-fam1-report-1.txt  |    14 +
 .../test-abidiff-exit/test-fam1-report-2.txt  |     3 +
 .../test-abidiff-exit/test-fam1-report-3.txt  |    14 +
 .../test-abidiff-exit/test-fam1-report-4.txt  |     3 +
 .../test-abidiff-exit/test-fam1-report-5.txt  |    14 +
 .../test-fam1-suppr-1.abignore                |     4 +
 .../test-fam1-suppr-2.abignore                |     3 +
 .../test-fam1-suppr-3.abignore                |     5 +
 .../test-fam1-suppr-4.abignore                |     5 +
 tests/data/test-abidiff-exit/test-fam1-v0.c   |    10 +
 tests/data/test-abidiff-exit/test-fam1-v0.o   |   Bin 0 -> 3184 bytes
 tests/data/test-abidiff-exit/test-fam1-v1.c   |    11 +
 tests/data/test-abidiff-exit/test-fam1-v1.o   |   Bin 0 -> 3224 bytes
 .../test-abidiff-exit/test-fam2-report-1.txt  |    14 +
 tests/data/test-abidiff-exit/test-fam2-v0.c   |    10 +
 tests/data/test-abidiff-exit/test-fam2-v0.o   |   Bin 0 -> 3184 bytes
 tests/data/test-abidiff-exit/test-fam2-v1.c   |    12 +
 tests/data/test-abidiff-exit/test-fam2-v1.o   |   Bin 0 -> 3232 bytes
 tests/data/test-annotate/libtest23.so.abi     |   224 +-
 .../test-anonymous-members-0.o.abi            |    22 +-
 .../data/test-annotate/test15-pr18892.so.abi  |     8 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    54 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |    10 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |     2 +-
 .../test43-PR22913-report-0.txt               |     4 +-
 ...merator-changes-enumerator-changes-1.suppr |     3 +
 ...merator-changes-enumerator-changes-2.suppr |     3 +
 ...merator-changes-enumerator-changes-3.suppr |     3 +
 ...merator-changes-enumerator-changes-4.suppr |     3 +
 ...merator-changes-enumerator-changes-5.suppr |     3 +
 ...or-changes-enumerator-changes-report-0.txt |    29 +
 ...or-changes-enumerator-changes-report-1.txt |    21 +
 ...or-changes-enumerator-changes-report-2.txt |    21 +
 ...or-changes-enumerator-changes-report-3.txt |    13 +
 ...or-changes-enumerator-changes-report-4.txt |    21 +
 ...or-changes-enumerator-changes-report-5.txt |     3 +
 ...enumerator-changes-enumerator-changes-v0.c |    37 +
 ...enumerator-changes-enumerator-changes-v0.o |   Bin 0 -> 3944 bytes
 ...enumerator-changes-enumerator-changes-v1.c |    40 +
 ...enumerator-changes-enumerator-changes-v1.o |   Bin 0 -> 4064 bytes
 .../test-read-dwarf/PR22122-libftdc.so.abi    | 12416 ++++++++--------
 tests/data/test-read-dwarf/libtest23.so.abi   |   216 +-
 .../test-read-dwarf/test-libandroid.so.abi    |    44 +-
 .../test-read-dwarf/test16-pr18904.so.abi     |  1816 +--
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    40 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |    60 +-
 tests/test-abidiff-exit.cc                    |   153 +
 tests/test-diff-suppr.cc                      |    60 +
 71 files changed, 9022 insertions(+), 7545 deletions(-)
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-report-1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v1.o
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-2.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-3.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-4.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-5.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-1.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-2.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-3.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-4.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v1.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-report-1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v1.o
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.c
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.c
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o

-- 
2.39.3


-- 
		Dodji


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

* [PATCH 1/7, applied] suppression: Add "changed_enumerators_regexp" property
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
@ 2023-10-20  9:57 ` Dodji Seketeli
  2023-10-20  9:58 ` [PATCH 2/7, applied] default-reporter,reporter-priv: Do not report names of anonymous enums Dodji Seketeli
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20  9:57 UTC (permalink / raw)
  To: John Moon; +Cc: Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail, dodji

Hello,

Currently, users are able to suppress changes to enumerator variants
matching names specified in "changed_enumerators", but can't specify
regular expressions.

A common pattern when using enums is to have the final enum variant
labeled as "*_MAX" or "*_LAST" so that users of the enum can have a
way to determine how many variants there are. In these cases, when
expanding an enum, the last variant will change, but that's an
expected result that users may not want to flag as an ABI-breaking
change.

For example, if you have a change like this:

enum foo {
        FOO,
        BAR,
        FOOBAR_MAX,
};

...

enum foo {
        FOO,
        BAR,
        BAZ,
        FOOBAR_MAX,
};

abidiff reports:

1 changed type unreachable from any public interface:

  [C] 'enum foo' changed:
    type size hasn't changed
    1 enumerator insertion:
      'foo::BAZ' value '2'
    1 enumerator change:
      'foo::FOOBAR_MAX' from value '2' to '3' at test_2.c:1:1

With a new changed_enumerators_regexp property, users can specify a
suppression which stops abidiff from emitting this diff for any
members which match the regular expressions in the list:

[suppress_type]
  type_kind = enum
  changed_enumerators_regexp = .*_MAX$, .*_LAST$, .*_NUM$, .*_NBITS$

	* include/abg-suppression.h
	(type_suppression::{g,s}et_changed_enumerators_regexp): Declare new
	accessor functions.
	* src/abg-suppression-priv.h
	(type_suppression::priv::changed_enumerators_regexp_): Define new
	data member.
	* src/abg-suppression.cc
	(type_suppression::{g,s}et_changed_enumerators_regexp): Define new
	accessor function.
	(type_suppression::suppresses_diff): For a type suppression to
	match an enum_diff, the names of all changed enumerators must
	match either the names returned by
	type_suppression::get_changed_enumerator_names or one of the
	regexps returned by the new member function
	type_suppression::get_changed_enumerators_regexp.
	(read_type_suppression): Parse the new
	'changed_enumerators_regexp' property to set the
	type_suppression::get_changed_enumerators_regexp property.
	* doc/manuals/libabigail-concepts.rst: Add an entry for the new
	'changed_enumerators_regexp' property.
	* tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-[1-5].suppr:
	Add new test suppression files.
	* tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-[0-5].txt:
	Add new test reference output files.
	* tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v{0,1}.c:
	Add source code for new binary test input files.
	* tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v{0,1}.o:
	Add new binary test input files.
	* tests/data/Makefile.am: Add the new test files to the source
	distribution.
	* tests/test-diff-suppr.cc (in_out_specs): Add the new test input
	files to this test harness.

Signed-off-by: John Moon <quic_johmoo@quicinc.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 doc/manuals/libabigail-concepts.rst           |  25 ++++++
 include/abg-suppression.h                     |   6 ++
 src/abg-suppression-priv.h                    |   1 +
 src/abg-suppression.cc                        |  84 +++++++++++++++---
 tests/data/Makefile.am                        |  15 ++++
 ...merator-changes-enumerator-changes-1.suppr |   3 +
 ...merator-changes-enumerator-changes-2.suppr |   3 +
 ...merator-changes-enumerator-changes-3.suppr |   3 +
 ...merator-changes-enumerator-changes-4.suppr |   3 +
 ...merator-changes-enumerator-changes-5.suppr |   3 +
 ...or-changes-enumerator-changes-report-0.txt |  29 ++++++
 ...or-changes-enumerator-changes-report-1.txt |  21 +++++
 ...or-changes-enumerator-changes-report-2.txt |  21 +++++
 ...or-changes-enumerator-changes-report-3.txt |  13 +++
 ...or-changes-enumerator-changes-report-4.txt |  21 +++++
 ...or-changes-enumerator-changes-report-5.txt |   3 +
 ...enumerator-changes-enumerator-changes-v0.c |  37 ++++++++
 ...enumerator-changes-enumerator-changes-v0.o | Bin 0 -> 3944 bytes
 ...enumerator-changes-enumerator-changes-v1.c |  40 +++++++++
 ...enumerator-changes-enumerator-changes-v1.o | Bin 0 -> 4064 bytes
 tests/test-diff-suppr.cc                      |  60 +++++++++++++
 21 files changed, 381 insertions(+), 10 deletions(-)
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.c
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.c
 create mode 100644 tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o

diff --git a/doc/manuals/libabigail-concepts.rst b/doc/manuals/libabigail-concepts.rst
index f64f5229..324c5162 100644
--- a/doc/manuals/libabigail-concepts.rst
+++ b/doc/manuals/libabigail-concepts.rst
@@ -353,6 +353,31 @@ The potential properties of this sections are listed below:
       changed_enumerators = LAST_ENUMERATORS0, LAST_ENUMERATOR1
 
 
+.. _suppr_changed_enumerators_regexp_label:
+
+* ``changed_enumerators_regexp``
+
+  Usage:
+
+    ``changed_enumerators_regexp`` ``=`` <list-of-enumerator-regular-expressions>
+
+  Suppresses change reports involving changes in the value of
+  enumerators of a given enum type.  This property is applied if the
+  ``type_kind`` property is set to the value ``enum``, at least.  The
+  value of the ``changed_enumerators_regexp`` property is a
+  comma-separated list of regular expressions that should match the
+  names of the enumerators that the user expects to change.  For
+  instance: ::
+
+      changed_enumerators_regexp = .*_MAX$, .*_LAST$, .*_NUM$, .*_NBITS$
+
+  In the example above, change reports to any enumerator which name
+  ends with _MAX, _LAST, _NUM or _NBITS will be suppressed.
+
+  Note that for this property to be applied to changes to an enum
+  type, the size of the enum type must *NOT* have changed.
+
+
 * ``drop``
 
  Usage:
diff --git a/include/abg-suppression.h b/include/abg-suppression.h
index 6b62f64d..cbb16207 100644
--- a/include/abg-suppression.h
+++ b/include/abg-suppression.h
@@ -330,6 +330,12 @@ public:
   void
   set_changed_enumerator_names(const vector<string>&);
 
+  const vector<regex::regex_t_sptr>&
+  get_changed_enumerators_regexp() const;
+
+  void
+  set_changed_enumerators_regexp(const vector<regex::regex_t_sptr>&);
+
   virtual bool
   suppresses_diff(const diff* diff) const;
 
diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index cf66a9f1..351c5965 100644
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -585,6 +585,7 @@ class type_suppression::priv
   string				source_location_to_keep_regex_str_;
   mutable regex::regex_t_sptr		source_location_to_keep_regex_;
   mutable vector<string>		changed_enumerator_names_;
+  mutable vector<regex::regex_t_sptr>	changed_enumerators_regexp_;
 
   priv();
 
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index 7053e728..f8d065f6 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -770,6 +770,28 @@ void
 type_suppression::set_changed_enumerator_names(const vector<string>& n)
 {priv_->changed_enumerator_names_ = n;}
 
+/// Getter of the vector of the regular expression strings for changed
+/// enumerators that are supposed to be suppressed. Note that this
+/// will be "valid" only if the type suppression has the
+/// 'type_kind = enum' property.
+///
+/// @return the vector of the regular expression strings that are
+/// supposed to match enumertor names to be suppressed.
+const vector<regex::regex_t_sptr>&
+type_suppression::get_changed_enumerators_regexp() const
+{return priv_->changed_enumerators_regexp_;}
+
+/// Setter of the vector of the regular expression strings for changed
+/// enumerators that are supposed to be suppressed. Note that this
+/// will be "valid" only if the type suppression has the
+/// 'type_kind = enum' property.
+///
+/// @param n the vector of the regular expression strings that are
+/// supposed to match enumertor names to be suppressed.
+void
+type_suppression::set_changed_enumerators_regexp(const vector<regex::regex_t_sptr>& n)
+{priv_->changed_enumerators_regexp_ = n;}
+
 /// Evaluate this suppression specification on a given diff node and
 /// say if the diff node should be suppressed or not.
 ///
@@ -1002,9 +1024,12 @@ type_suppression::suppresses_diff(const diff* diff) const
       // ... and yet carries some changed enumerators!
       && !enum_dif->changed_enumerators().empty())
     {
-      // Make sure that all changed enumerators are listed in the
-      // vector of enumerator names returned by the
-      // get_changed_enumerator_names() member function.
+
+      // Make sure that all changed enumerators are either:
+      //  1. listed in the vector of enumerator names returned
+      //     by the get_changed_enumerator_names() member function
+      //  2. match a regular expression returned by the
+      //     get_changed_enumerators_regexp() member function
       bool matched = true;
       for (string_changed_enumerator_map::const_iterator i =
 	     enum_dif->changed_enumerators().begin();
@@ -1012,13 +1037,20 @@ type_suppression::suppresses_diff(const diff* diff) const
 	   ++i)
 	{
 	  matched &= true;
-	  if (std::find(get_changed_enumerator_names().begin(),
-			get_changed_enumerator_names().end(),
-			i->first) == get_changed_enumerator_names().end())
-	    {
-	      matched &= false;
-	      break;
-	    }
+	  if ((std::find(get_changed_enumerator_names().begin(),
+			 get_changed_enumerator_names().end(),
+			 i->first) == get_changed_enumerator_names().end())
+	     &&
+	      (std::find_if(get_changed_enumerators_regexp().begin(),
+			    get_changed_enumerators_regexp().end(),
+			    [&] (const regex_t_sptr& enum_regexp)
+		{
+		  return regex::match(enum_regexp, i->first);
+		}) == get_changed_enumerators_regexp().end()))
+	  {
+	    matched &= false;
+	    break;
+	  }
 	}
       if (!matched)
 	return false;
@@ -2162,6 +2194,34 @@ read_type_suppression(const ini::config::section& section)
 	changed_enumerator_names.push_back(p->get_value()->as_string());
     }
 
+  /// Support 'changed_enumerators_regexp = .*_foo, bar_[0-9]+, baz'
+  ///
+  /// If the current type is an enum and if it carries changed
+  /// enumerators that match regular expressions listed in the
+  /// changed_enumerators_regexp property value then it should be
+  /// suppressed.
+
+  ini::property_sptr changed_enumerators_regexp_prop =
+    section.find_property("changed_enumerators_regexp");
+
+  vector<regex_t_sptr> changed_enumerators_regexp;
+  if (changed_enumerators_regexp_prop)
+    {
+      if (ini::list_property_sptr p =
+	  is_list_property(changed_enumerators_regexp_prop))
+      {
+	for (string e : p->get_value()->get_content())
+	  changed_enumerators_regexp.push_back(regex::compile(e));
+      }
+      else if (ini::simple_property_sptr p =
+	       is_simple_property(changed_enumerators_regexp_prop))
+      {
+	changed_enumerators_regexp.push_back(
+	  regex::compile(p->get_value()->as_string())
+	);
+      }
+    }
+
   if (section.get_name() == "suppress_type")
     result.reset(new type_suppression(label_str, name_regex_str, name_str));
   else if (section.get_name() == "allow_type")
@@ -2225,6 +2285,10 @@ read_type_suppression(const ini::config::section& section)
       && !changed_enumerator_names.empty())
     result->set_changed_enumerator_names(changed_enumerator_names);
 
+  if (result->get_type_kind() == type_suppression::ENUM_TYPE_KIND
+      && !changed_enumerators_regexp.empty())
+    result->set_changed_enumerators_regexp(changed_enumerators_regexp);
+
   return result;
 }
 
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index d1c767b3..1aa37b16 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1760,6 +1760,21 @@ test-diff-suppr/test39-public-headers-dir/test39-header-v0.h \
 test-diff-suppr/test39-public-headers-dir/test39-header-v1.h \
 test-diff-suppr/libtest40-enumerator-changes-v0.so \
 test-diff-suppr/libtest40-enumerator-changes-v1.so \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.c \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.c \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o \
+test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o \
 test-diff-suppr/libtest41-enumerator-changes-v0.so \
 test-diff-suppr/libtest41-enumerator-changes-v1.so \
 test-diff-suppr/test40-enumerator-changes-0.suppr \
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr
new file mode 100644
index 00000000..cbe76ab8
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = enum
+  changed_enumerators_regexp = ^.*_LAST$
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr
new file mode 100644
index 00000000..0ab63c10
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = enum
+  changed_enumerators_regexp = ^.*_MAX$
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr
new file mode 100644
index 00000000..e8bb9117
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = enum
+  changed_enumerators_regexp = ^.*_LAST$, ^.*_MAX$
\ No newline at end of file
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr
new file mode 100644
index 00000000..492dd336
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = enum
+  changed_enumerators_regexp = ^LAST_.*$
\ No newline at end of file
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr
new file mode 100644
index 00000000..3ee5d407
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr
@@ -0,0 +1,3 @@
+[suppress_type]
+  type_kind = enum
+  changed_enumerators_regexp = ^.*_LAST$, ^.*_MAX$, ^LAST_.*$
\ No newline at end of file
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt
new file mode 100644
index 00000000..26435de3
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt
@@ -0,0 +1,29 @@
+Functions changes summary: 0 Removed, 3 Changed, 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+3 functions with some indirect sub-type change:
+
+  [C] 'function void fun0(Enum0)' at test40.1-enumerator-changes-enumerator-changes-v0.c:25:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum0' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum0::ENUM0_E1' value '1'
+      1 enumerator change:
+        'Enum0::ENOM0_LAST' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:6:1
+
+  [C] 'function void fun1(Enum1)' at test40.1-enumerator-changes-enumerator-changes-v0.c:30:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum1' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum1::ENUM1_E1' value '1'
+      1 enumerator change:
+        'Enum1::ENUM1_MAX' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:13:1
+
+  [C] 'function void fun2(Enum2)' at test40.1-enumerator-changes-enumerator-changes-v0.c:35:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum2' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum2::ENUM2_E1' value '1'
+      1 enumerator change:
+        'Enum2::LAST_ENUM1_ENUMERATOR' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:20:1
+
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt
new file mode 100644
index 00000000..ff415ac5
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt
@@ -0,0 +1,21 @@
+Functions changes summary: 0 Removed, 2 Changed (1 filtered out), 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+2 functions with some indirect sub-type change:
+
+  [C] 'function void fun1(Enum1)' at test40.1-enumerator-changes-enumerator-changes-v0.c:30:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum1' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum1::ENUM1_E1' value '1'
+      1 enumerator change:
+        'Enum1::ENUM1_MAX' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:13:1
+
+  [C] 'function void fun2(Enum2)' at test40.1-enumerator-changes-enumerator-changes-v0.c:35:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum2' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum2::ENUM2_E1' value '1'
+      1 enumerator change:
+        'Enum2::LAST_ENUM1_ENUMERATOR' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:20:1
+
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt
new file mode 100644
index 00000000..7e4093ca
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt
@@ -0,0 +1,21 @@
+Functions changes summary: 0 Removed, 2 Changed (1 filtered out), 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+2 functions with some indirect sub-type change:
+
+  [C] 'function void fun0(Enum0)' at test40.1-enumerator-changes-enumerator-changes-v0.c:25:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum0' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum0::ENUM0_E1' value '1'
+      1 enumerator change:
+        'Enum0::ENOM0_LAST' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:6:1
+
+  [C] 'function void fun2(Enum2)' at test40.1-enumerator-changes-enumerator-changes-v0.c:35:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum2' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum2::ENUM2_E1' value '1'
+      1 enumerator change:
+        'Enum2::LAST_ENUM1_ENUMERATOR' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:20:1
+
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt
new file mode 100644
index 00000000..9f4bbcb2
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt
@@ -0,0 +1,13 @@
+Functions changes summary: 0 Removed, 1 Changed (2 filtered out), 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+1 function with some indirect sub-type change:
+
+  [C] 'function void fun2(Enum2)' at test40.1-enumerator-changes-enumerator-changes-v0.c:35:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum2' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum2::ENUM2_E1' value '1'
+      1 enumerator change:
+        'Enum2::LAST_ENUM1_ENUMERATOR' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:20:1
+
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt
new file mode 100644
index 00000000..e09641c6
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt
@@ -0,0 +1,21 @@
+Functions changes summary: 0 Removed, 2 Changed (1 filtered out), 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+2 functions with some indirect sub-type change:
+
+  [C] 'function void fun0(Enum0)' at test40.1-enumerator-changes-enumerator-changes-v0.c:25:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum0' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum0::ENUM0_E1' value '1'
+      1 enumerator change:
+        'Enum0::ENOM0_LAST' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:6:1
+
+  [C] 'function void fun1(Enum1)' at test40.1-enumerator-changes-enumerator-changes-v0.c:30:1 has some indirect sub-type changes:
+    parameter 1 of type 'enum Enum1' has sub-type changes:
+      type size hasn't changed
+      1 enumerator insertion:
+        'Enum1::ENUM1_E1' value '1'
+      1 enumerator change:
+        'Enum1::ENUM1_MAX' from value '1' to '2' at test40.1-enumerator-changes-enumerator-changes-v1.c:13:1
+
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt
new file mode 100644
index 00000000..97239c74
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt
@@ -0,0 +1,3 @@
+Functions changes summary: 0 Removed, 0 Changed (3 filtered out), 0 Added functions
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.c b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.c
new file mode 100644
index 00000000..7b32ee8b
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.c
@@ -0,0 +1,37 @@
+/**
+ * compile this with:
+ *   gcc -g -c test40.1-enumerator-changes-enumerator-changes-v0.c
+ */
+
+enum Enum0
+{
+  ENUM0_E0,
+  ENOM0_LAST
+};
+
+enum Enum1
+{
+  ENUM1_E0,
+  ENUM1_MAX
+};
+
+enum Enum2
+{
+  ENUM2_E0,
+  LAST_ENUM1_ENUMERATOR
+};
+
+void
+fun0(enum Enum0 p __attribute__((unused)))
+{
+}
+
+void
+fun1(enum Enum1 p __attribute__((unused)))
+{
+}
+
+void
+fun2(enum Enum2 p __attribute__((unused)))
+{
+}
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..8234f05d0e157a66a88be438cbe4a1f17c2fa01f
GIT binary patch
literal 3944
zcmc&$&2Jl35TEthaf%b?t3XUj<4{o2s$PGP21rTbD3~T9Ng*^65+Cl`UVl(~ZQ1K6
z1OYu26*#mKhaNa0AtVGvAWod%!e0QKI8li!M+69FcIT}(&l?Hl!dUxe<~JX2-rIR^
z{Z4N4*?^*eAO)78rwJ6GdS6e@+F}+?!UXKD-@JG8t-o%)`n{j@2YQA;8Ki&^4G+`c
zrPCfIK=KAY12i~Q*rNgi!7v$JkD+U_hie+YA)A5}dWHrfu@L2>&rwrbaE5XPZr8!~
za|`PE{pk3eexCj8Qk0mxO+8P{7Sq@ZlsQnNry`g;sHoB9nQ&w#xG}Lfqg;$UH8Y@0
z;N&4t2N@XKm<UV)1T|$PrbZc5W@BT@csM(G5F`K4nDSV3BBD-DO%pu&Aa2#85Q!{D
z)F?ohLnD|!(hJ0L&QnSF0N8KBmS}L->LQM?i7bS^=a4Ik@@I6I7_Ao{6sGN^2bAf+
zh?CY13n_5IRn?f%&EhYhVnA;D@>VLpx%%Q2=$f5c#WYIsnrXqM?cMlV`iXctt<7uc
zcqWy3JhhOz5TDyYhjrazLn3oFo@iKI(^#q)rqQkyQPtbU>eBv`3yFpK#9k(zs6cLe
zcPo?6r66Z^8#tnxvQ-q)Jz;D0C7@FB<bXJixt-N3mv^AtH8V7%X>ih{?PM89R+|kY
zS!$MEuO%xrD_O4<^g^wo*XqfZZWXIWCutcStCKA0mTrrQQmtH0bh@op8^|=D($Wb7
zD>K@<)odq<Ro$!@9Y1I<r4|2&8IMyXTv}UOjL+eVJo_KsBDTp%yH&7@4t7A<A62G?
z!h^T4olYT650QPIR->ag0&BwqIdnjbY)_LB=_vavj@j4FranfU9E9Kh=`$dJt?LIP
z?zZ_MyNVV+Qk|Qn&!oaYA4Y%*_6^f#Q{hA(=J?|!<3lP8`Jj{^Zwnt%VZ;X||KUFT
z0wUv{{SkNIBI80Ae1&oG{sn%lvtb`kaZodMZQ^31yxv_El@m_8hgYmk<ID-CXPNZ}
zB%D=vhz05h@7q7;@fS4^l=R><Z<F;U3GcGLCgH3CUByJAe(|PXa9|hzhV{IJzs<TK
z;qS6um+)^{KalV;>(?dxHtQmvsPhxXKVUBQO}zgvq&%Oo{<Y*!`G|gUn7iIDS^tH(
z$j_?V0~Bxn^I*g15&n-bPX6??SwAn~cUezM_^+&AWG>eeXPkP++do+e7wf$$;bPxF
z>%7sh^a66L?eMCQEMwmSjlMvj6*?Wz+D2X1N=Bhu$=A$s6K%Gv7Yc1-?~qw<+h3zY
zSiNQ%A_S)pBEflEFE$$u13%-M*|ZD|zX6Gkr5CSp5~G?gxAlf-JYLUn*%SuSo_fzV
z<;v24B>$BmUoXv|LYRC*zvgxF$a4HF+UR^AH=g=M&PmgW`Tr)xL$WXRA^ktidVEOy
zfj4B7n`#U(@)LKFxbNuRk#iyhFEjWaDISu2>A$axk^4OcQ=V87W#8uz^Q-@7E>y%*
z{b79M`b$1J5rX@9-Bh2K<oW4d^qYT>KdDzanC2%)p1*|{<rH<IXp_P7e<uLuVt&Ej
zMBFcamK$nPI35xI{t@vjv?wI;y>YbO{)@C9qCv>Qhq%e{UW{bf_fy7rxvqPQ<M&;}
z5ybup_+u2vH7fw-Ro?$~)@lDo@DcH%f2kgMZVLI0=fA@R(|4Wz-N^AYjeK?yg6n*K
Yo*~6U^7^SRzxcac|5u(^66N@R0n{#JCIA2c

literal 0
HcmV?d00001

diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.c b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.c
new file mode 100644
index 00000000..e7f1bcc7
--- /dev/null
+++ b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.c
@@ -0,0 +1,40 @@
+/**
+ * compile this with:
+ *   gcc -g -c test40.1-enumerator-changes-enumerator-changes-v1.c
+ */
+
+enum Enum0
+{
+  ENUM0_E0,
+  ENUM0_E1,
+  ENOM0_LAST
+};
+
+enum Enum1
+{
+  ENUM1_E0,
+  ENUM1_E1,
+  ENUM1_MAX
+};
+
+enum Enum2
+{
+  ENUM2_E0,
+  ENUM2_E1,
+  LAST_ENUM1_ENUMERATOR
+};
+
+void
+fun0(enum Enum0 p __attribute__((unused)))
+{
+}
+
+void
+fun1(enum Enum1 p __attribute__((unused)))
+{
+}
+
+void
+fun2(enum Enum2 p __attribute__((unused)))
+{
+}
diff --git a/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o b/tests/data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..5438d75e9486777259484d9feec98fba7ff0f3f2
GIT binary patch
literal 4064
zcmc&$&2Jl35P$1+oD?@s(o~R;Kx_m}TGi_h(f}z*9R<@w<f94+^Z>YPdt;mW3wxcW
zMF_;9qQIf8IFt_|B)A}PsKh_OhXfZcoH!x%0218b1QJLv^LEDGJZ~hF3uEnjGr#%G
zyxI5VeKo!Eq)*cXizenp$6{27J9l;TlvGpVs2CPoOV@tB_R8Papa0rR3qq<Mq4i-v
z4>tE<<Cgnfh7a|1cmmisRmj$<&nE)@UZk{n{g=FXZNkx8-UL6UIfe}iznb>J7hvgi
zaSZeNZj^=OMZl2K;r#+O@FLGZk33nHHtv)RSceI$af4Vwn-Y3xJP0v<O%KgSdV>-F
z^6+d#I~{y163~VrX^+tR2pC!(_KgVPH?%XOdWb-6a&$;L(wiE&GK&13A?=~ia8REZ
zn?QK*9+<obMKCxY)I&n_QfLtJ2RngK&Pgl@9wFq~NDUkJa<oBER^aIY?g{8MP5Ud<
zj~%`*JfKX-SNCZXz5ypKcpyR(huWq-uC-F|^XU+fURz&{XI2)T-W08Bvs9>B`EaRf
zi}c#oY9h0`a9*5U+X^ox9tkHB#<Y<LC*#S7<1_J7;i(OvE}1qtqRHdoXvJ<-t+|3#
zwHl=ym}VnaoZEeLCOR`6-ARU{1<IR_OC^~>rP``EW?Y&uFenLTItnlo0;|k8g<+fC
zSlC?O5ZkS45}O1zPCAHzq)8Dg)+$ykU(3H(iWN$BtX#^P*;2tQm1A|&&K0d@%(j|#
zGnO}PQ>xK?X?r``Y}M-xfv)Mek%(H5%xai+tr5)?&1%7FdO<r0Blkayc#tZ^*~P`#
z@D!}<@&B-_atFa3<A`=;Luk8$+SuXVzU#2r#sS6$MV_{W(BM_yVt*hF1i;YuI66W0
z^FQafJ^keB>TsX?#qa-gIRJo-?F9qgJ_LLGI(WQ9ckZ1omo5Tb7y`O;|8)6uai|M(
z_;3Yzh%OF$pqL--5)aYEfCq~F{x19!AV*yD!#CtC;cRn%hHzeg#t(En<O$`onv}Ki
zwTF4#v&xktj<ffGWMl1)Adb&G*>_XVIGN&JQgBDOSO0{I&ov+vbKyAd>txR<_#0#|
zD)<eumld2$v7z9+1D;jz@5#0lyiWE-1%Hq1mlPcSxTNeV_zz@XRq)GXzpdaOlYLXc
zKO_5H1^<fd52@$*=Y900!vB`+ZxlYRC(5r*C)XU;<vX%}qn`7V+1^VSFTZ%mF}M$(
z_ZRP<2Juc(&-iV!6AJzl*{7*j>j@K%dk`O%6e*1J`(99Ro;P7MFIQ|c3%%WN`XXz#
zwQCCl|ICDuZ8n9`u*#;9x3aB5rc~XoflumYHrudv_PEW4{A1gLl}lBNLtqG25za_E
zSF2Pk_*gKiHQO@a?<Cr^&D=#wVihyn4YR@<nBM20-53PooVxD_%$33hMEzhwu3I8t
zAg12*FStoAU5%dvAKnuOjmQ0>=EUK6`~k(OnDRprzk*X3<dQ#WLeA5s8Ui2k_)g>V
zkN20F6Vp@(d=m|qsN8elQ!%9fL15e!i>k_f3NWww&*5PP;drbczv9*U^MI*20TPq+
z-dLYoRBi^GUgN(;<6od)93LTd{5oKmlj{Uk$|V~AM+T_p@wtB)aIg4H+E61*+$a96
zed5dbQXu@l<yf7$;<WF8gLUR$|31aLG1OJ=r-ae#w&@>HJpaG2gXfR!Pe4IxiUI2H
z(EKlvjq{IRGaS$R7wb{S#*h)Z+;36A_<ew1NoqU}qn=%W#BDl1PoUuv_5HCfulOmt
Mus?UjqN>LK3)#(YJ^%m!

literal 0
HcmV?d00001

diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc
index 1a06e043..8c9ad070 100644
--- a/tests/test-diff-suppr.cc
+++ b/tests/test-diff-suppr.cc
@@ -1836,6 +1836,66 @@ InOutSpec in_out_specs[] =
     "data/test-diff-suppr/test40-enumerator-changes-report-0.txt",
     "output/test-diff-suppr/test40-enumerator-changes-report-0.txt"
   },
+  {
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt",
+    "output/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-0.txt"
+  },
+  {
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-1.suppr",
+    "--no-default-suppression",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt",
+    "output/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-1.txt"
+  },
+  {
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-2.suppr",
+    "--no-default-suppression",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt",
+    "output/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-2.txt"
+  },
+  {
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-3.suppr",
+    "--no-default-suppression",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt",
+    "output/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-3.txt"
+  },
+  {
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-4.suppr",
+    "--no-default-suppression",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt",
+    "output/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-4.txt"
+  },
+  {
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v0.o",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-v1.o",
+    "",
+    "",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-5.suppr",
+    "--no-default-suppression",
+    "data/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt",
+    "output/test-diff-suppr/test40.1-enumerator-changes-enumerator-changes-report-5.txt"
+  },
   {
     "data/test-diff-suppr/libtest41-enumerator-changes-v0.so",
     "data/test-diff-suppr/libtest41-enumerator-changes-v1.so",
-- 
2.39.3



-- 
		Dodji


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

* [PATCH 2/7, applied] default-reporter,reporter-priv: Do not report names of anonymous enums
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
  2023-10-20  9:57 ` [PATCH 1/7, applied] suppression: Add "changed_enumerators_regexp" property Dodji Seketeli
@ 2023-10-20  9:58 ` Dodji Seketeli
  2023-10-20  9:59 ` [PATCH 3/7, applied] ir,comparison,corpus: Better support anonymous enums comparison Dodji Seketeli
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20  9:58 UTC (permalink / raw)
  To: Dodji Seketeli
  Cc: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail

Hello,

When reporting changes of anonymous enums, do not try to report their
qualified name as that doesn't make any sense -- they are anonymous.

Similarly, in report_name_size_and_alignment_changes do not try to
report about changes in the name of an anonymous enum.

	* src/abg-default-reporter.cc (default_reporter::report): In the
	overload for enum_diff, do not get the qualified name of anonymous
	enums.
	* src/abg-reporter-priv.cc
	(report_name_size_and_alignment_changes): Do not report about name
	changes for anonymous enums.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 src/abg-default-reporter.cc | 12 +++++++++---
 src/abg-reporter-priv.cc    |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index b1df9300..c71f8d56 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -162,7 +162,9 @@ default_reporter::report(const enum_diff& d, ostream& out,
 	{
 	  out << indent
 	      << "  '"
-	      << i->get_qualified_name()
+	      << (first->get_is_anonymous()
+		  ? i->get_name()
+		  : i->get_qualified_name())
 	      << "' value '"
 	      << i->get_value()
 	      << "'";
@@ -181,7 +183,9 @@ default_reporter::report(const enum_diff& d, ostream& out,
 	{
 	  out << indent
 	      << "  '"
-	      << i->get_qualified_name()
+	      << (second->get_is_anonymous()
+		  ? i->get_name()
+		  :i->get_qualified_name())
 	      << "' value '"
 	      << i->get_value()
 	      << "'";
@@ -201,7 +205,9 @@ default_reporter::report(const enum_diff& d, ostream& out,
 	{
 	  out << indent
 	      << "  '"
-	      << i->first.get_qualified_name()
+	      << (first->get_is_anonymous()
+		  ? i->first.get_name()
+		  : i->first.get_qualified_name())
 	      << "' from value '"
 	      << i->first.get_value() << "' to '"
 	      << i->second.get_value() << "'";
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 63a45b80..cc38f240 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -965,7 +965,8 @@ report_name_size_and_alignment_changes(decl_base_sptr		first,
   string fn = first->get_qualified_name(),
     sn = second->get_qualified_name();
 
-  if (fn != sn)
+  if (!(first->get_is_anonymous() && second->get_is_anonymous())
+      && fn != sn)
     {
       if (!(ctxt->get_allowed_category() & HARMLESS_DECL_NAME_CHANGE_CATEGORY)
 	  && filtering::has_harmless_name_change(first, second))
-- 
2.39.3



-- 
		Dodji


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

* [PATCH 3/7, applied] ir,comparison,corpus: Better support anonymous enums comparison
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
  2023-10-20  9:57 ` [PATCH 1/7, applied] suppression: Add "changed_enumerators_regexp" property Dodji Seketeli
  2023-10-20  9:58 ` [PATCH 2/7, applied] default-reporter,reporter-priv: Do not report names of anonymous enums Dodji Seketeli
@ 2023-10-20  9:59 ` Dodji Seketeli
  2023-10-20 10:00 ` [PATCH 4/7, applied] ir,comparison: Represent changed anonymous enums Dodji Seketeli
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20  9:59 UTC (permalink / raw)
  To: Dodji Seketeli
  Cc: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail

Hello,

Anonymous enums are designated using their internal names which are
automatically generated.  The problem however is that whenever a new
anonymous enum gets inserted in the translation unit, that can
randomly change the name of existing anonymous enums.  This makes
reporting of changes in anonymous enums essentially useless.

To address this issue, this patch uses flat representation for
anonymous enums, for the purpose of designating them outside of the
context of type canonicalization.  This is like what is done already
for anonymous classes and unions.

	* include/abg-fwd.h (get_enum_flat_representation)
	(get_class_or_enum_flat_representation): Declare new functions.
	* include/abg-ir.h (enum_type_decl::get_sorted_enumerators):
	Declare new member functions.
	* src/abg-comparison.cc
	(corpus_diff::priv::{ensure_lookup_tables_populated,
	added_unreachable_type_is_suppressed,
	deleted_unreachable_type_is_suppressed,
	record_type_as_reachable_from_public_interfaces}): Use
	non-internal pretty representation to designate ABI artifacts so
	that anonymous enums get designated by their flat representation.
	* src/abg-corpus.cc (corpus::type_is_reachable_from_public_interfaces):
	Likewise.
	* src/abg-ir.cc (get_type_name): The type name of an anonymous
	enum or class should is now the flat representation if we are not
	in the context of type canonicalization.
	(enum_type_decl::get_pretty_representation): If we are not in the
	context of type canonicalization, the pretty representation of an
	enum is its flat representation.
	(get_enum_flat_representation)
	(get_class_or_enum_flat_representation): Define new functions.
	(enum_type_decl::get_sorted_enumerators): Likewise.
	* tests/data/test-annotate/libtest23.so.abi: Adjust.
	* tests/data/test-annotate/test-anonymous-members-0.o.abi: Likewise.
	* tests/data/test-annotate/test15-pr18892.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-diff-dwarf/test43-PR22913-report-0.txt:
	Likewise.
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
	* tests/data/test-read-dwarf/libtest23.so.abi: Likewise.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.
	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
	Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 include/abg-fwd.h                             |    27 +
 include/abg-ir.h                              |     3 +
 src/abg-comparison.cc                         |    10 +-
 src/abg-corpus.cc                             |     4 +-
 src/abg-ir.cc                                 |   203 +-
 tests/data/test-annotate/libtest23.so.abi     |   224 +-
 .../test-anonymous-members-0.o.abi            |    22 +-
 .../data/test-annotate/test15-pr18892.so.abi  |     8 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    54 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |    10 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |     2 +-
 .../test43-PR22913-report-0.txt               |     4 +-
 .../test-read-dwarf/PR22122-libftdc.so.abi    | 12416 ++++++++--------
 tests/data/test-read-dwarf/libtest23.so.abi   |   216 +-
 .../test-read-dwarf/test-libandroid.so.abi    |    44 +-
 .../test-read-dwarf/test16-pr18904.so.abi     |  1816 +--
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    40 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |    60 +-
 18 files changed, 7637 insertions(+), 7526 deletions(-)

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index 0afb2122..e494de07 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -1097,6 +1097,33 @@ get_class_or_union_flat_representation(const class_or_union_sptr& cou,
 				       bool internal,
 				       bool qualified_name = true);
 
+string
+get_enum_flat_representation(const enum_type_decl& enum_type,
+			     const string& indent,
+			     bool one_line,
+			     bool internal,
+			     bool qualified_names);
+
+string
+get_enum_flat_representation(const enum_type_decl* enum_type,
+			     const string& indent,
+			     bool one_line,
+			     bool internal,
+			     bool qualified_names);
+
+string
+get_enum_flat_representation(const enum_type_decl_sptr& enum_type,
+			     const string& indent,
+			     bool one_line,
+			     bool qualified_names);
+
+string
+get_class_or_enum_flat_representation(const type_base& coe,
+				      const string& indent,
+				      bool one_line,
+				      bool internal,
+				      bool qualified_name);
+
 string
 get_debug_representation(const type_or_decl_base*);
 
diff --git a/include/abg-ir.h b/include/abg-ir.h
index 5a9aed9a..3729e84a 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -2728,6 +2728,9 @@ public:
   const enumerators&
   get_enumerators() const;
 
+  const enumerators&
+  get_sorted_enumerators() const;
+
   enumerators&
   get_enumerators();
 
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index 16afd556..61fe89e0 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -9551,7 +9551,8 @@ corpus_diff::priv::ensure_lookup_tables_populated()
 	if (!is_user_defined_type(t))
 	  continue;
 
-	string repr = abigail::ir::get_pretty_representation(t, true);
+	string repr =
+	  abigail::ir::get_pretty_representation(t, /*internal=*/false);
 	deleted_unreachable_types_[repr] = t;
       }
 
@@ -9573,7 +9574,8 @@ corpus_diff::priv::ensure_lookup_tables_populated()
 	    if (!is_user_defined_type(t))
 	      continue;
 
-	    string repr = abigail::ir::get_pretty_representation(t, true);
+	    string repr =
+	      abigail::ir::get_pretty_representation(t, /*internal=*/false);
 
 	    // Let's see if the inserted type we are looking at was
 	    // reported as deleted as well.
@@ -9857,7 +9859,7 @@ corpus_diff::priv::added_unreachable_type_is_suppressed(const type_base *t)const
   if (!t)
     return false;
 
-  string repr = abigail::ir::get_pretty_representation(t, /*internal=*/true);
+  string repr = abigail::ir::get_pretty_representation(t, /*internal=*/false);
   string_type_base_sptr_map::const_iterator i =
     suppressed_added_unreachable_types_.find(repr);
   if (i == suppressed_added_unreachable_types_.end())
@@ -9879,7 +9881,7 @@ corpus_diff::priv::deleted_unreachable_type_is_suppressed(const type_base *t) co
   if (!t)
     return false;
 
-  string repr = abigail::ir::get_pretty_representation(t, /*internal=*/true);
+  string repr = abigail::ir::get_pretty_representation(t, /*internal=*/false);
   string_type_base_sptr_map::const_iterator i =
     suppressed_deleted_unreachable_types_.find(repr);
   if (i == suppressed_deleted_unreachable_types_.end())
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index 7cf2d11d..4a4cb8bc 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -774,7 +774,7 @@ corpus::recording_types_reachable_from_public_interface_supported()
 void
 corpus::record_type_as_reachable_from_public_interfaces(const type_base& t)
 {
-  string repr = get_pretty_representation(&t, /*internal=*/true);
+  string repr = get_pretty_representation(&t, /*internal=*/false);
   interned_string s = t.get_environment().intern(repr);
   priv_->get_public_types_pretty_representations()->insert(s);
 }
@@ -792,7 +792,7 @@ corpus::record_type_as_reachable_from_public_interfaces(const type_base& t)
 bool
 corpus::type_is_reachable_from_public_interfaces(const type_base& t) const
 {
-  string repr = get_pretty_representation(&t, /*internal=*/true);
+  string repr = get_pretty_representation(&t, /*internal=*/false);
   interned_string s = t.get_environment().intern(repr);
 
   return (priv_->get_public_types_pretty_representations()->find(s)
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index fc3437d6..06dfbe20 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -8845,6 +8845,8 @@ get_type_name(const type_base* t, bool qualified, bool internal)
       return fn_type->get_cached_name(internal);
     }
 
+  const environment&env = d->get_environment();
+
   // All anonymous types of a given kind get to have the same internal
   // name for internal purpose.  This to allow them to be compared
   // among themselves during type canonicalization.
@@ -8863,10 +8865,18 @@ get_type_name(const type_base* t, bool qualified, bool internal)
       if (qualified)
 	return d->get_qualified_name(internal);
 
-      const environment&env = d->get_environment();
       return env.intern(get_internal_integral_type_name(t));
     }
 
+  if (d->get_is_anonymous())
+    {
+      if (is_class_or_union_type(t) || is_enum_type(t))
+	return env.intern
+	  (get_class_or_enum_flat_representation (*t, "",
+						  /*one_line=*/true,
+						  internal, qualified));
+    }
+
   if (qualified)
     return d->get_qualified_name(internal);
   return d->get_name();
@@ -9563,6 +9573,165 @@ get_class_or_union_flat_representation(const class_or_union_sptr& cou,
 					       internal,
 					       qualified_names);}
 
+/// Get the flat representation of an instance of @ref enum_type_decl
+/// type.
+///
+/// The flat representation of a given @ref enum_type_decl type is the
+/// actual definition of the type, for instance:
+///
+///   enum {E_0 =0, E_1 = 1}
+///
+///@param enum_type the enum type to consider.
+///
+///@param indent the identation spaces to use in the representation.
+///
+///@param one_line if true, then the flat representation stands on one
+///line.  Otherwise, it stands on multiple lines.
+///
+///@param qualified_names use qualified names when applicable.
+///Typically, if this is true, the name of the enum is going to be
+///qualified.
+///
+///@return the resulting flat representation.
+string
+get_enum_flat_representation(const enum_type_decl& enum_type,
+			     const string& indent, bool one_line,
+			     bool qualified_names)
+{
+  string repr;
+  std::ostringstream o;
+  string local_indent = "  ";
+
+  repr = indent + "enum ";
+
+  if (!enum_type.get_is_anonymous())
+    o << (qualified_names
+	  ? enum_type.get_qualified_name()
+	  : enum_type.get_name()) + " ";
+
+  o << "{";
+
+  if (!one_line)
+    o << "\n";
+
+  for (const auto &enumerator : enum_type.get_sorted_enumerators())
+    {
+      if (!one_line)
+	o << "\n" + indent;
+
+      o << enumerator.get_name() + "="  << enumerator.get_value() << ", ";
+    }
+
+  if (!one_line)
+    o << "\n" + indent << "}";
+  else
+    o << "}";
+
+  repr =o.str();
+
+  return repr;
+}
+
+/// Get the flat representation of an instance of @ref enum_type_decl
+/// type.
+///
+/// The flat representation of a given @ref enum_type_decl type is the
+/// actual definition of the type, for instance:
+///
+///   enum {E_0 =0, E_1 = 1}
+///
+///@param enum_type the enum type to consider.
+///
+///@param indent the identation spaces to use in the representation.
+///
+///@param one_line if true, then the flat representation stands on one
+///line.  Otherwise, it stands on multiple lines.
+///
+///@param qualified_names use qualified names when applicable.
+///Typically, if this is true, the name of the enum is going to be
+///qualified.
+///
+///@return the resulting flat representation.
+string
+get_enum_flat_representation(const enum_type_decl* enum_type,
+			     const string& indent, bool one_line,
+			     bool qualified_names)
+{
+  if (!enum_type)
+    return "";
+
+  return get_enum_flat_representation(*enum_type, indent,
+				      one_line, qualified_names);
+}
+
+/// Get the flat representation of an instance of @ref enum_type_decl
+/// type.
+///
+/// The flat representation of a given @ref enum_type_decl type is the
+/// actual definition of the type, for instance:
+///
+///   enum {E_0 =0, E_1 = 1}
+///
+///@param enum_type the enum type to consider.
+///
+///@param indent the identation spaces to use in the representation.
+///
+///@param one_line if true, then the flat representation stands on one
+///line.  Otherwise, it stands on multiple lines.
+///
+///@param qualified_names use qualified names when applicable.
+///Typically, if this is true, the name of the enum is going to be
+///qualified.
+///
+///@return the resulting flat representation.
+string
+get_enum_flat_representation(const enum_type_decl_sptr& enum_type,
+			     const string& indent, bool one_line,
+			     bool qualified_names)
+{
+  return get_enum_flat_representation(enum_type.get(),
+				      indent, one_line,
+				      qualified_names);
+}
+
+/// Get the flat representation of an instance of @ref enum_type_decl
+/// type.
+///
+/// The flat representation of a given @ref enum_type_decl type is the
+/// actual definition of the type, for instance:
+///
+///   enum {E_0 =0, E_1 = 1}
+///
+///@param enum_type the enum type to consider.
+///
+///@param indent the identation spaces to use in the representation.
+///
+///@param one_line if true, then the flat representation stands on one
+///line.  Otherwise, it stands on multiple lines.
+///
+///@param qualified_names use qualified names when applicable.
+///Typically, if this is true, the name of the enum is going to be
+///qualified.
+///
+///@return the resulting flat representation.
+string
+get_class_or_enum_flat_representation(const type_base& coe,
+				      const string& indent,
+				      bool one_line,
+				      bool internal,
+				      bool qualified_name)
+
+{
+  string repr;
+  if (const class_or_union* cou = is_class_or_union_type(&coe))
+    repr = get_class_or_union_flat_representation(cou, indent, one_line,
+						  internal, qualified_name);
+  else if (const enum_type_decl* enom = is_enum_type(&coe))
+    repr = get_enum_flat_representation(*enom, indent, one_line, qualified_name);
+
+  return repr;
+}
+
 /// Get the textual representation of a type for debugging purposes.
 ///
 /// If the type is a class/union, this shows the data members, virtual
@@ -18578,6 +18747,7 @@ class enum_type_decl::priv
 {
   type_base_sptr	underlying_type_;
   enumerators		enumerators_;
+  mutable enumerators	sorted_enumerators_;
 
   friend class enum_type_decl;
 
@@ -18643,6 +18813,33 @@ enum_type_decl::enumerators&
 enum_type_decl::get_enumerators()
 {return priv_->enumerators_;}
 
+/// Get the lexicographically sorted vector of enumerators.
+///
+/// @return the lexicographically sorted vector of enumerators.
+const enum_type_decl::enumerators&
+enum_type_decl::get_sorted_enumerators() const
+{
+  if (priv_->sorted_enumerators_.empty())
+    {
+      for (auto e = get_enumerators().rbegin();
+	   e != get_enumerators().rend();
+	   ++e)
+	priv_->sorted_enumerators_.push_back(*e);
+
+      std::sort(priv_->sorted_enumerators_.begin(),
+		priv_->sorted_enumerators_.end(),
+		[](enum_type_decl::enumerator& l,
+		   enum_type_decl::enumerator& r)
+		{
+		  if (l.get_name() == r.get_name())
+		    return l.get_value() < r.get_value();
+		  return (l.get_name() < r.get_name());
+		});
+    }
+
+  return priv_->sorted_enumerators_;
+}
+
 /// Get the pretty representation of the current instance of @ref
 /// enum_type_decl.
 ///
@@ -18668,6 +18865,10 @@ enum_type_decl::get_pretty_representation(bool internal,
 
   if (internal && get_is_anonymous())
     r += get_type_name(this, qualified_name, /*internal=*/true);
+  else if (get_is_anonymous())
+    r += get_enum_flat_representation(*this, "",
+				      /*one_line=*/true,
+				      qualified_name);
   else
     r += decl_base::get_pretty_representation(internal,
 					      qualified_name);
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index dcbf8edc..6ca5c79d 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -137,54 +137,54 @@
     <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-26'/>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-27'/>
-    <!-- __anonymous_struct__* -->
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-28'/>
     <!-- char& -->
-    <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-29'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-28'/>
     <!-- char* -->
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-29'/>
     <!-- const __int32_t -->
-    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-31'/>
+    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-30'/>
     <!-- const __int32_t* -->
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-22'/>
     <!-- const char -->
-    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-32'/>
+    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-31'/>
     <!-- const char& -->
-    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-33'/>
+    <reference-type-def kind='lvalue' type-id='type-id-31' size-in-bits='64' id='type-id-32'/>
     <!-- const char* -->
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-13'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-34'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-33'/>
     <!-- const mbstate_t -->
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-35'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-34'/>
     <!-- const mbstate_t* -->
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-35'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-37' const='yes' id='type-id-38'/>
+    <qualified-type-def type-id='type-id-36' const='yes' id='type-id-37'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-38' size-in-bits='64' id='type-id-39'/>
+    <reference-type-def kind='lvalue' type-id='type-id-37' size-in-bits='64' id='type-id-38'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-40'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-39'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
-    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-42'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-41'/>
     <!-- const tm -->
-    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-43'/>
+    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-42'/>
     <!-- const tm* -->
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-44'/>
+    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-43'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-45'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-44'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-46'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-45'/>
     <!-- const wchar_t** -->
-    <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-47'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-46'/>
     <!-- mbstate_t* -->
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-48'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-47'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-37' size-in-bits='64' id='type-id-49'/>
+    <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-48'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-50'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-49'/>
     <!-- std::string& -->
-    <reference-type-def kind='lvalue' type-id='type-id-51' size-in-bits='64' id='type-id-52'/>
+    <reference-type-def kind='lvalue' type-id='type-id-50' size-in-bits='64' id='type-id-51'/>
+    <!-- struct {}* -->
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-52'/>
     <!-- typedef __va_list_tag __va_list_tag* -->
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-53'/>
     <!-- wchar_t* -->
@@ -201,7 +201,7 @@
       </member-type>
       <member-type access='public'>
         <!-- typedef const char& allocator<char>::const_reference -->
-        <typedef-decl name='const_reference' type-id='type-id-33' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-60'/>
+        <typedef-decl name='const_reference' type-id='type-id-32' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-60'/>
       </member-type>
       <member-type access='public'>
         <!-- typedef std::ptrdiff_t allocator<char>::difference_type -->
@@ -209,11 +209,11 @@
       </member-type>
       <member-type access='public'>
         <!-- typedef char* allocator<char>::pointer -->
-        <typedef-decl name='pointer' type-id='type-id-30' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-63'/>
+        <typedef-decl name='pointer' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-63'/>
       </member-type>
       <member-type access='public'>
         <!-- typedef char& allocator<char>::reference -->
-        <typedef-decl name='reference' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-64'/>
+        <typedef-decl name='reference' type-id='type-id-28' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-64'/>
       </member-type>
       <member-type access='public'>
         <!-- typedef std::size_t allocator<char>::size_type -->
@@ -235,12 +235,12 @@
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::string -->
-      <typedef-decl name='string' type-id='type-id-37' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-51'/>
+      <typedef-decl name='string' type-id='type-id-36' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-50'/>
     </namespace-decl>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
-      <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.8.2/bits/basic_string.h' line='112' column='1' id='type-id-37'>
+      <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.8.2/bits/basic_string.h' line='112' column='1' id='type-id-36'>
         <member-type access='public'>
           <!-- typedef allocator<char>::const_pointer std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_pointer -->
           <typedef-decl name='const_pointer' type-id='type-id-59' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='126' column='1' id='type-id-72'/>
@@ -263,7 +263,7 @@
         </member-type>
         <member-type access='public'>
           <!-- typedef allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
-          <typedef-decl name='size_type' type-id='type-id-65' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-41'/>
+          <typedef-decl name='size_type' type-id='type-id-65' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-40'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef char_traits<char>::char_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::value_type -->
@@ -311,7 +311,7 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::npos -->
-          <var-decl name='npos' type-id='type-id-42' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='285' column='1'/>
+          <var-decl name='npos' type-id='type-id-41' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='285' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_dataplus -->
@@ -321,7 +321,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string() -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='437' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-92'/>
           </function-decl>
@@ -330,7 +330,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(const allocator<char>&) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='177' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'const allocator<char>&' -->
             <parameter type-id='type-id-67'/>
             <!-- void -->
@@ -341,9 +341,9 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >&) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='169' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, std::allocator<char> >&' -->
-            <parameter type-id='type-id-39'/>
+            <parameter type-id='type-id-38'/>
             <!-- void -->
             <return type-id='type-id-92'/>
           </function-decl>
@@ -352,13 +352,13 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='183' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, std::allocator<char> >&' -->
-            <parameter type-id='type-id-39'/>
+            <parameter type-id='type-id-38'/>
             <!-- parameter of type 'typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' -->
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <!-- parameter of type 'typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' -->
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <!-- void -->
             <return type-id='type-id-92'/>
           </function-decl>
@@ -367,13 +367,13 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, const allocator<char>&) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='193' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, std::allocator<char> >&' -->
-            <parameter type-id='type-id-39'/>
+            <parameter type-id='type-id-38'/>
             <!-- parameter of type 'typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' -->
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <!-- parameter of type 'typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' -->
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <!-- parameter of type 'const allocator<char>&' -->
             <parameter type-id='type-id-67'/>
             <!-- void -->
@@ -384,11 +384,11 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(const char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, const allocator<char>&) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='205' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-13'/>
             <!-- parameter of type 'typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' -->
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <!-- parameter of type 'const allocator<char>&' -->
             <parameter type-id='type-id-67'/>
             <!-- void -->
@@ -399,7 +399,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(const char*, const allocator<char>&) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='212' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-13'/>
             <!-- parameter of type 'const allocator<char>&' -->
@@ -412,9 +412,9 @@
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type, char, const allocator<char>&) -->
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='219' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- parameter of type 'typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' -->
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <!-- parameter of type 'char' -->
             <parameter type-id='type-id-2'/>
             <!-- parameter of type 'const allocator<char>&' -->
@@ -427,7 +427,7 @@
           <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string(int) -->
           <function-decl name='~basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='538' 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> >*' -->
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-5' is-artificial='yes'/>
             <!-- void -->
@@ -467,7 +467,7 @@
     <!-- void emit(std::string&) -->
     <function-decl name='emit' mangled-name='_Z4emitRSs' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSs'>
       <!-- parameter of type 'std::string&' -->
-      <parameter type-id='type-id-52' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1'/>
+      <parameter type-id='type-id-51' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1'/>
       <!-- void -->
       <return type-id='type-id-92'/>
     </function-decl>
@@ -491,12 +491,12 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-13'/>
       <!-- char* -->
-      <return type-id='type-id-30'/>
+      <return type-id='type-id-29'/>
     </function-decl>
-    <!-- __anonymous_struct__* localeconv() -->
+    <!-- struct {}* localeconv() -->
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- __anonymous_struct__* -->
-      <return type-id='type-id-28'/>
+      <!-- struct {}* -->
+      <return type-id='type-id-52'/>
     </function-decl>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-95' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-56'/>
@@ -505,7 +505,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- wchar_t* -->
       <return type-id='type-id-54'/>
     </function-decl>
@@ -514,7 +514,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- wchar_t* -->
@@ -525,7 +525,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- wchar_t* -->
       <return type-id='type-id-54'/>
     </function-decl>
@@ -534,7 +534,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- wchar_t* -->
@@ -543,18 +543,18 @@
     <!-- int wcscmp(const wchar_t*, const wchar_t*) -->
     <function-decl name='wcscmp' filepath='/usr/include/wchar.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- int -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int wcsncmp(const wchar_t*, const wchar_t*, size_t) -->
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- int -->
@@ -563,9 +563,9 @@
     <!-- int wcscoll(const wchar_t*, const wchar_t*) -->
     <function-decl name='wcscoll' filepath='/usr/include/wchar.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- int -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -574,7 +574,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- typedef size_t -->
@@ -583,18 +583,18 @@
     <!-- size_t wcscspn(const wchar_t*, const wchar_t*) -->
     <function-decl name='wcscspn' filepath='/usr/include/wchar.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
     <!-- size_t wcsspn(const wchar_t*, const wchar_t*) -->
     <function-decl name='wcsspn' filepath='/usr/include/wchar.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
@@ -603,7 +603,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- wchar_t* -->
@@ -612,16 +612,16 @@
     <!-- size_t wcslen(const wchar_t*) -->
     <function-decl name='wcslen' filepath='/usr/include/wchar.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
     <!-- int wmemcmp(const wchar_t*, const wchar_t*, size_t) -->
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- int -->
@@ -632,7 +632,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- wchar_t* -->
@@ -643,7 +643,7 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- wchar_t* -->
@@ -677,7 +677,7 @@
     <!-- int mbsinit(const mbstate_t*) -->
     <function-decl name='mbsinit' filepath='/usr/include/wchar.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const mbstate_t*' -->
-      <parameter type-id='type-id-36'/>
+      <parameter type-id='type-id-35'/>
       <!-- int -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -690,18 +690,18 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'mbstate_t*' -->
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
     <!-- size_t wcrtomb(char*, wchar_t, mbstate_t*) -->
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'char*' -->
-      <parameter type-id='type-id-30'/>
+      <parameter type-id='type-id-29'/>
       <!-- parameter of type 'wchar_t' -->
       <parameter type-id='type-id-27'/>
       <!-- parameter of type 'mbstate_t*' -->
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
@@ -712,7 +712,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'mbstate_t*' -->
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
@@ -721,31 +721,31 @@
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-54'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'mbstate_t*' -->
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
     <!-- size_t wcsrtombs(char*, const wchar_t**, size_t, mbstate_t*) -->
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'char*' -->
-      <parameter type-id='type-id-30'/>
+      <parameter type-id='type-id-29'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-46'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'mbstate_t*' -->
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
     <!-- double wcstod(const wchar_t*, wchar_t**) -->
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='450' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- double -->
@@ -754,7 +754,7 @@
     <!-- float wcstof(const wchar_t*, wchar_t**) -->
     <function-decl name='wcstof' filepath='/usr/include/wchar.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- float -->
@@ -763,7 +763,7 @@
     <!-- long double wcstold(const wchar_t*, wchar_t**) -->
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='459' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- long double -->
@@ -772,7 +772,7 @@
     <!-- long int wcstol(const wchar_t*, wchar_t**, int) -->
     <function-decl name='wcstol' filepath='/usr/include/wchar.h' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- parameter of type 'int' -->
@@ -783,7 +783,7 @@
     <!-- unsigned long int wcstoul(const wchar_t*, wchar_t**, int) -->
     <function-decl name='wcstoul' filepath='/usr/include/wchar.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- parameter of type 'int' -->
@@ -794,7 +794,7 @@
     <!-- long long int wcstoll(const wchar_t*, wchar_t**, int) -->
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- parameter of type 'int' -->
@@ -805,7 +805,7 @@
     <!-- unsigned long long int wcstoull(const wchar_t*, wchar_t**, int) -->
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'wchar_t**' -->
       <parameter type-id='type-id-55'/>
       <!-- parameter of type 'int' -->
@@ -827,7 +827,7 @@
       <!-- parameter of type '__FILE*' -->
       <parameter type-id='type-id-57'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-5'/>
@@ -835,7 +835,7 @@
     <!-- int wprintf(const wchar_t*, ...) -->
     <function-decl name='wprintf' filepath='/usr/include/wchar.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-5'/>
@@ -847,7 +847,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-5'/>
@@ -857,7 +857,7 @@
       <!-- parameter of type '__FILE*' -->
       <parameter type-id='type-id-57'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -866,7 +866,7 @@
     <!-- int vwprintf(const wchar_t*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -879,7 +879,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -890,7 +890,7 @@
       <!-- parameter of type '__FILE*' -->
       <parameter type-id='type-id-57'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-5'/>
@@ -898,7 +898,7 @@
     <!-- int wscanf(const wchar_t*, ...) -->
     <function-decl name='wscanf' filepath='/usr/include/wchar.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-5'/>
@@ -906,9 +906,9 @@
     <!-- int swscanf(const wchar_t*, const wchar_t*, ...) -->
     <function-decl name='swscanf' filepath='/usr/include/wchar.h' line='645' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-5'/>
@@ -918,7 +918,7 @@
       <!-- parameter of type '__FILE*' -->
       <parameter type-id='type-id-57'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -927,7 +927,7 @@
     <!-- int vwscanf(const wchar_t*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -936,9 +936,9 @@
     <!-- int vswscanf(const wchar_t*, const wchar_t*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='701' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-53'/>
       <!-- int -->
@@ -1002,7 +1002,7 @@
     <!-- int fputws(const wchar_t*, __FILE*) -->
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type '__FILE*' -->
       <parameter type-id='type-id-57'/>
       <!-- int -->
@@ -1024,9 +1024,9 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-21'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <!-- parameter of type 'const tm*' -->
-      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-43'/>
       <!-- typedef size_t -->
       <return type-id='type-id-21'/>
     </function-decl>
@@ -1080,9 +1080,9 @@
     <!-- void emit(std::string&, std::string&) -->
     <function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
       <!-- parameter of type 'std::string&' -->
-      <parameter type-id='type-id-52' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
+      <parameter type-id='type-id-51' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <!-- parameter of type 'std::string&' -->
-      <parameter type-id='type-id-52' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
+      <parameter type-id='type-id-51' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <!-- void -->
       <return type-id='type-id-92'/>
     </function-decl>
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 e272d213..d75e67ee 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -13,15 +13,15 @@
     <!-- struct S -->
     <class-decl name='S' size-in-bits='256' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='1' column='1' id='type-id-4'>
       <member-type access='public'>
-        <!-- enum S::__anonymous_enum__ -->
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='18' column='1' id='type-id-5'>
+        <!-- enum {five=0, six=1, } -->
+        <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='22' column='1' id='type-id-5'>
           <underlying-type type-id='type-id-6'/>
-          <enumerator name='one' value='0'/>
-          <enumerator name='two' value='1'/>
+          <enumerator name='five' value='0'/>
+          <enumerator name='six' value='1'/>
         </enum-decl>
       </member-type>
       <member-type access='public'>
-        <!-- enum S::__anonymous_enum__1 -->
+        <!-- enum {four=1, three=0, } -->
         <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='20' column='1' id='type-id-7'>
           <underlying-type type-id='type-id-6'/>
           <enumerator name='three' value='0'/>
@@ -29,11 +29,11 @@
         </enum-decl>
       </member-type>
       <member-type access='public'>
-        <!-- enum S::__anonymous_enum__2 -->
-        <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='22' column='1' id='type-id-8'>
+        <!-- enum {one=0, two=1, } -->
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='18' column='1' id='type-id-8'>
           <underlying-type type-id='type-id-6'/>
-          <enumerator name='five' value='0'/>
-          <enumerator name='six' value='1'/>
+          <enumerator name='one' value='0'/>
+          <enumerator name='two' value='1'/>
         </enum-decl>
       </member-type>
       <member-type access='public'>
@@ -103,7 +103,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- S::__anonymous_enum__ S::e1 -->
-        <var-decl name='e1' type-id='type-id-5' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='18' column='1'/>
+        <var-decl name='e1' type-id='type-id-8' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='18' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- S::__anonymous_enum__1 S::e2 -->
@@ -111,7 +111,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- S::__anonymous_enum__2 S::e3 -->
-        <var-decl name='e3' type-id='type-id-8' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='22' column='1'/>
+        <var-decl name='e3' type-id='type-id-5' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- union {int a; char b;} -->
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index d3616699..b749a0a6 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -10883,7 +10883,7 @@
     <!-- struct ioctl_desc -->
     <class-decl name='ioctl_desc' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='13' column='1' id='type-id-380'>
       <member-type access='public'>
-        <!-- enum ioctl_desc::__anonymous_enum__ -->
+        <!-- enum {CUSTOM=3, NONE=0, READ=1, WRITE=2, } -->
         <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='16' column='1' id='type-id-389'>
           <underlying-type type-id='type-id-56'/>
           <enumerator name='NONE' value='0'/>
@@ -35469,7 +35469,7 @@
       <!-- <anonymous range>[64] -->
       <subrange length='64' lower-bound='0' upper-bound='63' type-id='type-id-46' id='type-id-366'/>
     </array-type-def>
-    <!-- __tsan::__anonymous_struct__* -->
+    <!-- struct {__tsan::MD5_u32plus lo; __tsan::MD5_u32plus hi; __tsan::MD5_u32plus a; __tsan::MD5_u32plus b; __tsan::MD5_u32plus c; __tsan::MD5_u32plus d; unsigned char buffer[64]; unsigned int block[16];}* -->
     <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-1508'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-1509'/>
@@ -35517,9 +35517,9 @@
       <typedef-decl name='MD5_u32plus' type-id='type-id-172' filepath='../../.././libsanitizer/tsan/tsan_md5.cc' line='30' column='1' id='type-id-1510'/>
       <!-- typedef unsigned long int __tsan::ulong_t -->
       <typedef-decl name='ulong_t' type-id='type-id-1' filepath='../../.././libsanitizer/tsan/tsan_md5.cc' line='31' column='1' id='type-id-1511'/>
-      <!-- void __tsan::MD5_Init(__tsan::__anonymous_struct__*) -->
+      <!-- void __tsan::MD5_Init(struct {__tsan::MD5_u32plus lo; __tsan::MD5_u32plus hi; __tsan::MD5_u32plus a; __tsan::MD5_u32plus b; __tsan::MD5_u32plus c; __tsan::MD5_u32plus d; unsigned char buffer[64]; unsigned int block[16];}*) -->
       <function-decl name='MD5_Init' filepath='../../.././libsanitizer/tsan/tsan_md5.cc' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type '__tsan::__anonymous_struct__*' -->
+        <!-- parameter of type 'struct {__tsan::MD5_u32plus lo; __tsan::MD5_u32plus hi; __tsan::MD5_u32plus a; __tsan::MD5_u32plus b; __tsan::MD5_u32plus c; __tsan::MD5_u32plus d; unsigned char buffer[64]; unsigned int block[16];}*' -->
         <parameter type-id='type-id-1508'/>
         <!-- void -->
         <return type-id='type-id-27'/>
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 0a6893b4..adff58f8 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
@@ -8146,7 +8146,7 @@
       <!-- class std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> > -->
       <class-decl name='_Deque_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&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-152'>
         <member-type access='protected'>
-          <!-- enum std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::__anonymous_enum__ -->
+          <!-- 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-258'>
             <underlying-type type-id='type-id-127'/>
             <enumerator name='_S_initial_map_size' value='8'/>
@@ -12813,7 +12813,7 @@
       <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-321'/>
       <member-type access='private'>
-        <!-- enum vtkLineIntegralConvolution2D::__anonymous_enum__ -->
+        <!-- enum {ENHANCE_CONTRAST_OFF=0, ENHANCE_CONTRAST_ON=1, } -->
         <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='149' column='1' id='type-id-322'>
           <underlying-type type-id='type-id-127'/>
           <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
@@ -21260,18 +21260,8 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <!-- enum vtkSurfaceLICPainter::__anonymous_enum__ -->
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-686'>
-          <underlying-type type-id='type-id-127'/>
-          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
-          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
-          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
-          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- enum vtkSurfaceLICPainter::__anonymous_enum__1 -->
-        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-687'>
+        <!-- enum {COMPOSITE_AUTO=3, COMPOSITE_BALANCED=2, COMPOSITE_INPLACE=0, COMPOSITE_INPLACE_DISJOINT=1, } -->
+        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-686'>
           <underlying-type type-id='type-id-127'/>
           <enumerator name='COMPOSITE_INPLACE' value='0'/>
           <enumerator name='COMPOSITE_INPLACE_DISJOINT' value='1'/>
@@ -21279,6 +21269,16 @@
           <enumerator name='COMPOSITE_AUTO' value='3'/>
         </enum-decl>
       </member-type>
+      <member-type access='private'>
+        <!-- enum {ENHANCE_CONTRAST_BOTH=4, ENHANCE_CONTRAST_COLOR=3, ENHANCE_CONTRAST_LIC=1, ENHANCE_CONTRAST_OFF=0, } -->
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-687'>
+          <underlying-type type-id='type-id-127'/>
+          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
+          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
+          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
+          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
+        </enum-decl>
+      </member-type>
       <data-member access='protected' layout-offset-in-bits='1088'>
         <!-- int vtkSurfaceLICPainter::NumberOfSteps -->
         <var-decl name='NumberOfSteps' type-id='type-id-13' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='487' column='1'/>
@@ -24118,18 +24118,8 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <!-- enum vtkSurfaceLICPainter::__anonymous_enum__ -->
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-686'>
-          <underlying-type type-id='type-id-127'/>
-          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
-          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
-          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
-          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <!-- enum vtkSurfaceLICPainter::__anonymous_enum__1 -->
-        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-687'>
+        <!-- enum {COMPOSITE_AUTO=3, COMPOSITE_BALANCED=2, COMPOSITE_INPLACE=0, COMPOSITE_INPLACE_DISJOINT=1, } -->
+        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-686'>
           <underlying-type type-id='type-id-127'/>
           <enumerator name='COMPOSITE_INPLACE' value='0'/>
           <enumerator name='COMPOSITE_INPLACE_DISJOINT' value='1'/>
@@ -24137,6 +24127,16 @@
           <enumerator name='COMPOSITE_AUTO' value='3'/>
         </enum-decl>
       </member-type>
+      <member-type access='private'>
+        <!-- enum {ENHANCE_CONTRAST_BOTH=4, ENHANCE_CONTRAST_COLOR=3, ENHANCE_CONTRAST_LIC=1, ENHANCE_CONTRAST_OFF=0, } -->
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-687'>
+          <underlying-type type-id='type-id-127'/>
+          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
+          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
+          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
+          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
+        </enum-decl>
+      </member-type>
       <data-member access='protected' layout-offset-in-bits='1088'>
         <!-- int vtkSurfaceLICPainter::NumberOfSteps -->
         <var-decl name='NumberOfSteps' type-id='type-id-13' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='487' column='1'/>
@@ -27487,7 +27487,7 @@
       <!-- class vtkSurfaceLICPainterUtil::RandomNoise2D -->
       <class-decl name='RandomNoise2D' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='299' column='1' id='type-id-820'>
         <member-type access='private'>
-          <!-- enum vtkSurfaceLICPainterUtil::RandomNoise2D::__anonymous_enum__ -->
+          <!-- enum {GAUSSIAN=1, PERLIN=2, UNIFORM=0, } -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='319' column='1' id='type-id-926'>
             <underlying-type type-id='type-id-127'/>
             <enumerator name='UNIFORM' value='0'/>
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 ea12beac..97490f59 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
@@ -20183,7 +20183,7 @@
     <!-- class ProfileHandler -->
     <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1168'>
       <member-type access='private'>
-        <!-- enum ProfileHandler::__anonymous_enum__ -->
+        <!-- enum {TIMERS_ONE_SET=1, TIMERS_SEPARATE=3, TIMERS_SHARED=2, TIMERS_UNTOUCHED=0, } -->
         <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1169'>
           <underlying-type type-id='type-id-96'/>
           <enumerator name='TIMERS_UNTOUCHED' value='0'/>
@@ -25068,21 +25068,21 @@
     <!-- class SpinLock -->
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-290'>
       <member-type access='private'>
-        <!-- enum SpinLock::__anonymous_enum__ -->
+        <!-- enum {kSpinLockFree=0, } -->
         <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1411'>
           <underlying-type type-id='type-id-96'/>
           <enumerator name='kSpinLockFree' value='0'/>
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <!-- enum SpinLock::__anonymous_enum__1 -->
+        <!-- enum {kSpinLockHeld=1, } -->
         <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1412'>
           <underlying-type type-id='type-id-96'/>
           <enumerator name='kSpinLockHeld' value='1'/>
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <!-- enum SpinLock::__anonymous_enum__30 -->
+        <!-- enum {kSpinLockSleeper=2, } -->
         <enum-decl name='__anonymous_enum__30' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1413'>
           <underlying-type type-id='type-id-96'/>
           <enumerator name='kSpinLockSleeper' value='2'/>
@@ -32572,7 +32572,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <!-- enum tcmalloc::ThreadCache::__anonymous_enum__ -->
+          <!-- enum {have_tls=1, } -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/thread_cache.h' line='69' column='1' id='type-id-1620'>
             <underlying-type type-id='type-id-96'/>
             <enumerator name='have_tls' value='1'/>
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 4b4166bf..3de32474 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
@@ -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 std::_Deque_base<unsigned char, std::allocator<unsigned char> >::__anonymous_enum__ -->
+          <!-- 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'/>
diff --git a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
index fc35f21d..d0515c69 100644
--- a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
+++ b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
@@ -4,8 +4,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 1 function with some indirect sub-type change:
 
   [C] 'function char f1(Struct1Ptr)' has some indirect sub-type changes:
-    parameter 1 of type 'typedef Struct1Ptr' has sub-type changes:
-      underlying type '__anonymous_struct__1*' changed:
+    parameter 1 of type 'typedef Struct1Ptr' changed:
+      underlying type 'struct {char m1; char m2;}*' changed:
         in pointed to type 'struct {char m1; char m2;}':
           type size changed from 16 to 8 (in bits)
           1 data member deletion:
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index a1f8778c..501658df 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -357,136 +357,133 @@
     <qualified-type-def type-id='type-id-110' restrict='yes' id='type-id-111'/>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-112'/>
     <qualified-type-def type-id='type-id-112' restrict='yes' 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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
-    <reference-type-def kind='rvalue' type-id='type-id-118' size-in-bits='64' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-121'/>
+    <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-117' size-in-bits='64' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
+    <pointer-type-def type-id='type-id-114' 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'/>
-    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-126'/>
     <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-127'/>
-    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
-    <qualified-type-def type-id='type-id-131' const='yes' id='type-id-132'/>
+    <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'/>
-    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
-    <qualified-type-def type-id='type-id-137' const='yes' id='type-id-138'/>
+    <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'/>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-142'/>
-    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
+    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-143'/>
     <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-145'/>
-    <qualified-type-def type-id='type-id-146' const='yes' id='type-id-147'/>
-    <reference-type-def kind='lvalue' type-id='type-id-147' size-in-bits='64' id='type-id-148'/>
-    <qualified-type-def type-id='type-id-149' 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-152' const='yes' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-132' 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'/>
-    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
-    <qualified-type-def type-id='type-id-157' restrict='yes' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-160'/>
-    <reference-type-def kind='rvalue' type-id='type-id-128' size-in-bits='64' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-128' 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-131' size-in-bits='64' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-170'/>
-    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-172'/>
-    <reference-type-def kind='lvalue' type-id='type-id-173' size-in-bits='64' id='type-id-174'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-175'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-176'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-179'/>
-    <reference-type-def kind='lvalue' type-id='type-id-146' size-in-bits='64' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-181'/>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-182'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-184'/>
-    <reference-type-def kind='lvalue' type-id='type-id-185' size-in-bits='64' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-187'/>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-155'/>
+    <qualified-type-def type-id='type-id-119' const='yes' id='type-id-156'/>
+    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-157'/>
+    <qualified-type-def type-id='type-id-122' const='yes' id='type-id-158'/>
+    <qualified-type-def type-id='type-id-124' const='yes' id='type-id-159'/>
+    <qualified-type-def type-id='type-id-149' const='yes' id='type-id-160'/>
+    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-161'/>
+    <qualified-type-def type-id='type-id-130' const='yes' id='type-id-162'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-163'/>
+    <reference-type-def kind='lvalue' type-id='type-id-161' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-172'/>
+    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-174'/>
+    <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-178'/>
+    <qualified-type-def type-id='type-id-178' restrict='yes' id='type-id-179'/>
+    <reference-type-def kind='lvalue' type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
     <class-decl name='div_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-32' visibility='default' id='type-id-25'/>
-    <class-decl name='tm' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-155'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-191'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-192'/>
+    <class-decl name='tm' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-186'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-188'/>
+    <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-193'/>
+      <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'>
         <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-194' is-artificial='yes'/>
-            <return type-id='type-id-195'/>
+            <parameter type-id='type-id-191' is-artificial='yes'/>
+            <return type-id='type-id-192'/>
           </function-decl>
         </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-195'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-192'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='eof' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE3eofEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-194' is-artificial='yes'/>
+            <parameter type-id='type-id-191' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fail' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE4failEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-194' is-artificial='yes'/>
+            <parameter type-id='type-id-191' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -494,105 +491,105 @@
         <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'>
         <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-197' is-artificial='yes'/>
-            <return type-id='type-id-198'/>
+            <parameter type-id='type-id-194' is-artificial='yes'/>
+            <return type-id='type-id-195'/>
           </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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -600,91 +597,91 @@
         <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <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'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='memory_order' naming-typedef-id='type-id-199' is-declaration-only='yes' id='type-id-200'>
+      <enum-decl name='memory_order' naming-typedef-id='type-id-196' is-declaration-only='yes' id='type-id-197'>
         <underlying-type type-id='type-id-47'/>
       </enum-decl>
-      <typedef-decl name='memory_order' type-id='type-id-200' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='63' column='1' id='type-id-199'/>
-      <typedef-decl name='ptrdiff_t' type-id='type-id-18' 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-201'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-185' visibility='default' is-declaration-only='yes' id='type-id-202'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-149'>
+      <typedef-decl name='memory_order' type-id='type-id-197' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='63' column='1' id='type-id-196'/>
+      <typedef-decl name='ptrdiff_t' type-id='type-id-18' 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-198'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-180' visibility='default' is-declaration-only='yes' id='type-id-199'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-119'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-204' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-203'/>
+          <typedef-decl name='pointer' type-id='type-id-201' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-200'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIhSaIhEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-151' is-artificial='yes'/>
+            <parameter type-id='type-id-166' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIhSaIhEE6resizeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-182' is-artificial='yes'/>
+            <parameter type-id='type-id-120' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNSt6vectorIhSaIhEE4dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-182' is-artificial='yes'/>
+            <parameter type-id='type-id-120' is-artificial='yes'/>
             <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorIhSaIhEE15_M_erase_at_endEPh' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-182' is-artificial='yes'/>
-            <parameter type-id='type-id-203'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-120' is-artificial='yes'/>
+            <parameter type-id='type-id-200'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIhSaIhEE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-151' is-artificial='yes'/>
+            <parameter type-id='type-id-166' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -692,96 +689,96 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_append' mangled-name='_ZNSt6vectorIhSaIhEE17_M_default_appendEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIhSaIhEE17_M_default_appendEm'>
-            <parameter type-id='type-id-182' is-artificial='yes'/>
+            <parameter type-id='type-id-120' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-205'/>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-183'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-202'/>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-185'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-206' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-204'/>
+          <typedef-decl name='pointer' type-id='type-id-203' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-201'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIhSaIhEE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-184' is-artificial='yes'/>
+            <parameter type-id='type-id-186' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-204'/>
+            <return type-id='type-id-201'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIhSaIhEE13_M_deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-184' is-artificial='yes'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-186' is-artificial='yes'/>
+            <parameter type-id='type-id-201'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-207'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-204'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-107' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-208'/>
+          <typedef-decl name='pointer' type-id='type-id-107' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-205'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-202' 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-185'/>
+          <typedef-decl name='allocator_type' type-id='type-id-199' 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-180'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIhEE8allocateERS0_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-186'/>
+            <parameter type-id='type-id-181'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-208'/>
+            <return type-id='type-id-205'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIhEE10deallocateERS0_Phm' 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-186'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-181'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-152'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-173'>
         <member-type access='public'>
-          <typedef-decl name='__int_type' type-id='type-id-45' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='241' column='1' id='type-id-209'/>
+          <typedef-decl name='__int_type' type-id='type-id-45' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='241' column='1' id='type-id-206'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-187' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-182' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-187' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-182' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-188'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-183'>
         <member-type access='public'>
-          <typedef-decl name='__integral_type' type-id='type-id-45' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='626' column='1' id='type-id-210'/>
+          <typedef-decl name='__integral_type' type-id='type-id-45' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='626' column='1' id='type-id-207'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-189' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-184' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-211'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-208'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_default_n&lt;unsigned char *, unsigned long&gt;' mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPhmEET_S3_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-107'/>
@@ -790,7 +787,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-212'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-209'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;unsigned char&gt;' mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mIhEEPT_PKS3_S6_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-80'/>
@@ -800,90 +797,90 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-213'>
+      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-210'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;unsigned char *&gt;, unsigned char *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPhES3_EET0_T_S6_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-205'/>
-            <parameter type-id='type-id-205'/>
+            <parameter type-id='type-id-202'/>
+            <parameter type-id='type-id-202'/>
             <parameter type-id='type-id-107'/>
             <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-214'>
+      <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-193' 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-95'/>
         </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-215'/>
+          <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'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-55' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-216'/>
+          <typedef-decl name='pointer' type-id='type-id-55' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-213'/>
         </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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-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-73'>
           <member-type access='private'>
-            <typedef-decl name='const_pointer' type-id='type-id-218' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='87' column='1' id='type-id-217'/>
+            <typedef-decl name='const_pointer' type-id='type-id-215' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='87' column='1' id='type-id-214'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer' type-id='type-id-220' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='86' column='1' id='type-id-219'/>
+            <typedef-decl name='pointer' type-id='type-id-217' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='86' column='1' id='type-id-216'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='size_type' type-id='type-id-222' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='82' column='1' id='type-id-221'/>
+            <typedef-decl name='size_type' type-id='type-id-219' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='82' column='1' id='type-id-218'/>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-223'>
+            <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-220'>
               <member-function access='public'>
                 <function-decl name='_Alloc_hider' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-224' is-artificial='yes'/>
-                  <parameter type-id='type-id-219'/>
-                  <parameter type-id='type-id-225'/>
-                  <return type-id='type-id-196'/>
+                  <parameter type-id='type-id-221' is-artificial='yes'/>
+                  <parameter type-id='type-id-216'/>
+                  <parameter type-id='type-id-222'/>
+                  <return type-id='type-id-193'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-226'>
+            <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-223'>
               <member-function access='public'>
                 <function-decl name='_Alloc_hider' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-227' is-artificial='yes'/>
-                  <parameter type-id='type-id-219'/>
-                  <parameter type-id='type-id-225'/>
-                  <return type-id='type-id-196'/>
+                  <parameter type-id='type-id-224' is-artificial='yes'/>
+                  <parameter type-id='type-id-216'/>
+                  <parameter type-id='type-id-222'/>
+                  <return type-id='type-id-193'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-228'>
+            <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-225'>
               <member-function access='public'>
                 <function-decl name='_Alloc_hider' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-229' is-artificial='yes'/>
-                  <parameter type-id='type-id-219'/>
-                  <parameter type-id='type-id-225'/>
-                  <return type-id='type-id-196'/>
+                  <parameter type-id='type-id-226' is-artificial='yes'/>
+                  <parameter type-id='type-id-216'/>
+                  <parameter type-id='type-id-222'/>
+                  <return type-id='type-id-193'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-230'>
+            <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-227'>
               <member-function access='public'>
                 <function-decl name='_Alloc_hider' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_Alloc_hiderC2EPcRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-231' is-artificial='yes'/>
-                  <parameter type-id='type-id-219'/>
-                  <parameter type-id='type-id-225'/>
-                  <return type-id='type-id-196'/>
+                  <parameter type-id='type-id-228' is-artificial='yes'/>
+                  <parameter type-id='type-id-216'/>
+                  <parameter type-id='type-id-222'/>
+                  <return type-id='type-id-193'/>
                 </function-decl>
               </member-function>
             </class-decl>
@@ -891,13 +888,13 @@
           <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'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_data' mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_M_dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-75' is-artificial='yes'/>
-              <return type-id='type-id-219'/>
+              <return type-id='type-id-216'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
@@ -915,26 +912,26 @@
           <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'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_local_data' mangled-name='_ZNKSt7__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='148' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-75' is-artificial='yes'/>
-              <return type-id='type-id-217'/>
+              <return type-id='type-id-214'/>
             </function-decl>
           </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-221'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
@@ -946,19 +943,19 @@
           <member-function access='public'>
             <function-decl name='length' mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6lengthEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='721' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-75' is-artificial='yes'/>
-              <return type-id='type-id-221'/>
+              <return type-id='type-id-218'/>
             </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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
@@ -970,90 +967,90 @@
           <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-232'/>
-              <return type-id='type-id-233'/>
+              <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-232'/>
-              <return type-id='type-id-233'/>
+              <parameter type-id='type-id-229'/>
+              <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='size' mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-75' is-artificial='yes'/>
-              <return type-id='type-id-221'/>
+              <return type-id='type-id-218'/>
             </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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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-232'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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-60'/>
-              <parameter type-id='type-id-225'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-222'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </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-60'/>
-              <parameter type-id='type-id-221'/>
-              <parameter type-id='type-id-225'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-218'/>
+              <parameter type-id='type-id-222'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </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-234'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-219'/>
+              <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-221'/>
-              <return type-id='type-id-196'/>
+              <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-221'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-218'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -1061,8 +1058,8 @@
               <parameter type-id='type-id-97' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
-              <parameter type-id='type-id-235'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-232'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -1070,8 +1067,8 @@
               <parameter type-id='type-id-97' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
-              <parameter type-id='type-id-236'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-233'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -1079,29 +1076,29 @@
               <parameter type-id='type-id-97' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </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-219'/>
-              <return type-id='type-id-196'/>
+              <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-221'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-218'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
             <function-decl name='_S_copy' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_S_copyEPcPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-60'/>
-              <parameter type-id='type-id-221'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-218'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
@@ -1109,14 +1106,14 @@
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </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-234'/>
-              <return type-id='type-id-233'/>
+              <parameter type-id='type-id-231'/>
+              <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -1124,8 +1121,8 @@
               <parameter type-id='type-id-97' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
-              <parameter type-id='type-id-235'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-232'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -1133,8 +1130,8 @@
               <parameter type-id='type-id-97' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
-              <parameter type-id='type-id-236'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-233'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -1142,7 +1139,7 @@
               <parameter type-id='type-id-97' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
@@ -1150,246 +1147,246 @@
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </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-232'/>
-              <return type-id='type-id-233'/>
+              <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-232'/>
-              <return type-id='type-id-233'/>
+              <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-60'/>
-              <return type-id='type-id-233'/>
+              <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_check_length' mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE15_M_check_lengthEmmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-75' is-artificial='yes'/>
-              <parameter type-id='type-id-221'/>
-              <parameter type-id='type-id-221'/>
+              <parameter type-id='type-id-218'/>
+              <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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-60'/>
-              <parameter type-id='type-id-221'/>
-              <return type-id='type-id-233'/>
+              <parameter type-id='type-id-218'/>
+              <return type-id='type-id-230'/>
             </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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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-60'/>
-              <parameter type-id='type-id-225'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-222'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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-232'/>
-              <return type-id='type-id-196'/>
+              <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-60'/>
-              <parameter type-id='type-id-221'/>
-              <parameter type-id='type-id-225'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-218'/>
+              <parameter type-id='type-id-222'/>
+              <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='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-234'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-231'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='substr' mangled-name='_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6substrEmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='2293' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-75' is-artificial='yes'/>
-              <parameter type-id='type-id-221'/>
-              <parameter type-id='type-id-221'/>
+              <parameter type-id='type-id-218'/>
+              <parameter type-id='type-id-218'/>
               <return type-id='type-id-73'/>
             </function-decl>
           </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-221'/>
-              <parameter type-id='type-id-221'/>
+              <parameter type-id='type-id-218'/>
+              <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
-              <parameter type-id='type-id-221'/>
-              <return type-id='type-id-233'/>
+              <parameter type-id='type-id-218'/>
+              <return type-id='type-id-230'/>
             </function-decl>
           </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-221'/>
+              <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-233'/>
+              <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='basic_stringbuf&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='832' visibility='default' id='type-id-237'/>
+        <class-decl name='basic_stringbuf&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='832' visibility='default' id='type-id-234'/>
         <class-decl name='basic_stringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3136' visibility='default' id='type-id-76'>
           <member-type access='private'>
-            <typedef-decl name='__string_type' type-id='type-id-73' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='669' column='1' id='type-id-238'/>
+            <typedef-decl name='__string_type' type-id='type-id-73' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='669' column='1' id='type-id-235'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='str' mangled-name='_ZNKSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEE3strEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-78' is-artificial='yes'/>
-              <return type-id='type-id-238'/>
+              <return type-id='type-id-235'/>
             </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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <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'/>
-              <return type-id='type-id-196'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-114'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-146'>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIhE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-115' is-artificial='yes'/>
+            <parameter type-id='type-id-147' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-208'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-205'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIhE10deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-115' is-artificial='yes'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-147' is-artificial='yes'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-116'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-151'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-152' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-239'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-236'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-208' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-206'/>
+          <typedef-decl name='pointer' type-id='type-id-205' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-203'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-240'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-237'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-215' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='105' column='1' id='type-id-218'/>
+          <typedef-decl name='const_pointer' type-id='type-id-212' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='105' column='1' id='type-id-215'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-216' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-220'/>
+          <typedef-decl name='pointer' type-id='type-id-213' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-217'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='106' column='1' id='type-id-222'/>
+          <typedef-decl name='size_type' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='106' column='1' id='type-id-219'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -1528,7 +1525,7 @@
     <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-56'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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'/>
@@ -1653,14 +1650,14 @@
       <return type-id='type-id-16'/>
     </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-191'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-39'/>
     </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-192'/>
+      <parameter type-id='type-id-189'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-52'/>
@@ -1678,7 +1675,7 @@
     </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-196'/>
+      <return type-id='type-id-193'/>
     </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'/>
@@ -1692,7 +1689,7 @@
     </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-196'/>
+      <return type-id='type-id-193'/>
     </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'/>
@@ -1704,7 +1701,7 @@
     </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-60'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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-61'/>
@@ -1762,28 +1759,28 @@
     </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-45'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-39'/>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-190'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-190'/>
-      <return type-id='type-id-196'/>
+      <parameter type-id='type-id-187'/>
+      <return type-id='type-id-193'/>
     </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-196'/>
+      <return type-id='type-id-193'/>
     </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-109'/>
@@ -1795,15 +1792,15 @@
     </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-16'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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-16'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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-16'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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-60'/>
@@ -1814,11 +1811,11 @@
       <return type-id='type-id-16'/>
     </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-190'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-29'/>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </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-16'/>
@@ -1876,34 +1873,34 @@
       <return type-id='type-id-39'/>
     </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-191'/>
-      <parameter type-id='type-id-192'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-189'/>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-190'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-190'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-190'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-39'/>
       <return type-id='type-id-16'/>
     </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-190'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </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-56'/>
@@ -2310,7 +2307,7 @@
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-179'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='iswalnum' filepath='/usr/include/wctype.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2956,12 +2953,12 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='bsearch' filepath='/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h' line='20' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-29'/>
-      <return type-id='type-id-190'/>
+      <return type-id='type-id-187'/>
     </function-decl>
     <function-decl name='atof' filepath='/usr/include/x86_64-linux-gnu/bits/stdlib-float.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-60'/>
@@ -2969,133 +2966,133 @@
     </function-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-146'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-134'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [25]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA25_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <parameter type-id='type-id-135' is-artificial='yes'/>
               <parameter type-id='type-id-66'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <parameter type-id='type-id-135' is-artificial='yes'/>
               <parameter type-id='type-id-70'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [21]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA21_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <parameter type-id='type-id-135' is-artificial='yes'/>
               <parameter type-id='type-id-64'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [24]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA24_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <parameter type-id='type-id-135' is-artificial='yes'/>
               <parameter type-id='type-id-65'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-159'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-117'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_14ConstDataRangeEEC2ES1_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-160' is-artificial='yes'/>
-            <parameter type-id='type-id-128'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-118' is-artificial='yes'/>
+            <parameter type-id='type-id-140'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_14ConstDataRangeEEC2ENS_10ErrorCodes5ErrorERKN10mongoutils3str6streamE' filepath='src/mongo/base/status_with.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-160' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <parameter type-id='type-id-148'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-118' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-128'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-140'>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNK5mongo14ConstDataRange4dataEv' filepath='src/mongo/base/data_range.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-130' is-artificial='yes'/>
+            <parameter type-id='type-id-165' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='length' mangled-name='_ZNK5mongo14ConstDataRange6lengthEv' filepath='src/mongo/base/data_range.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-130' is-artificial='yes'/>
+            <parameter type-id='type-id-165' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcS2_l' filepath='src/mongo/base/data_range.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
+            <parameter type-id='type-id-141' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcml' filepath='src/mongo/base/data_range.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
+            <parameter type-id='type-id-141' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-163'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-144'>
         <member-function access='public'>
           <function-decl name='compress' mangled-name='_ZN5mongo15BlockCompressor8compressENS_14ConstDataRangeE' filepath='src/mongo/db/ftdc/block_compressor.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15BlockCompressor8compressENS_14ConstDataRangeE'>
-            <parameter type-id='type-id-164' is-artificial='yes'/>
-            <parameter type-id='type-id-128'/>
-            <return type-id='type-id-159'/>
+            <parameter type-id='type-id-145' is-artificial='yes'/>
+            <parameter type-id='type-id-140'/>
+            <return type-id='type-id-117'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='uncompress' mangled-name='_ZN5mongo15BlockCompressor10uncompressENS_14ConstDataRangeEm' filepath='src/mongo/db/ftdc/block_compressor.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15BlockCompressor10uncompressENS_14ConstDataRangeEm'>
-            <parameter type-id='type-id-164' is-artificial='yes'/>
-            <parameter type-id='type-id-128'/>
+            <parameter type-id='type-id-145' is-artificial='yes'/>
+            <parameter type-id='type-id-140'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-159'/>
+            <return type-id='type-id-117'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-165'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-153'>
         <member-function access='public'>
           <function-decl name='operator StringData' mangled-name='_ZN5mongo4ItoAcvNS_10StringDataEEv' filepath='src/mongo/util/itoa.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-166' is-artificial='yes'/>
-            <return type-id='type-id-143'/>
+            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-131'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-122'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-134'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-132'>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-168' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-133' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-168' is-artificial='yes'/>
+                <parameter type-id='type-id-133' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-136' is-artificial='yes'/>
+                <parameter type-id='type-id-172' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -3103,499 +3100,489 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-167' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-123' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-131'/>
+            <return type-id='type-id-122'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-131'/>
+            <return type-id='type-id-122'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
+            <parameter type-id='type-id-168' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <parameter type-id='type-id-123' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-137'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-124'>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-170' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-125' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-170' is-artificial='yes'/>
+            <parameter type-id='type-id-125' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-139' is-artificial='yes'/>
+            <parameter type-id='type-id-169' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-170' is-artificial='yes'/>
+            <parameter type-id='type-id-125' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-171'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-126'>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-172' is-artificial='yes'/>
+            <parameter type-id='type-id-127' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-172' is-artificial='yes'/>
+            <parameter type-id='type-id-127' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi'>
-            <parameter type-id='type-id-172' is-artificial='yes'/>
+            <parameter type-id='type-id-127' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-173'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-128'>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
-            <parameter type-id='type-id-143'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
+            <parameter type-id='type-id-149'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='439' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
-            <parameter type-id='type-id-143'/>
-            <return type-id='type-id-174'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
+            <parameter type-id='type-id-149'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-174'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEi' filepath='src/mongo/bson/util/builder.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-174'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEc' filepath='src/mongo/bson/util/builder.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-174'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendIntegral&lt;int&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIiEERS2_T_i' filepath='src/mongo/bson/util/builder.h' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIiEERS2_T_i'>
-            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-129' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-174'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-140'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-130'>
         <member-type access='private'>
-          <typedef-decl name='WordType' type-id='type-id-45' filepath='src/mongo/platform/atomic_word.h' line='54' column='1' id='type-id-242'/>
+          <typedef-decl name='WordType' type-id='type-id-45' filepath='src/mongo/platform/atomic_word.h' line='54' column='1' id='type-id-239'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-176' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-176' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-176' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-142' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-143'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-149'>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-145' is-artificial='yes'/>
+            <parameter type-id='type-id-170' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-177' is-artificial='yes'/>
+            <parameter type-id='type-id-150' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKcm' filepath='src/mongo/base/string_data.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-177' is-artificial='yes'/>
+            <parameter type-id='type-id-150' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-243'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-240'>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-241'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' is-declaration-only='yes' id='type-id-238'>
             <underlying-type type-id='type-id-47'/>
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-178'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-142'>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-179' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-143' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-178'/>
+            <return type-id='type-id-142'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-118'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-114'>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-121' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-121' is-artificial='yes'/>
-            <parameter type-id='type-id-119'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-121' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-119'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </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.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-121' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-127' is-artificial='yes'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-127' is-artificial='yes'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-127' is-artificial='yes'/>
-            <return type-id='type-id-169'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <return type-id='type-id-148'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-122'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-138'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-245' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-244'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-242' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-241'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-123' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-139' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2EOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-123' is-artificial='yes'/>
-            <parameter type-id='type-id-244'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-139' is-artificial='yes'/>
+            <parameter type-id='type-id-241'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-124'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-136'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-246' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-245'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-243' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-242'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-125' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-137' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE9constructEOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-125' is-artificial='yes'/>
-              <parameter type-id='type-id-245'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-137' is-artificial='yes'/>
+              <parameter type-id='type-id-242'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2EOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-125' is-artificial='yes'/>
-              <parameter type-id='type-id-245'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-137' is-artificial='yes'/>
+              <parameter type-id='type-id-242'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-247'>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-244'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-161' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-246'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-243'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <type-decl name='variadic parameter type' id='type-id-248'/>
-    <type-decl name='void' id='type-id-196'/>
-    <pointer-type-def type-id='type-id-196' id='type-id-190'/>
+    <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'>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-187'/>
       <return type-id='type-id-16'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-108'>
-      <return type-id='type-id-196'/>
+      <return type-id='type-id-193'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/collector.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <typedef-decl name='__clock_t' type-id='type-id-18' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-249'/>
-    <typedef-decl name='__time_t' type-id='type-id-18' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-250'/>
-    <typedef-decl name='clock_t' type-id='type-id-249' filepath='/usr/include/time.h' line='59' column='1' id='type-id-251'/>
-    <typedef-decl name='time_t' type-id='type-id-250' filepath='/usr/include/time.h' line='75' column='1' id='type-id-252'/>
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-253'/>
+    <typedef-decl name='__clock_t' type-id='type-id-18' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-246'/>
+    <typedef-decl name='__time_t' type-id='type-id-18' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-247'/>
+    <typedef-decl name='clock_t' type-id='type-id-246' filepath='/usr/include/time.h' line='59' column='1' id='type-id-248'/>
+    <typedef-decl name='time_t' type-id='type-id-247' filepath='/usr/include/time.h' line='75' column='1' id='type-id-249'/>
+    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-251' 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-254' const='yes' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-256'/>
-    <qualified-type-def type-id='type-id-257' const='yes' id='type-id-258'/>
-    <reference-type-def kind='lvalue' type-id='type-id-258' size-in-bits='64' id='type-id-259'/>
-    <qualified-type-def type-id='type-id-252' const='yes' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
+    <reference-type-def kind='lvalue' type-id='type-id-255' size-in-bits='64' id='type-id-256'/>
+    <qualified-type-def type-id='type-id-249' const='yes' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <reference-type-def kind='rvalue' type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
     <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <reference-type-def kind='rvalue' type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-264'/>
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-270'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-271'/>
+    <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-268'/>
+    <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'/>
     <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-273'/>
     <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
     <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-277'/>
-    <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'/>
+    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
     <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-283'/>
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
-    <qualified-type-def type-id='type-id-284' restrict='yes' id='type-id-285'/>
-    <qualified-type-def type-id='type-id-281' 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-289' const='yes' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
-    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
     <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-294'/>
-    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-298' 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-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-295' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
     <pointer-type-def type-id='type-id-312' 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-303' size-in-bits='64' id='type-id-314'/>
     <pointer-type-def 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'/>
-    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-319'/>
-    <qualified-type-def type-id='type-id-320' const='yes' id='type-id-321'/>
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-322'/>
-    <qualified-type-def type-id='type-id-323' const='yes' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-325'/>
-    <qualified-type-def type-id='type-id-326' 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-329' const='yes' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <qualified-type-def type-id='type-id-278' const='yes' id='type-id-319'/>
+    <reference-type-def kind='lvalue' type-id='type-id-319' size-in-bits='64' id='type-id-320'/>
+    <qualified-type-def type-id='type-id-274' const='yes' id='type-id-321'/>
+    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-322'/>
+    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-323'/>
+    <qualified-type-def type-id='type-id-291' const='yes' id='type-id-324'/>
+    <qualified-type-def type-id='type-id-325' const='yes' id='type-id-326'/>
+    <qualified-type-def type-id='type-id-293' const='yes' id='type-id-327'/>
+    <qualified-type-def type-id='type-id-297' const='yes' id='type-id-328'/>
+    <qualified-type-def type-id='type-id-299' const='yes' id='type-id-329'/>
+    <qualified-type-def type-id='type-id-283' const='yes' id='type-id-330'/>
+    <qualified-type-def type-id='type-id-307' const='yes' id='type-id-331'/>
     <qualified-type-def type-id='type-id-332' const='yes' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
-    <qualified-type-def type-id='type-id-335' const='yes' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-337'/>
-    <qualified-type-def type-id='type-id-338' const='yes' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
-    <qualified-type-def type-id='type-id-341' const='yes' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-343'/>
-    <qualified-type-def type-id='type-id-344' const='yes' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <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-289' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-351'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-352'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-353'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-354'/>
-    <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'/>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-358'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-362' size-in-bits='64' id='type-id-363'/>
-    <reference-type-def kind='rvalue' type-id='type-id-362' size-in-bits='64' id='type-id-364'/>
-    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-365'/>
-    <reference-type-def kind='rvalue' type-id='type-id-311' size-in-bits='64' id='type-id-366'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-367'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-368'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-369'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-370'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-373'/>
-    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-374'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-375'/>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-377'/>
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-379'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-383'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-385'/>
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-386'/>
+    <qualified-type-def type-id='type-id-289' const='yes' id='type-id-334'/>
+    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-335'/>
+    <qualified-type-def type-id='type-id-303' const='yes' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-345'/>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-346'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-347'/>
+    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-348'/>
+    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-349'/>
+    <pointer-type-def type-id='type-id-336' 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'/>
+    <qualified-type-def type-id='type-id-356' const='yes' id='type-id-357'/>
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-359'/>
+    <qualified-type-def type-id='type-id-360' const='yes' id='type-id-361'/>
+    <qualified-type-def type-id='type-id-362' const='yes' id='type-id-363'/>
+    <qualified-type-def type-id='type-id-364' const='yes' id='type-id-365'/>
+    <reference-type-def kind='lvalue' type-id='type-id-359' size-in-bits='64' id='type-id-366'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-367'/>
+    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-368'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-370'/>
+    <qualified-type-def type-id='type-id-367' restrict='yes' id='type-id-371'/>
+    <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-351' size-in-bits='64' id='type-id-374'/>
+    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-376'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-354'/>
+    <reference-type-def kind='rvalue' type-id='type-id-364' size-in-bits='64' id='type-id-377'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-382'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-384'/>
+    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
     <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-388'/>
     <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-390'/>
-    <reference-type-def kind='rvalue' type-id='type-id-335' size-in-bits='64' id='type-id-391'/>
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-392'/>
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-393'/>
-    <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-396' size-in-bits='64' id='type-id-397'/>
-    <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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-401' size-in-bits='64' id='type-id-402'/>
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-406'/>
-    <reference-type-def kind='rvalue' type-id='type-id-338' size-in-bits='64' id='type-id-407'/>
-    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-409'/>
-    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-410'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-272'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-411'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-393'/>
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-397'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-398'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-401' visibility='default' is-declaration-only='yes' id='type-id-413'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-414'>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-375' visibility='default' is-declaration-only='yes' id='type-id-399'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-400'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-415'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-401'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-326'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-272'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-417' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-416'/>
+          <typedef-decl name='const_iterator' type-id='type-id-403' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-402'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-278' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-418'/>
+          <typedef-decl name='iterator' type-id='type-id-269' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-404'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE12emplace_backIJS5_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-375' is-artificial='yes'/>
-            <parameter type-id='type-id-391'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-273' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
-            <return type-id='type-id-416'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
+            <return type-id='type-id-402'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' 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'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-375' is-artificial='yes'/>
-            <return type-id='type-id-418'/>
+            <parameter type-id='type-id-273' is-artificial='yes'/>
+            <return type-id='type-id-404'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-375' is-artificial='yes'/>
-            <return type-id='type-id-418'/>
+            <parameter type-id='type-id-273' is-artificial='yes'/>
+            <return type-id='type-id-404'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-328' is-artificial='yes'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -3603,429 +3590,429 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_'>
-            <parameter type-id='type-id-375' is-artificial='yes'/>
-            <parameter type-id='type-id-391'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-273' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-382'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-287'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_RS2_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-383' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <parameter type-id='type-id-363'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-288' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::BSONObj, mongo::Date_t, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_S2_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-383' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <parameter type-id='type-id-364'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-288' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-389'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-305'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo14BSONObjBuilderESt14default_deleteIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-390' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-306' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-335'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-274'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-420' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-419'/>
+          <typedef-decl name='pointer' type-id='type-id-406' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-405'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-421'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-407'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-263' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-420'/>
+              <typedef-decl name='type' type-id='type-id-260' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-406'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-337' is-artificial='yes'/>
-            <return type-id='type-id-419'/>
+            <return type-id='type-id-405'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZNSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EE7releaseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-392' is-artificial='yes'/>
-            <return type-id='type-id-419'/>
+            <parameter type-id='type-id-275' is-artificial='yes'/>
+            <return type-id='type-id-405'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-392' is-artificial='yes'/>
-            <parameter type-id='type-id-391'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-275' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-337' is-artificial='yes'/>
-            <return type-id='type-id-419'/>
+            <return type-id='type-id-405'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-392' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-275' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-398'>
+      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-317'>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='1004' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-400' is-artificial='yes'/>
-            <return type-id='type-id-399'/>
+            <parameter type-id='type-id-318' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-408'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-279'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCCollectorInterface *, std::default_delete&lt;mongo::FTDCCollectorInterface&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-409' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-407'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-280' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-341'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-291'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-423' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-422'/>
+          <typedef-decl name='pointer' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-408'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-424'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-410'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-267' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-423'/>
+              <typedef-decl name='type' type-id='type-id-264' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-409'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIN5mongo16OperationContextENS0_14ServiceContext23OperationContextDeleterEE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-343' is-artificial='yes'/>
-            <return type-id='type-id-422'/>
+            <parameter type-id='type-id-340' is-artificial='yes'/>
+            <return type-id='type-id-408'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt10unique_ptrIN5mongo16OperationContextENS0_14ServiceContext23OperationContextDeleterEEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-343' is-artificial='yes'/>
-            <return type-id='type-id-422'/>
+            <parameter type-id='type-id-340' is-artificial='yes'/>
+            <return type-id='type-id-408'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo16OperationContextENS0_14ServiceContext23OperationContextDeleterEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-410' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-292' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-344'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-325'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-426' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-425'/>
+          <typedef-decl name='pointer' type-id='type-id-412' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-411'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-427'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-413'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-266' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-426'/>
+              <typedef-decl name='type' type-id='type-id-263' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-412'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIN5mongo6LockerESt14default_deleteIS1_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-346' is-artificial='yes'/>
-            <return type-id='type-id-425'/>
+            <parameter type-id='type-id-341' is-artificial='yes'/>
+            <return type-id='type-id-411'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-428'>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-376'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-383'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6Date_tELb0EEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-377' is-artificial='yes'/>
-            <parameter type-id='type-id-363'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6Date_tELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-377' is-artificial='yes'/>
-            <parameter type-id='type-id-364'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-378'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-385'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6Date_tEEEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-379' is-artificial='yes'/>
-            <parameter type-id='type-id-363'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::Date_t&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6Date_tEEEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-379' is-artificial='yes'/>
-            <parameter type-id='type-id-364'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-386' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-380'>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-387'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_JRS2_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-381' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <parameter type-id='type-id-363'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-388' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::BSONObj, mongo::Date_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_JS2_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-381' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <parameter type-id='type-id-364'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-388' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-384'>
+      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-389'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::BSONObj&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo7BSONObjELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-385' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-390' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-329'>
+      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-360'>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-386' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-391' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-386' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-391' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-386' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-391' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-331' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-369' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-387'>
+      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-392'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-388' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-393' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-332'>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-356'>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-334' is-artificial='yes'/>
-            <parameter type-id='type-id-353'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-368' is-artificial='yes'/>
+            <parameter type-id='type-id-308'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-396'>
+      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-395'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-430' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-429'/>
+          <typedef-decl name='pointer' type-id='type-id-416' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-415'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-397' is-artificial='yes'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-429'/>
+            <return type-id='type-id-415'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE13_M_deallocateEPS5_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-397' is-artificial='yes'/>
-            <parameter type-id='type-id-429'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
+            <parameter type-id='type-id-415'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-431'>
+      <class-decl name='__anonymous_struct__21' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-417'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; *&gt;, std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS5_EEES9_EET0_T_SC_SB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-398'/>
-            <parameter type-id='type-id-398'/>
-            <parameter type-id='type-id-393'/>
-            <return type-id='type-id-393'/>
+            <parameter type-id='type-id-317'/>
+            <parameter type-id='type-id-317'/>
+            <parameter type-id='type-id-278'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-432'>
+      <class-decl name='__anonymous_struct__23' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-418'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS4_EEEEvT_S9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-393'/>
-            <parameter type-id='type-id-393'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-278'/>
+            <parameter type-id='type-id-278'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-433'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-419'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-413' 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-401'/>
+          <typedef-decl name='allocator_type' type-id='type-id-399' 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-375'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-393' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-434'/>
+          <typedef-decl name='pointer' type-id='type-id-278' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-420'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt;, std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EEEE9constructIS5_JS5_EEEvRS6_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-402'/>
-            <parameter type-id='type-id-393'/>
-            <parameter type-id='type-id-391'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-376'/>
+            <parameter type-id='type-id-278'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EEEE8allocateERS6_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-402'/>
+            <parameter type-id='type-id-376'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-434'/>
+            <return type-id='type-id-420'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EEEE10deallocateERS6_PS5_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-402'/>
-            <parameter type-id='type-id-434'/>
+            <parameter type-id='type-id-376'/>
+            <parameter type-id='type-id-420'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-403'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-379'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCCollectorInterface *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo22FTDCCollectorInterfaceELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-380' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-405'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-381'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCCollectorInterface *, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-406' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-407'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-382' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-338'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-364'>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo22FTDCCollectorInterfaceEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-340' is-artificial='yes'/>
-            <parameter type-id='type-id-263'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-370' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='__cxx11'>
-        <typedef-decl name='string' type-id='type-id-73' 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-257'/>
+        <typedef-decl name='string' type-id='type-id-73' 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-254'/>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='const_iterator' naming-typedef-id='type-id-416' visibility='default' is-declaration-only='yes' id='type-id-417'/>
-      <class-decl name='iterator' naming-typedef-id='type-id-418' visibility='default' is-declaration-only='yes' id='type-id-278'>
+      <class-decl name='const_iterator' naming-typedef-id='type-id-402' visibility='default' is-declaration-only='yes' id='type-id-403'/>
+      <class-decl name='iterator' naming-typedef-id='type-id-404' visibility='default' is-declaration-only='yes' id='type-id-269'>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EESt6vectorIS6_SaIS6_EEEC2ERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-280' is-artificial='yes'/>
-            <parameter type-id='type-id-395'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-271' is-artificial='yes'/>
+            <parameter type-id='type-id-320'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EESt6vectorIS6_SaIS6_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-280' is-artificial='yes'/>
-            <return type-id='type-id-279'/>
+            <parameter type-id='type-id-271' is-artificial='yes'/>
+            <return type-id='type-id-270'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-274'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-276'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-393' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-435'/>
+          <typedef-decl name='pointer' type-id='type-id-278' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-421'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='construct&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt;, std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EEE9constructIS6_JS6_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-275' is-artificial='yes'/>
-            <parameter type-id='type-id-393'/>
-            <parameter type-id='type-id-391'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-277' is-artificial='yes'/>
+            <parameter type-id='type-id-278'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-275' is-artificial='yes'/>
+            <parameter type-id='type-id-277' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-435'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-421'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EEE10deallocateEPS6_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-275' is-artificial='yes'/>
-            <parameter type-id='type-id-435'/>
+            <parameter type-id='type-id-277' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-276'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-285'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-277' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-286' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-436'>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-422'>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-437'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-423'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-434' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-430'/>
+          <typedef-decl name='pointer' type-id='type-id-420' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-416'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -4035,384 +4022,384 @@
       <return type-id='type-id-39'/>
     </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-251'/>
+      <return type-id='type-id-248'/>
     </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-271'/>
-      <return type-id='type-id-252'/>
+      <parameter type-id='type-id-268'/>
+      <return type-id='type-id-249'/>
     </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-252'/>
-      <parameter type-id='type-id-252'/>
+      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-249'/>
       <return type-id='type-id-14'/>
     </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-273'/>
-      <return type-id='type-id-252'/>
+      <parameter type-id='type-id-378'/>
+      <return type-id='type-id-249'/>
     </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-56'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-371'/>
       <return type-id='type-id-39'/>
     </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-261'/>
-      <return type-id='type-id-273'/>
+      <parameter type-id='type-id-258'/>
+      <return type-id='type-id-378'/>
     </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-261'/>
-      <return type-id='type-id-273'/>
+      <parameter type-id='type-id-258'/>
+      <return type-id='type-id-378'/>
     </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-284'/>
+      <parameter type-id='type-id-367'/>
       <return type-id='type-id-55'/>
     </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-261'/>
+      <parameter type-id='type-id-258'/>
       <return type-id='type-id-55'/>
     </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-111'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-371'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='FTDCCollectorInterface' size-in-bits='64' visibility='default' id='type-id-262'/>
-      <class-decl name='Locker' size-in-bits='128' visibility='default' id='type-id-265'>
+      <class-decl name='FTDCCollectorInterface' size-in-bits='64' visibility='default' id='type-id-259'/>
+      <class-decl name='Locker' size-in-bits='128' visibility='default' id='type-id-262'>
         <member-function access='public'>
           <function-decl name='setShouldConflictWithSecondaryBatchApplication' mangled-name='_ZN5mongo6Locker46setShouldConflictWithSecondaryBatchApplicationEb' filepath='src/mongo/db/concurrency/locker.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-266' is-artificial='yes'/>
+            <parameter type-id='type-id-263' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OperationContext' size-in-bits='2176' visibility='default' id='type-id-254'>
+      <class-decl name='OperationContext' size-in-bits='2176' visibility='default' id='type-id-251'>
         <member-function access='public'>
           <function-decl name='lockState' mangled-name='_ZNK5mongo16OperationContext9lockStateEv' filepath='src/mongo/db/operation_context.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-256' is-artificial='yes'/>
-            <return type-id='type-id-266'/>
+            <parameter type-id='type-id-253' is-artificial='yes'/>
+            <return type-id='type-id-263'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ServiceContext' size-in-bits='2432' visibility='default' id='type-id-268'/>
-      <class-decl name='BufBuilder' naming-typedef-id='type-id-347' visibility='default' is-declaration-only='yes' id='type-id-289'>
+      <class-decl name='ServiceContext' size-in-bits='2432' visibility='default' id='type-id-265'/>
+      <class-decl name='BufBuilder' naming-typedef-id='type-id-372' visibility='default' is-declaration-only='yes' id='type-id-351'>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='skip' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4skipEi' filepath='src/mongo/bson/util/builder.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserveBytes' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE12reserveBytesEi' filepath='src/mongo/bson/util/builder.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendNumImpl&lt;char&gt;' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIcEEvT_' filepath='src/mongo/bson/util/builder.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendNum' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEc' filepath='src/mongo/bson/util/builder.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendStr' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendStrENS_10StringDataEb' filepath='src/mongo/bson/util/builder.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
-            <parameter type-id='type-id-308'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
+            <parameter type-id='type-id-283'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='len' mangled-name='_ZNK5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3lenEv' filepath='src/mongo/bson/util/builder.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-291' is-artificial='yes'/>
+            <parameter type-id='type-id-353' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE7releaseEv' filepath='src/mongo/bson/util/builder.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
-            <return type-id='type-id-314'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
+            <return type-id='type-id-297'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='buf' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3bufEv' filepath='src/mongo/bson/util/builder.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='claimReservedBytes' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE18claimReservedBytesEi' filepath='src/mongo/bson/util/builder.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-350'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-281'>
         <member-function access='public'>
           <function-decl name='add' mangled-name='_ZN5mongo23FTDCCollectorCollection3addESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE' filepath='src/mongo/db/ftdc/collector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23FTDCCollectorCollection3addESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
-            <parameter type-id='type-id-351' is-artificial='yes'/>
-            <parameter type-id='type-id-335'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-282' is-artificial='yes'/>
+            <parameter type-id='type-id-274'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect' mangled-name='_ZN5mongo23FTDCCollectorCollection7collectEPNS_6ClientE' filepath='src/mongo/db/ftdc/collector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23FTDCCollectorCollection7collectEPNS_6ClientE'>
-            <parameter type-id='type-id-351' is-artificial='yes'/>
-            <parameter type-id='type-id-352'/>
-            <return type-id='type-id-382'/>
+            <parameter type-id='type-id-282' is-artificial='yes'/>
+            <parameter type-id='type-id-296'/>
+            <return type-id='type-id-287'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-292'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-295'>
         <member-function access='public'>
           <function-decl name='getServiceContext' mangled-name='_ZNK5mongo6Client17getServiceContextEv' filepath='src/mongo/db/client.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-294' is-artificial='yes'/>
-            <return type-id='type-id-269'/>
+            <parameter type-id='type-id-339' is-artificial='yes'/>
+            <return type-id='type-id-266'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-438'/>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-295'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-424'/>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-307'>
         <member-function access='public'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2Ei' filepath='src/mongo/bson/bsonobjbuilder.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderC2Ei'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subobjStart' mangled-name='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE' filepath='src/mongo/bson/bsonobjbuilder.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
-            <parameter type-id='type-id-308'/>
-            <return type-id='type-id-348'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <parameter type-id='type-id-283'/>
+            <return type-id='type-id-373'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE' filepath='src/mongo/bson/bsonobjbuilder.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
-            <parameter type-id='type-id-348'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderD2Ev' filepath='src/mongo/bson/bsonobjbuilder.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderD2Ev'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='owned' mangled-name='_ZNK5mongo14BSONObjBuilder5ownedEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='758' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-297' is-artificial='yes'/>
+            <parameter type-id='type-id-346' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='done' mangled-name='_ZN5mongo14BSONObjBuilder4doneEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='677' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
-            <return type-id='type-id-311'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <return type-id='type-id-289'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='obj' mangled-name='_ZN5mongo14BSONObjBuilder3objEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder3objEv'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
-            <return type-id='type-id-311'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
+            <return type-id='type-id-289'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_done' mangled-name='_ZN5mongo14BSONObjBuilder5_doneEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder5_doneEv'>
-            <parameter type-id='type-id-354' is-artificial='yes'/>
+            <parameter type-id='type-id-309' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-355'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-310'>
         <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'>
-            <parameter type-id='type-id-357' is-artificial='yes'/>
-            <parameter type-id='type-id-300'/>
+            <parameter type-id='type-id-311' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-356'/>
+            <return type-id='type-id-115'/>
           </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'>
-            <parameter type-id='type-id-357' is-artificial='yes'/>
-            <parameter type-id='type-id-303'/>
+            <parameter type-id='type-id-311' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-356'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-304'>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-332'>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-307' is-artificial='yes'/>
-            <parameter type-id='type-id-358'/>
+            <parameter type-id='type-id-347' is-artificial='yes'/>
+            <parameter type-id='type-id-394'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-306'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-307' is-artificial='yes'/>
+            <parameter type-id='type-id-347' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-301'/>
+            <return type-id='type-id-362'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-359'>
+      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-315'>
         <member-function access='public'>
           <function-decl name='got' mangled-name='_ZN5mongo15BSONSizeTracker3gotEi' filepath='src/mongo/bson/bsonmisc.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-360' is-artificial='yes'/>
+            <parameter type-id='type-id-316' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-283'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-439'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-425'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StringDataC2EPKc'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
+            <parameter type-id='type-id-284' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
-            <parameter type-id='type-id-259'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-284' is-artificial='yes'/>
+            <parameter type-id='type-id-256'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKcmNS0_14TrustedInitTagE' filepath='src/mongo/base/string_data.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
+            <parameter type-id='type-id-284' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-439'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-425'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKcm' filepath='src/mongo/base/string_data.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
+            <parameter type-id='type-id-284' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-310' is-artificial='yes'/>
+            <parameter type-id='type-id-345' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-362'/>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-311'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-289'>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-367' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-290' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-367' is-artificial='yes'/>
+            <parameter type-id='type-id-290' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='init' mangled-name='_ZN5mongo7BSONObj4initEPKc' filepath='src/mongo/bson/bsonobj.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-367' is-artificial='yes'/>
+            <parameter type-id='type-id-290' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-313' is-artificial='yes'/>
+            <parameter type-id='type-id-348' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isValid' mangled-name='_ZNK5mongo7BSONObj7isValidEv' filepath='src/mongo/bson/bsonobj.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-313' is-artificial='yes'/>
+            <parameter type-id='type-id-348' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shareOwnershipWith' mangled-name='_ZNR5mongo7BSONObj18shareOwnershipWithENS_17ConstSharedBufferE' filepath='src/mongo/bson/bsonobj.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-367' is-artificial='yes'/>
-            <parameter type-id='type-id-371'/>
-            <return type-id='type-id-365'/>
+            <parameter type-id='type-id-290' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-314'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-297'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-317'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-303'>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-369' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-304' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-369' is-artificial='yes'/>
+                <parameter type-id='type-id-304' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-319' is-artificial='yes'/>
+                <parameter type-id='type-id-350' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -4420,566 +4407,535 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-368' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-298' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-314'/>
+            <return type-id='type-id-297'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-314'/>
+            <return type-id='type-id-297'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
+            <parameter type-id='type-id-343' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-368' is-artificial='yes'/>
+            <parameter type-id='type-id-298' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-371'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-312'>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-313' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-320'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-299'>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-373' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-300' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-373' is-artificial='yes'/>
+            <parameter type-id='type-id-300' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-322' is-artificial='yes'/>
+            <parameter type-id='type-id-344' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZN5mongo21SharedBufferAllocator7releaseEv' filepath='src/mongo/bson/util/builder.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-373' is-artificial='yes'/>
-            <return type-id='type-id-314'/>
+            <parameter type-id='type-id-300' is-artificial='yes'/>
+            <return type-id='type-id-297'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-373' is-artificial='yes'/>
+            <parameter type-id='type-id-300' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-323'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-301'>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-302' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-302' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-302' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-302' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-325' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-440'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-427'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-441'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-428'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIcvE11unsafeStoreERKcPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-253'/>
+                <parameter type-id='type-id-250'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-442'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-429'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIcEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-300'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-443'>
+          <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-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIivE11unsafeStoreERKiPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-70'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-444'>
+          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-431'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-358'/>
+                <parameter type-id='type-id-394'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </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='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-303'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-253'/>
+            <parameter type-id='type-id-250'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-300'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-358'/>
+            <parameter type-id='type-id-394'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-70'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-303'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-298'/>
-      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-301'/>
-      <typedef-decl name='BufBuilder' type-id='type-id-289' filepath='src/mongo/bson/util/builder.h' line='365' column='1' id='type-id-347'/>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-358'/>
+      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-362'/>
+      <typedef-decl name='BufBuilder' type-id='type-id-351' filepath='src/mongo/bson/util/builder.h' line='365' column='1' id='type-id-372'/>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-281'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-293'>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <parameter type-id='type-id-119'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-119'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </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.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-288' is-artificial='yes'/>
+            <parameter type-id='type-id-342' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <parameter type-id='type-id-287'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-282' is-artificial='yes'/>
-            <parameter type-id='type-id-287'/>
-            <return type-id='type-id-119'/>
+            <parameter type-id='type-id-294' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-288' is-artificial='yes'/>
+            <parameter type-id='type-id-342' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-288' is-artificial='yes'/>
-            <return type-id='type-id-370'/>
+            <parameter type-id='type-id-342' is-artificial='yes'/>
+            <return type-id='type-id-314'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <typedef-decl name='uint32_t' type-id='type-id-45' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-445'/>
-    <typedef-decl name='uint64_t' type-id='type-id-38' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-447' size-in-bits='64' id='type-id-448'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' id='type-id-449'/>
-    <qualified-type-def type-id='type-id-45' 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-38' const='yes' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-453'/>
-    <reference-type-def kind='rvalue' type-id='type-id-241' size-in-bits='64' id='type-id-454'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-455'/>
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
-    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-461'/>
-    <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-463'/>
-    <pointer-type-def type-id='type-id-464' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-469'/>
-    <reference-type-def kind='lvalue' type-id='type-id-470' size-in-bits='64' id='type-id-471'/>
-    <reference-type-def kind='rvalue' type-id='type-id-470' size-in-bits='64' id='type-id-472'/>
-    <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-473'/>
-    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-475'/>
-    <pointer-type-def type-id='type-id-476' size-in-bits='64' id='type-id-477'/>
-    <reference-type-def kind='rvalue' 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'/>
+    <typedef-decl name='uint32_t' type-id='type-id-45' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-432'/>
+    <typedef-decl name='uint64_t' type-id='type-id-38' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-433'/>
+    <reference-type-def kind='lvalue' type-id='type-id-434' size-in-bits='64' id='type-id-435'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' id='type-id-436'/>
+    <qualified-type-def type-id='type-id-45' const='yes' id='type-id-437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-437' size-in-bits='64' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-439'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-440'/>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-441'/>
+    <reference-type-def kind='rvalue' type-id='type-id-238' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-444'/>
+    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-446'/>
+    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-469' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-476'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-479' size-in-bits='64' id='type-id-480'/>
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-482'/>
     <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-484'/>
     <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-486'/>
-    <qualified-type-def type-id='type-id-456' const='yes' id='type-id-487'/>
     <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-488'/>
-    <qualified-type-def type-id='type-id-488' restrict='yes' id='type-id-489'/>
-    <qualified-type-def type-id='type-id-470' const='yes' id='type-id-490'/>
-    <reference-type-def kind='lvalue' type-id='type-id-490' size-in-bits='64' id='type-id-491'/>
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-492'/>
-    <qualified-type-def type-id='type-id-476' const='yes' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-492'/>
     <pointer-type-def 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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-497'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-498'/>
-    <qualified-type-def type-id='type-id-499' const='yes' id='type-id-500'/>
-    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-501'/>
-    <qualified-type-def type-id='type-id-502' const='yes' id='type-id-503'/>
+    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-502'/>
     <pointer-type-def 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'/>
-    <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-508'/>
     <pointer-type-def 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-514' const='yes' id='type-id-515'/>
-    <pointer-type-def 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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-519'/>
-    <qualified-type-def type-id='type-id-520' const='yes' id='type-id-521'/>
-    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-521' 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'/>
-    <pointer-type-def type-id='type-id-528' size-in-bits='64' id='type-id-529'/>
-    <qualified-type-def type-id='type-id-530' const='yes' id='type-id-531'/>
-    <pointer-type-def type-id='type-id-531' size-in-bits='64' id='type-id-532'/>
-    <qualified-type-def type-id='type-id-533' const='yes' id='type-id-534'/>
-    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-535'/>
-    <qualified-type-def type-id='type-id-536' const='yes' id='type-id-537'/>
-    <pointer-type-def type-id='type-id-537' size-in-bits='64' id='type-id-538'/>
-    <qualified-type-def type-id='type-id-539' const='yes' id='type-id-540'/>
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-541'/>
-    <qualified-type-def type-id='type-id-542' const='yes' id='type-id-543'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-547'/>
-    <qualified-type-def type-id='type-id-548' const='yes' id='type-id-549'/>
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-495' size-in-bits='64' id='type-id-551'/>
-    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-552'/>
-    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-553'/>
-    <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'/>
-    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-557'/>
-    <pointer-type-def type-id='type-id-558' size-in-bits='64' id='type-id-559'/>
-    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-562'/>
-    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-563'/>
-    <reference-type-def kind='lvalue' type-id='type-id-514' size-in-bits='64' id='type-id-564'/>
-    <reference-type-def kind='rvalue' type-id='type-id-514' size-in-bits='64' id='type-id-565'/>
-    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-566'/>
+    <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-515'/>
+    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-516'/>
+    <qualified-type-def type-id='type-id-461' const='yes' id='type-id-517'/>
+    <qualified-type-def type-id='type-id-445' const='yes' id='type-id-518'/>
+    <qualified-type-def type-id='type-id-463' const='yes' id='type-id-519'/>
+    <qualified-type-def type-id='type-id-443' const='yes' id='type-id-520'/>
+    <qualified-type-def type-id='type-id-469' const='yes' id='type-id-521'/>
+    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-522'/>
+    <qualified-type-def type-id='type-id-523' const='yes' id='type-id-524'/>
+    <qualified-type-def type-id='type-id-477' const='yes' id='type-id-525'/>
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-526'/>
+    <qualified-type-def type-id='type-id-493' const='yes' id='type-id-527'/>
+    <qualified-type-def type-id='type-id-491' const='yes' id='type-id-528'/>
+    <qualified-type-def type-id='type-id-485' const='yes' id='type-id-529'/>
+    <qualified-type-def type-id='type-id-497' const='yes' id='type-id-530'/>
+    <qualified-type-def type-id='type-id-495' const='yes' id='type-id-531'/>
+    <qualified-type-def type-id='type-id-447' const='yes' id='type-id-532'/>
+    <qualified-type-def type-id='type-id-487' const='yes' id='type-id-533'/>
+    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-535'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-519' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-538'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-539'/>
+    <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-541'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-542'/>
+    <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-543'/>
+    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-544'/>
+    <pointer-type-def type-id='type-id-528' size-in-bits='64' id='type-id-545'/>
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-546'/>
+    <pointer-type-def type-id='type-id-530' size-in-bits='64' id='type-id-547'/>
+    <pointer-type-def type-id='type-id-531' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-533' size-in-bits='64' id='type-id-550'/>
+    <qualified-type-def type-id='type-id-551' const='yes' id='type-id-552'/>
+    <qualified-type-def type-id='type-id-553' const='yes' id='type-id-554'/>
+    <qualified-type-def type-id='type-id-555' const='yes' 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-552' size-in-bits='64' id='type-id-559'/>
+    <pointer-type-def type-id='type-id-558' size-in-bits='64' id='type-id-560'/>
+    <qualified-type-def type-id='type-id-559' restrict='yes' id='type-id-561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-563'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-551'/>
+    <reference-type-def kind='lvalue' type-id='type-id-564' size-in-bits='64' id='type-id-565'/>
+    <pointer-type-def type-id='type-id-551' size-in-bits='64' id='type-id-566'/>
     <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-568'/>
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-569'/>
-    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-570'/>
-    <reference-type-def kind='rvalue' type-id='type-id-520' size-in-bits='64' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-557' size-in-bits='64' id='type-id-569'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-570'/>
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-572'/>
     <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-574'/>
-    <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-575'/>
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-577'/>
-    <pointer-type-def type-id='type-id-578' size-in-bits='64' id='type-id-579'/>
-    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-581'/>
-    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-582'/>
+    <pointer-type-def type-id='type-id-575' size-in-bits='64' id='type-id-576'/>
+    <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-578'/>
+    <pointer-type-def type-id='type-id-579' size-in-bits='64' id='type-id-580'/>
+    <pointer-type-def type-id='type-id-581' size-in-bits='64' id='type-id-582'/>
     <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-584'/>
-    <pointer-type-def type-id='type-id-530' size-in-bits='64' id='type-id-585'/>
+    <pointer-type-def type-id='type-id-555' size-in-bits='64' id='type-id-585'/>
     <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-587'/>
-    <reference-type-def kind='lvalue' type-id='type-id-588' size-in-bits='64' id='type-id-589'/>
-    <reference-type-def kind='rvalue' type-id='type-id-588' size-in-bits='64' id='type-id-590'/>
-    <reference-type-def kind='lvalue' type-id='type-id-533' size-in-bits='64' id='type-id-591'/>
-    <reference-type-def kind='rvalue' type-id='type-id-533' size-in-bits='64' id='type-id-592'/>
-    <pointer-type-def type-id='type-id-533' size-in-bits='64' id='type-id-593'/>
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-594'/>
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-595'/>
-    <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-596'/>
-    <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-598'/>
-    <reference-type-def kind='rvalue' type-id='type-id-599' size-in-bits='64' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-599' size-in-bits='64' id='type-id-601'/>
-    <pointer-type-def type-id='type-id-602' size-in-bits='64' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-605'/>
-    <reference-type-def kind='lvalue' type-id='type-id-545' size-in-bits='64' id='type-id-606'/>
-    <reference-type-def kind='rvalue' type-id='type-id-545' size-in-bits='64' id='type-id-607'/>
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-608'/>
-    <pointer-type-def type-id='type-id-609' size-in-bits='64' id='type-id-610'/>
-    <reference-type-def kind='rvalue' type-id='type-id-611' size-in-bits='64' id='type-id-612'/>
-    <pointer-type-def type-id='type-id-611' size-in-bits='64' id='type-id-613'/>
-    <reference-type-def kind='rvalue' type-id='type-id-614' size-in-bits='64' id='type-id-615'/>
-    <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-616'/>
-    <pointer-type-def type-id='type-id-617' size-in-bits='64' id='type-id-618'/>
-    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-619'/>
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-620'/>
-    <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-622'/>
-    <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-624'/>
-    <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-625'/>
-    <reference-type-def kind='lvalue' type-id='type-id-626' size-in-bits='64' id='type-id-627'/>
-    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-629'/>
-    <reference-type-def kind='rvalue' type-id='type-id-628' size-in-bits='64' id='type-id-630'/>
-    <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-631'/>
-    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-633'/>
-    <reference-type-def kind='rvalue' type-id='type-id-634' size-in-bits='64' id='type-id-635'/>
-    <pointer-type-def type-id='type-id-634' size-in-bits='64' id='type-id-636'/>
-    <reference-type-def kind='rvalue' type-id='type-id-637' size-in-bits='64' id='type-id-638'/>
-    <pointer-type-def type-id='type-id-637' size-in-bits='64' id='type-id-639'/>
-    <reference-type-def kind='rvalue' 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'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-456'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-643'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-588' size-in-bits='64' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-590' size-in-bits='64' id='type-id-591'/>
+    <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-593'/>
+    <pointer-type-def type-id='type-id-594' size-in-bits='64' id='type-id-595'/>
+    <pointer-type-def type-id='type-id-596' size-in-bits='64' id='type-id-597'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-598'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-599'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-626' visibility='default' is-declaration-only='yes' id='type-id-645'/>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-599'>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-562' visibility='default' is-declaration-only='yes' id='type-id-600'/>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-473'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::ConstDataRange &amp;, mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IJRS1_S3_RS4_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-601' is-artificial='yes'/>
-            <parameter type-id='type-id-591'/>
-            <parameter type-id='type-id-454'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-474' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-601' is-artificial='yes'/>
-            <parameter type-id='type-id-600'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-474' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-545'>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-493'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-647' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-646'/>
+          <typedef-decl name='pointer' type-id='type-id-602' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-601'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-648'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-603'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-55' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-647'/>
+              <typedef-decl name='type' type-id='type-id-55' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-602'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIcN5mongo11DataBuilder7FreeBufEE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-547' is-artificial='yes'/>
-            <return type-id='type-id-646'/>
+            <parameter type-id='type-id-544' is-artificial='yes'/>
+            <return type-id='type-id-601'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrIcN5mongo11DataBuilder7FreeBufEEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-547' is-artificial='yes'/>
+            <parameter type-id='type-id-544' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIcN5mongo11DataBuilder7FreeBufEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-608' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-494' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZNSt10unique_ptrIcN5mongo11DataBuilder7FreeBufEE7releaseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-608' is-artificial='yes'/>
-            <return type-id='type-id-646'/>
+            <parameter type-id='type-id-494' is-artificial='yes'/>
+            <return type-id='type-id-601'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reset' mangled-name='_ZNSt10unique_ptrIcN5mongo11DataBuilder7FreeBufEE5resetEPc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-608' is-artificial='yes'/>
-            <parameter type-id='type-id-646'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-494' is-artificial='yes'/>
+            <parameter type-id='type-id-601'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt10unique_ptrIcN5mongo11DataBuilder7FreeBufEEaSEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-608' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-606'/>
+            <parameter type-id='type-id-494' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-548'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-461'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-650' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-649'/>
+          <typedef-decl name='pointer' type-id='type-id-605' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-604'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-652' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='229' column='1' id='type-id-651'/>
+          <typedef-decl name='reference' type-id='type-id-607' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='229' column='1' id='type-id-606'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorImSaImEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-550' is-artificial='yes'/>
+            <parameter type-id='type-id-535' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorImSaImEE6resizeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-620' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorImSaImEE15_M_erase_at_endEPm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-620' is-artificial='yes'/>
-            <parameter type-id='type-id-649'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-604'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt6vectorImSaImEE4swapERS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1194' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-620' is-artificial='yes'/>
-            <parameter type-id='type-id-619'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorImSaImEEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-620' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-651'/>
+            <return type-id='type-id-606'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='clear' mangled-name='_ZNSt6vectorImSaImEE5clearEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-620' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorImSaImEE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-550' is-artificial='yes'/>
+            <parameter type-id='type-id-535' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -4987,963 +4943,963 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_append' mangled-name='_ZNSt6vectorImSaImEE17_M_default_appendEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE17_M_default_appendEm'>
-            <parameter type-id='type-id-620' is-artificial='yes'/>
+            <parameter type-id='type-id-462' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-653'/>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-628'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-608'/>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-501'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::ConstDataRange, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_6Date_tEEEC2IS1_RS2_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-631' is-artificial='yes'/>
-            <parameter type-id='type-id-592'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-502' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_6Date_tEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='617' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-631' is-artificial='yes'/>
-            <parameter type-id='type-id-630'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-502' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-542'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-557'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-569' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-569' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-544' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-569' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-654'>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-602'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-579'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCCompressor::CompressorState&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo14FTDCCompressor15CompressorStateELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-603' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-580' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-604'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-581'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::ConstDataRange&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo14ConstDataRangeELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-605' is-artificial='yes'/>
-            <parameter type-id='type-id-592'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-582' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-609'>
+      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-588'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6Date_tELb0EEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-610' is-artificial='yes'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-589' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6Date_tELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-610' is-artificial='yes'/>
-            <parameter type-id='type-id-590'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-589' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-611'>
+      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-590'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6Date_tEEEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-613' is-artificial='yes'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-591' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6Date_tEEEC2EOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-613' is-artificial='yes'/>
-            <parameter type-id='type-id-612'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-591' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-614'>
+      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-592'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::ConstDataRange, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_6Date_tEEEC2IS1_JRS2_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-616' is-artificial='yes'/>
-            <parameter type-id='type-id-592'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-593' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_6Date_tEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-616' is-artificial='yes'/>
-            <parameter type-id='type-id-615'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-593' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-617'>
+      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-594'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-618' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-595' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-655'>
+      <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-610'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_default_n&lt;unsigned long *, unsigned long&gt;' mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPmmEET_S3_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-455'/>
+            <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-38'/>
-            <return type-id='type-id-455'/>
+            <return type-id='type-id-441'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-656'>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-611'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;unsigned long&gt;' mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mImEEPT_PKS3_S6_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-453'/>
-            <parameter type-id='type-id-453'/>
-            <parameter type-id='type-id-455'/>
-            <return type-id='type-id-455'/>
+            <parameter type-id='type-id-440'/>
+            <parameter type-id='type-id-440'/>
+            <parameter type-id='type-id-441'/>
+            <return type-id='type-id-441'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-657'>
+      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-612'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;unsigned long *&gt;, unsigned long *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPmES3_EET0_T_S6_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-653'/>
-            <parameter type-id='type-id-653'/>
-            <parameter type-id='type-id-455'/>
-            <return type-id='type-id-455'/>
+            <parameter type-id='type-id-608'/>
+            <parameter type-id='type-id-608'/>
+            <parameter type-id='type-id-441'/>
+            <return type-id='type-id-441'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-621'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-596'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-658' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-650'/>
+          <typedef-decl name='pointer' type-id='type-id-613' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-605'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-623'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-564'>
             <member-function access='public'>
               <function-decl name='_M_swap_data' mangled-name='_ZNSt12_Vector_baseImSaImEE12_Vector_impl12_M_swap_dataERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-625' is-artificial='yes'/>
-                <parameter type-id='type-id-624'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-570' is-artificial='yes'/>
+                <parameter type-id='type-id-565'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseImSaImEE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-622' is-artificial='yes'/>
+            <parameter type-id='type-id-597' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-650'/>
+            <return type-id='type-id-605'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseImSaImEE13_M_deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-622' is-artificial='yes'/>
-            <parameter type-id='type-id-650'/>
+            <parameter type-id='type-id-597' is-artificial='yes'/>
+            <parameter type-id='type-id-605'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-659'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-614'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-455' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-660'/>
+          <typedef-decl name='pointer' type-id='type-id-441' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-615'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-38' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-661'/>
+          <typedef-decl name='value_type' type-id='type-id-38' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-616'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-645' 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-626'/>
+          <typedef-decl name='allocator_type' type-id='type-id-600' 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-562'/>
         </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-627'/>
+            <parameter type-id='type-id-563'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-660'/>
+            <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-627'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-563'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-632'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-571'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-633' is-artificial='yes'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-633' is-artificial='yes'/>
-            <parameter type-id='type-id-590'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-634'>
+      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-573'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo6Date_tEEEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-574' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo6Date_tEEEC2EOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
-            <parameter type-id='type-id-635'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-574' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-637'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-575'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IS2_JRS3_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-639' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-576' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-639' is-artificial='yes'/>
-            <parameter type-id='type-id-638'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-576' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-640'>
+      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-577'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::ConstDataRange &amp;, mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IRS1_JS3_RS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
-            <parameter type-id='type-id-591'/>
-            <parameter type-id='type-id-454'/>
-            <parameter type-id='type-id-589'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-578' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-578' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-458'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-449'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-459' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-450' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-460'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-514'>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-461' is-artificial='yes'/>
+            <parameter type-id='type-id-515' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-660'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE10deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-461' is-artificial='yes'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-515' is-artificial='yes'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-662'>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-617'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-660' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-658'/>
+          <typedef-decl name='pointer' type-id='type-id-615' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-613'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-448' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='109' column='1' id='type-id-652'/>
+          <typedef-decl name='reference' type-id='type-id-435' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='109' column='1' id='type-id-607'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-447'/>
+          <typedef-decl name='value_type' type-id='type-id-616' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-434'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-495'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-481'>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-534' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-534' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isEmpty' mangled-name='_ZNK5mongo7BSONObj7isEmptyEv' filepath='src/mongo/bson/bsonobj.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <parameter type-id='type-id-534' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo7BSONObj4swapERS0_' filepath='src/mongo/bson/bsonobj.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-552' is-artificial='yes'/>
-            <parameter type-id='type-id-551'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo7BSONObjaSES0_' filepath='src/mongo/bson/bsonobj.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-552' is-artificial='yes'/>
-            <parameter type-id='type-id-495'/>
-            <return type-id='type-id-551'/>
+            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-552' is-artificial='yes'/>
-            <parameter type-id='type-id-497'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-552' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-482' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-499'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-463'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithIbE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-501' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIbE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-553' is-artificial='yes'/>
-            <return type-id='type-id-449'/>
+            <parameter type-id='type-id-464' is-artificial='yes'/>
+            <return type-id='type-id-436'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-554'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-479'>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo17ConstSharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
-            <parameter type-id='type-id-555'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-502'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-485'>
         <member-function access='public'>
           <function-decl name='setlen' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE6setlenEi' filepath='src/mongo/bson/util/builder.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendBuf' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendBufEPKvm' filepath='src/mongo/bson/util/builder.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendNumImpl&lt;unsigned int&gt;' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIjEEvT_' filepath='src/mongo/bson/util/builder.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-45'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendNum' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEj' filepath='src/mongo/bson/util/builder.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-45'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='buf' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3bufEv' filepath='src/mongo/bson/util/builder.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='len' mangled-name='_ZNK5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3lenEv' filepath='src/mongo/bson/util/builder.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-504' is-artificial='yes'/>
+            <parameter type-id='type-id-546' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-557' is-artificial='yes'/>
+            <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-505'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-523'>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-507' is-artificial='yes'/>
-            <parameter type-id='type-id-559'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-584'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-303'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-558'/>
+            <return type-id='type-id-583'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-508'>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-509'>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-510' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-560' is-artificial='yes'/>
+            <parameter type-id='type-id-510' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-561'>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-489'>
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIjEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-563' is-artificial='yes'/>
-            <parameter type-id='type-id-513'/>
+            <parameter type-id='type-id-490' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-562'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-514'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-491'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-567'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-586'>
             <member-function access='public'>
               <function-decl name='operator()' mangled-name='_ZN5mongo11DataBuilder7FreeBufclEPc' filepath='src/mongo/base/data_builder.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-568' is-artificial='yes'/>
+                <parameter type-id='type-id-587' is-artificial='yes'/>
                 <parameter type-id='type-id-55'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='DataBuilder' mangled-name='_ZN5mongo11DataBuilderC2Em' filepath='src/mongo/base/data_builder.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getCursor' mangled-name='_ZN5mongo11DataBuilder9getCursorEv' filepath='src/mongo/base/data_builder.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <return type-id='type-id-573'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <return type-id='type-id-507'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNK5mongo11DataBuilder4sizeEv' filepath='src/mongo/base/data_builder.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-516' is-artificial='yes'/>
+            <parameter type-id='type-id-545' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_ensureStorage' mangled-name='_ZN5mongo11DataBuilder14_ensureStorageEv' filepath='src/mongo/base/data_builder.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_getSerializedSize&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo11DataBuilder18_getSerializedSizeINS_10FTDCVarIntEEEmRKT_' filepath='src/mongo/base/data_builder.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserve' mangled-name='_ZN5mongo11DataBuilder7reserveEm' filepath='src/mongo/base/data_builder.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='writeAndAdvance&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo11DataBuilder15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_' filepath='src/mongo/base/data_builder.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11DataBuilder15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
-            <return type-id='type-id-520'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
+            <return type-id='type-id-445'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo11DataBuilderaSEOS0_' filepath='src/mongo/base/data_builder.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-565'/>
-            <return type-id='type-id-564'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZN5mongo11DataBuilder6resizeEm' filepath='src/mongo/base/data_builder.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11DataBuilder6resizeEm'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-492' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-520'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-445'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-580'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-567'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-572' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-581'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-568'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-572' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-520'/>
+            <return type-id='type-id-445'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-523' is-artificial='yes'/>
+            <parameter type-id='type-id-536' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </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='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-581'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-568'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-572' is-artificial='yes'/>
-            <parameter type-id='type-id-522'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-572' is-artificial='yes'/>
-            <parameter type-id='type-id-571'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo6StatusaSEOS0_' filepath='src/mongo/base/status.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-572' is-artificial='yes'/>
-            <parameter type-id='type-id-571'/>
-            <return type-id='type-id-570'/>
+            <parameter type-id='type-id-446' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-573'>
+      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-507'>
         <member-function access='public'>
           <function-decl name='DataRangeCursor' mangled-name='_ZN5mongo15DataRangeCursorC2EPcS1_l' filepath='src/mongo/base/data_range_cursor.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-574' is-artificial='yes'/>
+            <parameter type-id='type-id-508' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='writeAndAdvance&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo15DataRangeCursor15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_' filepath='src/mongo/base/data_range_cursor.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-574' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
-            <return type-id='type-id-520'/>
+            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
+            <return type-id='type-id-445'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-524'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-497'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_14ConstDataRangeEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-526' is-artificial='yes'/>
+            <parameter type-id='type-id-547' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_14ConstDataRangeEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-575' is-artificial='yes'/>
-            <return type-id='type-id-591'/>
+            <parameter type-id='type-id-498' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-576'>
+      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-505'>
         <member-type access='private'>
-          <typedef-decl name='bytes_type' type-id='type-id-55' filepath='src/mongo/base/data_range.h' line='113' column='1' id='type-id-663'/>
+          <typedef-decl name='bytes_type' type-id='type-id-55' filepath='src/mongo/base/data_range.h' line='113' column='1' id='type-id-618'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='DataRange' mangled-name='_ZN5mongo9DataRangeC2EPcS1_l' filepath='src/mongo/base/data_range.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-577' is-artificial='yes'/>
-            <parameter type-id='type-id-663'/>
-            <parameter type-id='type-id-663'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-506' is-artificial='yes'/>
+            <parameter type-id='type-id-618'/>
+            <parameter type-id='type-id-618'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-578'>
+      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-512'>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-579' is-artificial='yes'/>
+            <parameter type-id='type-id-513' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-527'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-447'>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-582' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-448' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-582' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-448' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-582' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-448' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-529' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-549' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-582' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-448' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-583'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-451'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIN5boost8optionalISt5tupleIJNS_14ConstDataRangeENS_14FTDCCompressor15CompressorStateENS_6Date_tEEEEEEC2ES9_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-584' is-artificial='yes'/>
-            <parameter type-id='type-id-462'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-452' is-artificial='yes'/>
+            <parameter type-id='type-id-455'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIN5boost8optionalISt5tupleIJNS_14ConstDataRangeENS_14FTDCCompressor15CompressorStateENS_6Date_tEEEEEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-584' is-artificial='yes'/>
-            <parameter type-id='type-id-520'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-452' is-artificial='yes'/>
+            <parameter type-id='type-id-445'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-530'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-469'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-532' is-artificial='yes'/>
+            <parameter type-id='type-id-539' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-585' is-artificial='yes'/>
-            <return type-id='type-id-629'/>
+            <parameter type-id='type-id-470' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEEC2ES4_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-585' is-artificial='yes'/>
-            <parameter type-id='type-id-628'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-470' is-artificial='yes'/>
+            <parameter type-id='type-id-501'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-585' is-artificial='yes'/>
-            <parameter type-id='type-id-520'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-470' is-artificial='yes'/>
+            <parameter type-id='type-id-445'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-586'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-483'>
         <member-function access='public' static='yes'>
           <function-decl name='getArrayOffset' mangled-name='_ZN5mongo14FTDCCompressor14getArrayOffsetEjjj' filepath='src/mongo/db/ftdc/compressor.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-445'/>
-            <parameter type-id='type-id-445'/>
-            <parameter type-id='type-id-445'/>
+            <parameter type-id='type-id-432'/>
+            <parameter type-id='type-id-432'/>
+            <parameter type-id='type-id-432'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='addSample' mangled-name='_ZN5mongo14FTDCCompressor9addSampleERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/compressor.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressor9addSampleERKNS_7BSONObjENS_6Date_tE'>
-            <parameter type-id='type-id-587' is-artificial='yes'/>
-            <parameter type-id='type-id-497'/>
-            <parameter type-id='type-id-588'/>
-            <return type-id='type-id-583'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-619'/>
+            <return type-id='type-id-451'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_reset' mangled-name='_ZN5mongo14FTDCCompressor6_resetERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/compressor.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressor6_resetERKNS_7BSONObjENS_6Date_tE'>
-            <parameter type-id='type-id-587' is-artificial='yes'/>
-            <parameter type-id='type-id-497'/>
-            <parameter type-id='type-id-588'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-619'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getCompressedSamples' mangled-name='_ZN5mongo14FTDCCompressor20getCompressedSamplesEv' filepath='src/mongo/db/ftdc/compressor.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressor20getCompressedSamplesEv'>
-            <parameter type-id='type-id-587' is-artificial='yes'/>
-            <return type-id='type-id-530'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
+            <return type-id='type-id-469'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reset' mangled-name='_ZN5mongo14FTDCCompressor5resetEv' filepath='src/mongo/db/ftdc/compressor.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressor5resetEv'>
-            <parameter type-id='type-id-587' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-588'/>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-533'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-619'/>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-495'>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcml' filepath='src/mongo/base/data_range.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-593' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcS2_l' filepath='src/mongo/base/data_range.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-593' is-artificial='yes'/>
+            <parameter type-id='type-id-496' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNK5mongo14ConstDataRange4dataEv' filepath='src/mongo/base/data_range.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-535' is-artificial='yes'/>
+            <parameter type-id='type-id-548' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='length' mangled-name='_ZNK5mongo14ConstDataRange6lengthEv' filepath='src/mongo/base/data_range.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-535' is-artificial='yes'/>
+            <parameter type-id='type-id-548' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-536'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-477'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-539'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-487'>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-596' is-artificial='yes'/>
+                <parameter type-id='type-id-488' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-541' is-artificial='yes'/>
+                <parameter type-id='type-id-550' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-596' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-488' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo12SharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-595' is-artificial='yes'/>
-            <parameter type-id='type-id-594'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-478' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-538' is-artificial='yes'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-595' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-478' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-595' is-artificial='yes'/>
+            <parameter type-id='type-id-478' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-536'/>
+            <return type-id='type-id-477'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-664'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-620'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-665'>
+          <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-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-666'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-622'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-559'/>
+                <parameter type-id='type-id-584'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-667'>
+          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-623'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIjvE11unsafeStoreERKjPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-451'/>
+                <parameter type-id='type-id-438'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-668'>
+          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-624'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIjEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-513'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -5952,1659 +5908,1629 @@
           <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-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-559'/>
+            <parameter type-id='type-id-584'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;unsigned int&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIjEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-451'/>
+            <parameter type-id='type-id-438'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIjEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-513'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='store&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo8DataType5storeINS_10FTDCVarIntEEENS_6StatusERKT_PcmPml' filepath='src/mongo/base/data_type.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-520'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-445'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-558'/>
-      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-511'/>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-517'>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-583'/>
+      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-553'/>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-555'>
         <member-function access='public'>
           <function-decl name='FTDCVarInt' mangled-name='_ZN5mongo10FTDCVarIntC2Em' filepath='src/mongo/db/ftdc/varint.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-569' is-artificial='yes'/>
-            <parameter type-id='type-id-446'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-585' is-artificial='yes'/>
+            <parameter type-id='type-id-433'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-462'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-455'>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_14FTDCCompressor15CompressorStateENS2_6Date_tEEEEC2EOS8_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='870' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-463' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-456' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-464'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-459'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-670' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-669'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-626' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-625'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalINS0_ISt5tupleIJN5mongo14ConstDataRangeENS2_14FTDCCompressor15CompressorStateENS2_6Date_tEEEEEEC2EOS8_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-465' is-artificial='yes'/>
-            <parameter type-id='type-id-669'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
+            <parameter type-id='type-id-625'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalINS0_ISt5tupleIJN5mongo14ConstDataRangeENS2_14FTDCCompressor15CompressorStateENS2_6Date_tEEEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-465' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-460' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-466'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-465'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-672' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-671'/>
+          <typedef-decl name='reference_type' type-id='type-id-628' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-627'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIbE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-467' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-466' is-artificial='yes'/>
+            <return type-id='type-id-627'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIbEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-467' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-466' is-artificial='yes'/>
+            <return type-id='type-id-627'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-468'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-471'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-674' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-673'/>
+          <typedef-decl name='reference_type' type-id='type-id-630' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-629'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-676' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-675'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-632' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-631'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_6Date_tEEEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-469' is-artificial='yes'/>
-            <return type-id='type-id-673'/>
+            <parameter type-id='type-id-472' is-artificial='yes'/>
+            <return type-id='type-id-629'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_6Date_tEEEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-469' is-artificial='yes'/>
-            <return type-id='type-id-673'/>
+            <parameter type-id='type-id-472' is-artificial='yes'/>
+            <return type-id='type-id-629'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_6Date_tEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-469' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-472' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_6Date_tEEEEC2EOS5_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-469' is-artificial='yes'/>
-            <parameter type-id='type-id-675'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-472' is-artificial='yes'/>
+            <parameter type-id='type-id-631'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-470'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-475'>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-473' is-artificial='yes'/>
-            <parameter type-id='type-id-471'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </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.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-473' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-473' is-artificial='yes'/>
-            <parameter type-id='type-id-491'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-473' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-492' is-artificial='yes'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-492' is-artificial='yes'/>
-            <return type-id='type-id-597'/>
+            <parameter type-id='type-id-541' is-artificial='yes'/>
+            <return type-id='type-id-511'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-473' is-artificial='yes'/>
-            <parameter type-id='type-id-472'/>
-            <return type-id='type-id-471'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-474'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-499'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-678' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-677'/>
+          <typedef-decl name='reference_type' type-id='type-id-634' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-633'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-475' is-artificial='yes'/>
-            <return type-id='type-id-677'/>
+            <parameter type-id='type-id-500' is-artificial='yes'/>
+            <return type-id='type-id-633'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo14ConstDataRangeEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-475' is-artificial='yes'/>
-            <return type-id='type-id-677'/>
+            <parameter type-id='type-id-500' is-artificial='yes'/>
+            <return type-id='type-id-633'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-476'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-443'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-679' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-672'/>
+            <typedef-decl name='reference_type' type-id='type-id-635' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-628'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIbE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-477' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-444' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-477' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-444' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-477' is-artificial='yes'/>
-              <parameter type-id='type-id-680'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-444' is-artificial='yes'/>
+              <parameter type-id='type-id-636'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIbE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-494' is-artificial='yes'/>
+              <parameter type-id='type-id-538' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-478'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-453'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-682' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-681'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-638' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-637'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_14FTDCCompressor15CompressorStateENS3_6Date_tEEEEC2EOS9_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-480' is-artificial='yes'/>
-              <parameter type-id='type-id-479'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-454' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_14FTDCCompressor15CompressorStateENS3_6Date_tEEEE9constructEOS8_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-480' is-artificial='yes'/>
-              <parameter type-id='type-id-681'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-454' is-artificial='yes'/>
+              <parameter type-id='type-id-637'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-481'>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-457'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-683' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-670'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-639' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-626'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseINS_8optionalISt5tupleIJN5mongo14ConstDataRangeENS4_14FTDCCompressor15CompressorStateENS4_6Date_tEEEEEE9constructEOSA_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-482' is-artificial='yes'/>
-              <parameter type-id='type-id-670'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-458' is-artificial='yes'/>
+              <parameter type-id='type-id-626'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseINS_8optionalISt5tupleIJN5mongo14ConstDataRangeENS4_14FTDCCompressor15CompressorStateENS4_6Date_tEEEEEEC2EOSA_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-482' is-artificial='yes'/>
-              <parameter type-id='type-id-670'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-458' is-artificial='yes'/>
+              <parameter type-id='type-id-626'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseINS_8optionalISt5tupleIJN5mongo14ConstDataRangeENS4_14FTDCCompressor15CompressorStateENS4_6Date_tEEEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-482' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-458' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-483'>
+        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-467'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-684' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-674'/>
+            <typedef-decl name='reference_type' type-id='type-id-640' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-630'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-685' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-676'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-641' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-632'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-484' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-468' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-484' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-468' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-484' is-artificial='yes'/>
-              <parameter type-id='type-id-680'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-468' is-artificial='yes'/>
+              <parameter type-id='type-id-636'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-484' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-468' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEE9constructEOS6_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-484' is-artificial='yes'/>
-              <parameter type-id='type-id-676'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-468' is-artificial='yes'/>
+              <parameter type-id='type-id-632'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEEC2EOS6_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-484' is-artificial='yes'/>
-              <parameter type-id='type-id-676'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-468' is-artificial='yes'/>
+              <parameter type-id='type-id-632'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-485'>
+        <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-503'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-686' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-678'/>
+            <typedef-decl name='reference_type' type-id='type-id-642' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-634'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-486' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-504' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-486' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-504' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-486' is-artificial='yes'/>
-              <parameter type-id='type-id-680'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-504' is-artificial='yes'/>
+              <parameter type-id='type-id-636'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-687'>
+        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-643'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-120' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-683'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-639'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-688'>
+        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-644'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-449' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-679'/>
+            <typedef-decl name='reference_type' type-id='type-id-436' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-635'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-689'>
+        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-645'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-629' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-684'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-640'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-630' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-685'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-641'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-690'>
+        <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-646'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-600' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-682'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-638'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-691'>
+        <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-647'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-591' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-686'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-642'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-692' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-680'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-648' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-636'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-692' visibility='default' is-declaration-only='yes' id='type-id-693'/>
-      <typedef-decl name='false_' type-id='type-id-693' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-692'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-648' visibility='default' is-declaration-only='yes' id='type-id-649'/>
+      <typedef-decl name='false_' type-id='type-id-649' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-648'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/controller.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='832' id='type-id-694'>
-      <subrange length='104' lower-bound='0' upper-bound='103' type-id='type-id-4' id='type-id-695'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='832' id='type-id-650'>
+      <subrange length='104' lower-bound='0' upper-bound='103' type-id='type-id-4' id='type-id-651'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='288' id='type-id-696'>
-      <subrange length='36' lower-bound='0' upper-bound='35' type-id='type-id-4' id='type-id-697'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='288' id='type-id-652'>
+      <subrange length='36' lower-bound='0' upper-bound='35' type-id='type-id-4' id='type-id-653'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='832' id='type-id-698'>
-      <subrange length='104' lower-bound='0' upper-bound='103' type-id='type-id-4' id='type-id-695'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='832' id='type-id-654'>
+      <subrange length='104' lower-bound='0' upper-bound='103' type-id='type-id-4' id='type-id-651'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='288' id='type-id-699'>
-      <subrange length='36' lower-bound='0' upper-bound='35' type-id='type-id-4' id='type-id-697'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='288' id='type-id-655'>
+      <subrange length='36' lower-bound='0' upper-bound='35' type-id='type-id-4' id='type-id-653'/>
     </array-type-def>
     <class-decl name='div_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-32' visibility='default' id='type-id-25'/>
-    <typedef-decl name='ldiv_t' type-id='type-id-25' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-698' size-in-bits='64' id='type-id-701'/>
-    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-702'/>
-    <reference-type-def kind='lvalue' type-id='type-id-74' size-in-bits='64' id='type-id-232'/>
-    <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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-233'/>
-    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-707'/>
+    <typedef-decl name='ldiv_t' type-id='type-id-25' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-656'/>
+    <reference-type-def kind='lvalue' type-id='type-id-654' size-in-bits='64' id='type-id-657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-74' size-in-bits='64' id='type-id-229'/>
+    <reference-type-def kind='lvalue' type-id='type-id-659' size-in-bits='64' id='type-id-660'/>
+    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-230'/>
+    <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-664' size-in-bits='64' id='type-id-665'/>
+    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-667'/>
+    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-669'/>
+    <pointer-type-def type-id='type-id-670' size-in-bits='64' id='type-id-671'/>
+    <pointer-type-def type-id='type-id-672' size-in-bits='64' id='type-id-673'/>
+    <pointer-type-def type-id='type-id-674' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-676' 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-680' 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-684' size-in-bits='64' id='type-id-685'/>
+    <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-687'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-694' size-in-bits='64' id='type-id-695'/>
+    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-697'/>
+    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-699'/>
+    <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-703'/>
+    <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-705'/>
+    <pointer-type-def type-id='type-id-706' 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='rvalue' type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
-    <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-721' size-in-bits='64' id='type-id-722'/>
-    <pointer-type-def type-id='type-id-721' size-in-bits='64' id='type-id-723'/>
-    <reference-type-def kind='rvalue' 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-708' const='yes' id='type-id-727'/>
-    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-728'/>
-    <qualified-type-def type-id='type-id-728' restrict='yes' id='type-id-729'/>
-    <qualified-type-def type-id='type-id-716' const='yes' id='type-id-730'/>
+    <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-722' size-in-bits='64' id='type-id-723'/>
+    <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-725'/>
+    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
     <pointer-type-def type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
-    <qualified-type-def type-id='type-id-721' 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-732' size-in-bits='64' id='type-id-734'/>
-    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-735'/>
-    <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-736'/>
-    <qualified-type-def type-id='type-id-737' const='yes' id='type-id-738'/>
-    <pointer-type-def type-id='type-id-738' size-in-bits='64' id='type-id-739'/>
-    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-741'/>
+    <pointer-type-def 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-735'/>
+    <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-736'/>
+    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-738'/>
+    <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-740'/>
     <pointer-type-def 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'/>
-    <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-743' size-in-bits='64' id='type-id-744'/>
+    <pointer-type-def type-id='type-id-745' size-in-bits='64' id='type-id-746'/>
     <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-745' size-in-bits='64' id='type-id-749'/>
     <pointer-type-def 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'/>
-    <pointer-type-def 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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
-    <qualified-type-def type-id='type-id-764' const='yes' id='type-id-765'/>
-    <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'/>
-    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-769'/>
-    <qualified-type-def type-id='type-id-770' const='yes' id='type-id-771'/>
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-772'/>
-    <qualified-type-def type-id='type-id-773' const='yes' id='type-id-774'/>
-    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-775'/>
-    <qualified-type-def type-id='type-id-776' const='yes' id='type-id-777'/>
-    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-778'/>
-    <qualified-type-def type-id='type-id-779' const='yes' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-781'/>
-    <qualified-type-def type-id='type-id-782' const='yes' id='type-id-783'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-797'/>
-    <reference-type-def kind='rvalue' type-id='type-id-737' size-in-bits='64' id='type-id-798'/>
-    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-799'/>
-    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-800'/>
-    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-801'/>
-    <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-803'/>
-    <pointer-type-def type-id='type-id-804' size-in-bits='64' id='type-id-805'/>
-    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-807'/>
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-808'/>
-    <pointer-type-def type-id='type-id-743' size-in-bits='64' id='type-id-809'/>
-    <pointer-type-def type-id='type-id-743' size-in-bits='64' id='type-id-810'/>
-    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-811'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-815'/>
-    <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-816'/>
-    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-817'/>
-    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-818'/>
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-820'/>
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-825'/>
-    <reference-type-def kind='rvalue' type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
+    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-753'/>
+    <pointer-type-def type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
+    <pointer-type-def type-id='type-id-756' size-in-bits='64' id='type-id-757'/>
+    <qualified-type-def type-id='type-id-706' const='yes' id='type-id-758'/>
+    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-759'/>
+    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-760'/>
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-761'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-762'/>
+    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-763'/>
+    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-764'/>
+    <qualified-type-def type-id='type-id-765' const='yes' id='type-id-766'/>
+    <qualified-type-def type-id='type-id-704' const='yes' id='type-id-767'/>
+    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-768'/>
+    <qualified-type-def type-id='type-id-726' const='yes' id='type-id-769'/>
+    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-770'/>
+    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-771'/>
+    <qualified-type-def type-id='type-id-678' const='yes' id='type-id-772'/>
+    <qualified-type-def type-id='type-id-680' const='yes' id='type-id-773'/>
+    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-775'/>
+    <pointer-type-def type-id='type-id-759' size-in-bits='64' id='type-id-776'/>
+    <pointer-type-def type-id='type-id-760' size-in-bits='64' id='type-id-777'/>
+    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-778'/>
+    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-779'/>
+    <pointer-type-def type-id='type-id-763' size-in-bits='64' id='type-id-780'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-781'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-782'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-783'/>
+    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-784'/>
+    <pointer-type-def type-id='type-id-769' size-in-bits='64' id='type-id-785'/>
+    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-786'/>
+    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-787'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-788'/>
+    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-789'/>
+    <qualified-type-def type-id='type-id-790' const='yes' 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'/>
+    <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-795'/>
+    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-797'/>
+    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-799'/>
+    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-801'/>
+    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-805'/>
+    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-807'/>
+    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-808'/>
+    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-809'/>
+    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-810'/>
+    <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-811'/>
+    <qualified-type-def type-id='type-id-808' restrict='yes' id='type-id-812'/>
+    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-814'/>
+    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-815'/>
+    <reference-type-def kind='rvalue' type-id='type-id-815' size-in-bits='64' id='type-id-816'/>
+    <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
+    <reference-type-def kind='lvalue' type-id='type-id-819' size-in-bits='64' id='type-id-820'/>
+    <reference-type-def kind='lvalue' type-id='type-id-821' size-in-bits='64' id='type-id-822'/>
+    <reference-type-def kind='lvalue' type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
     <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-828'/>
-    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-830'/>
-    <reference-type-def kind='lvalue' type-id='type-id-831' size-in-bits='64' id='type-id-832'/>
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-833'/>
-    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-835'/>
-    <reference-type-def kind='lvalue' type-id='type-id-836' size-in-bits='64' id='type-id-837'/>
-    <reference-type-def kind='rvalue' type-id='type-id-836' size-in-bits='64' id='type-id-838'/>
-    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-839'/>
-    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-841'/>
-    <reference-type-def kind='lvalue' type-id='type-id-758' size-in-bits='64' id='type-id-842'/>
-    <reference-type-def kind='rvalue' type-id='type-id-758' size-in-bits='64' id='type-id-843'/>
-    <pointer-type-def type-id='type-id-758' size-in-bits='64' id='type-id-844'/>
-    <reference-type-def kind='lvalue' type-id='type-id-761' size-in-bits='64' id='type-id-845'/>
-    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-846'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-796'/>
+    <pointer-type-def type-id='type-id-796' size-in-bits='64' id='type-id-829'/>
+    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-830'/>
+    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-832'/>
+    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-834'/>
+    <pointer-type-def type-id='type-id-835' size-in-bits='64' id='type-id-836'/>
+    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-838'/>
+    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-840'/>
+    <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-842'/>
+    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
+    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-846'/>
     <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-848'/>
     <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-850'/>
-    <reference-type-def kind='rvalue' type-id='type-id-851' size-in-bits='64' id='type-id-852'/>
-    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-854'/>
-    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-856'/>
-    <reference-type-def kind='rvalue' type-id='type-id-857' size-in-bits='64' id='type-id-858'/>
-    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-859'/>
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-861'/>
-    <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-863'/>
-    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-865'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-867'/>
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-869'/>
-    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-871'/>
-    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-874' size-in-bits='64' id='type-id-875'/>
-    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-876'/>
-    <reference-type-def kind='rvalue' type-id='type-id-767' size-in-bits='64' id='type-id-877'/>
-    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-878'/>
-    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-880'/>
-    <reference-type-def kind='rvalue' type-id='type-id-881' size-in-bits='64' id='type-id-882'/>
-    <pointer-type-def type-id='type-id-881' size-in-bits='64' id='type-id-883'/>
-    <reference-type-def kind='rvalue' 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'/>
-    <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-888'/>
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-889'/>
-    <reference-type-def kind='rvalue' type-id='type-id-890' size-in-bits='64' id='type-id-891'/>
-    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-892'/>
-    <reference-type-def kind='rvalue' type-id='type-id-893' size-in-bits='64' id='type-id-894'/>
-    <pointer-type-def type-id='type-id-893' size-in-bits='64' id='type-id-895'/>
-    <reference-type-def kind='rvalue' type-id='type-id-896' size-in-bits='64' id='type-id-897'/>
-    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-898'/>
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-900'/>
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-901'/>
-    <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-904' size-in-bits='64' id='type-id-905'/>
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-907'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-909'/>
-    <reference-type-def kind='lvalue' type-id='type-id-910' size-in-bits='64' id='type-id-911'/>
-    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-915'/>
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-917'/>
-    <reference-type-def kind='rvalue' type-id='type-id-918' size-in-bits='64' id='type-id-919'/>
-    <pointer-type-def type-id='type-id-779' size-in-bits='64' id='type-id-920'/>
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-929'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-933'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-708'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-934'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-935'/>
+    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-851'/>
+    <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-853'/>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-855'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-856'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-857'/>
     <namespace-decl name='std'>
-      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' id='type-id-936'>
+      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' id='type-id-858'>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-936' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='71' column='1' id='type-id-937'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-858' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='71' column='1' id='type-id-859'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-938' is-artificial='yes'/>
+            <parameter type-id='type-id-860' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
-            <return type-id='type-id-939'/>
+            <return type-id='type-id-861'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='ostream' type-id='type-id-936' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/iosfwd' line='141' column='1' id='type-id-706'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-910' visibility='default' is-declaration-only='yes' id='type-id-785'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-902' visibility='default' is-declaration-only='yes' id='type-id-940'/>
-      <class-decl name='mutex_type' naming-typedef-id='type-id-912' visibility='default' is-declaration-only='yes' id='type-id-932'>
+      <typedef-decl name='ostream' type-id='type-id-858' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/iosfwd' line='141' column='1' id='type-id-662'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-821' visibility='default' is-declaration-only='yes' id='type-id-790'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-819' visibility='default' is-declaration-only='yes' id='type-id-862'/>
+      <class-decl name='mutex_type' naming-typedef-id='type-id-823' visibility='default' is-declaration-only='yes' id='type-id-827'>
         <member-function access='public'>
           <function-decl name='lock' mangled-name='_ZNSt5mutex4lockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-828' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unlock' mangled-name='_ZNSt5mutex6unlockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-828' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-794'>
+      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-792'>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt9type_infoeqERKS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/typeinfo' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-797' is-artificial='yes'/>
-            <parameter type-id='type-id-796'/>
+            <parameter type-id='type-id-795' is-artificial='yes'/>
+            <parameter type-id='type-id-794'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-758'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-704'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-925'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-737'>
             <member-function access='public'>
               <function-decl name='id' mangled-name='_ZNSt6thread2idC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-926' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-738' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-927'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-849'>
             <member-function access='public'>
               <function-decl name='_Impl' mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEEC2EOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-929' is-artificial='yes'/>
-                <parameter type-id='type-id-891'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-851' is-artificial='yes'/>
+                <parameter type-id='type-id-377'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public' vtable-offset='2'>
               <function-decl name='_M_run' mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEE6_M_runEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEE6_M_runEv'>
-                <parameter type-id='type-id-929' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-851' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-930'>
+          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-854'>
             <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/5.4.0/../../../../include/c++/5.4.0/thread' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread10_Impl_baseD2Ev'>
-                <parameter type-id='type-id-931' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-855' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='joinable' mangled-name='_ZNKSt6thread8joinableEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-760' is-artificial='yes'/>
+            <parameter type-id='type-id-783' 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/5.4.0/../../../../include/c++/5.4.0/thread' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-844' is-artificial='yes'/>
-            <parameter type-id='type-id-843'/>
-            <return type-id='type-id-842'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt6thread4swapERS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-844' is-artificial='yes'/>
-            <parameter type-id='type-id-842'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_make_routine&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt6thread15_M_make_routineISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEEESt10shared_ptrINS_5_ImplIT_EEEOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-844' is-artificial='yes'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-896'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-743'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;&gt;' mangled-name='_ZNSt6threadC2ISt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS4_EEJEEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6threadC2ISt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS4_EEJEEEOT_DpOT0_'>
-            <parameter type-id='type-id-844' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-761'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-706'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-846' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='656' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-846' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2INSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPSA_EEvEEEESaISJ_EJSI_EEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='609' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-846' is-artificial='yes'/>
-            <parameter type-id='type-id-941'/>
-            <parameter type-id='type-id-928'/>
-            <parameter type-id='type-id-787'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-863'/>
+            <parameter type-id='type-id-850'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='685' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-846' is-artificial='yes'/>
-            <parameter type-id='type-id-845'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-847'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-690'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCCollectorInterface *, std::default_delete&lt;mongo::FTDCCollectorInterface&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-848' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-691' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-764'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-765'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-943' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-942'/>
+          <typedef-decl name='pointer' type-id='type-id-865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-864'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-944'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-866'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-705' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-943'/>
+              <typedef-decl name='type' type-id='type-id-661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-865'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-766' is-artificial='yes'/>
-            <return type-id='type-id-942'/>
+            <parameter type-id='type-id-782' is-artificial='yes'/>
+            <return type-id='type-id-864'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-766' is-artificial='yes'/>
+            <parameter type-id='type-id-782' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-766' is-artificial='yes'/>
-            <return type-id='type-id-945'/>
+            <parameter type-id='type-id-782' is-artificial='yes'/>
+            <return type-id='type-id-867'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-849'>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-698'>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::FTDCController *&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEC2IJS6_EEEOS5_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-852'/>
-            <parameter type-id='type-id-826'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <parameter type-id='type-id-816'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEC2EOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, 0&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1071' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <parameter type-id='type-id-919'/>
-            <parameter type-id='type-id-946'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-868'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEclIJEvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-850' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-857'>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-700'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCController *, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo14FTDCControllerEEEC2IJS2_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-859' is-artificial='yes'/>
-            <parameter type-id='type-id-826'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo14FTDCControllerEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-859' is-artificial='yes'/>
-            <parameter type-id='type-id-858'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-860'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-708'>
         <member-function access='public'>
           <function-decl name='__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo9transport7SessionELN9__gnu_cxx12_Lock_policyE2EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-861' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo9transport7SessionELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='925' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-861' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-862'>
+      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-710'>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrIN5mongo9transport7SessionEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-863' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrIN5mongo9transport7SessionEEC2EDn' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-863' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-864'>
+      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-712'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-865' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-865' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-866'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-714'>
         <member-function access='private'>
           <function-decl name='__wait_until_impl&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt; &gt;' mangled-name='_ZNSt18condition_variable17__wait_until_implINSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEEEESt9cv_statusRSt11unique_lockISt5mutexERKNS1_10time_pointINS1_3_V212system_clockET_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/condition_variable' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-867' is-artificial='yes'/>
-            <parameter type-id='type-id-399'/>
-            <parameter type-id='type-id-790'/>
-            <return type-id='type-id-241'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-366'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='wait_until&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt; &gt;' mangled-name='_ZNSt18condition_variable10wait_untilINSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEEEESt9cv_statusRSt11unique_lockISt5mutexERKNS1_10time_pointINS1_3_V212system_clockET_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/condition_variable' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-867' is-artificial='yes'/>
-            <parameter type-id='type-id-399'/>
-            <parameter type-id='type-id-790'/>
-            <return type-id='type-id-241'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-366'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-868'>
+      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-716'>
         <member-type access='private'>
-          <typedef-decl name='mutex_type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='406' column='1' id='type-id-870'/>
+          <typedef-decl name='mutex_type' type-id='type-id-827' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='406' column='1' id='type-id-817'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='lock' mangled-name='_ZNSt11unique_lockISt5mutexE4lockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-869' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/mutex' line='412' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-869' is-artificial='yes'/>
-            <parameter type-id='type-id-871'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-818'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/mutex' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-869' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/mutex' line='447' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-869' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__25' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-767'>
+      <class-decl name='__anonymous_struct__25' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-726'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-947'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-869'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-805' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-948'/>
+              <typedef-decl name='type' type-id='type-id-725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-870'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-948' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-949'/>
+          <typedef-decl name='pointer' type-id='type-id-870' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='150' column='1' id='type-id-871'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-769' is-artificial='yes'/>
-            <return type-id='type-id-949'/>
+            <parameter type-id='type-id-785' is-artificial='yes'/>
+            <return type-id='type-id-871'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EE7releaseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-878' is-artificial='yes'/>
-            <return type-id='type-id-949'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <return type-id='type-id-871'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-878' is-artificial='yes'/>
-            <parameter type-id='type-id-877'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reset' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EE5resetEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-878' is-artificial='yes'/>
-            <parameter type-id='type-id-949'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <parameter type-id='type-id-871'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-878' is-artificial='yes'/>
-            <parameter type-id='type-id-877'/>
-            <return type-id='type-id-876'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-878' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-727' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-769' is-artificial='yes'/>
-            <return type-id='type-id-949'/>
+            <parameter type-id='type-id-785' is-artificial='yes'/>
+            <return type-id='type-id-871'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-769' is-artificial='yes'/>
+            <parameter type-id='type-id-785' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__29' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-884'>
+      <class-decl name='__anonymous_struct__29' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-739'>
         <member-function access='public'>
           <function-decl name='tuple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; , void&gt;' mangled-name='_ZNSt5tupleIJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2IJS9_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-886' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-740' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-886' is-artificial='yes'/>
-            <parameter type-id='type-id-885'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-740' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-887'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-664'>
         <member-type access='private'>
-          <typedef-decl name='mutex_type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='383' column='1' id='type-id-912'/>
+          <typedef-decl name='mutex_type' type-id='type-id-827' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='383' column='1' id='type-id-823'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='lock_guard' mangled-name='_ZNSt10lock_guardISt5mutexEC2ERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-888' is-artificial='yes'/>
-            <parameter type-id='type-id-913'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/mutex' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-888' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__31' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-893'>
+      <class-decl name='__anonymous_struct__31' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-741'>
         <member-function access='protected'>
           <function-decl name='__shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEELN9__gnu_cxx12_Lock_policyE2EEC2ISaISF_EJSE_EEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='1094' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <parameter type-id='type-id-941'/>
-            <parameter type-id='type-id-787'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-742' is-artificial='yes'/>
+            <parameter type-id='type-id-863'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='925' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-742' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__34' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-896'>
+      <class-decl name='__anonymous_struct__34' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-743'>
         <member-function access='private'>
           <function-decl name='shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt10shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEC2ISaISF_EJSE_EEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-898' is-artificial='yes'/>
-            <parameter type-id='type-id-941'/>
-            <parameter type-id='type-id-787'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-744' is-artificial='yes'/>
+            <parameter type-id='type-id-863'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__35' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-899'>
+      <class-decl name='__anonymous_struct__35' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-745'>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr_inplace&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EEC2IJSE_EEESG_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='517' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-901' is-artificial='yes'/>
-            <parameter type-id='type-id-785'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-749' is-artificial='yes'/>
+            <parameter type-id='type-id-790'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_ptr' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-901' is-artificial='yes'/>
-            <return type-id='type-id-928'/>
+            <parameter type-id='type-id-749' is-artificial='yes'/>
+            <return type-id='type-id-850'/>
           </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_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EED0Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-901' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-749' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv'>
-            <parameter type-id='type-id-901' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-749' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='536' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv'>
-            <parameter type-id='type-id-901' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-749' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'>
-            <parameter type-id='type-id-901' is-artificial='yes'/>
-            <parameter type-id='type-id-796'/>
-            <return type-id='type-id-190'/>
+            <parameter type-id='type-id-749' is-artificial='yes'/>
+            <parameter type-id='type-id-794'/>
+            <return type-id='type-id-187'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__37' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-904'>
+      <class-decl name='__anonymous_struct__37' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-750'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-905' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-751' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, void&gt;' mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2INS0_5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPSB_EEvEEEEvEEOS_IT_LS3_2EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='940' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-905' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-751' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='925' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-905' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-751' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__38' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-906'>
+      <class-decl name='__anonymous_struct__38' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-752'>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-907' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-753' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, void&gt;' mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2INS0_5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS9_EEvEEEEvEEOS_IT_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-907' is-artificial='yes'/>
-            <parameter type-id='type-id-897'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-753' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__40' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-776'>
+      <class-decl name='__anonymous_struct__40' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-774'>
         <member-type access='private'>
-          <typedef-decl name='result_type' type-id='type-id-951' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='573' column='1' id='type-id-950'/>
+          <typedef-decl name='result_type' type-id='type-id-873' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='573' column='1' id='type-id-872'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Class' type-id='type-id-952' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='554' column='1' id='type-id-916'/>
+          <typedef-decl name='_Class' type-id='type-id-874' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='554' column='1' id='type-id-825'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNKSt12_Mem_fn_baseIMN5mongo14FTDCControllerEFvvELb1EEclIJEvEEvPS1_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='599' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-778' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
-            <return type-id='type-id-950'/>
+            <parameter type-id='type-id-789' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-872'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__42' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-918'/>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-779'>
+      <class-decl name='__anonymous_struct__42' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-875'/>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-688'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-953'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-876'>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-781' is-artificial='yes'/>
-            <return type-id='type-id-419'/>
+            <return type-id='type-id-405'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZNSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EE7releaseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-920' is-artificial='yes'/>
-            <return type-id='type-id-419'/>
+            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <return type-id='type-id-405'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-920' is-artificial='yes'/>
-            <parameter type-id='type-id-407'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-920' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-954'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-877'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-704' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='1592' column='1' id='type-id-945'/>
+          <typedef-decl name='type' type-id='type-id-660' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='1592' column='1' id='type-id-867'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-851'/>
-      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-853'>
+      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-878'/>
+      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-837'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCController *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo14FTDCControllerELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-854' is-artificial='yes'/>
-            <parameter type-id='type-id-826'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-838' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-855'>
+      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-839'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCController *&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo14FTDCControllerEEEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-856' is-artificial='yes'/>
-            <parameter type-id='type-id-826'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo14FTDCControllerEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-856' is-artificial='yes'/>
-            <parameter type-id='type-id-615'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-872'>
+      <class-decl name='__anonymous_struct__23' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-879'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EN5mongo7BSONObjELb0EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-873'/>
-            <return type-id='type-id-591'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-874'>
+      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-880'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-875'/>
-            <return type-id='type-id-591'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__26' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-770'>
+      <class-decl name='__anonymous_struct__26' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-804'>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo15FTDCFileManagerEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-772' is-artificial='yes'/>
-            <parameter type-id='type-id-805'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-810' is-artificial='yes'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__27' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-879'>
+      <class-decl name='__anonymous_struct__27' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-843'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm0ESt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EELb0EEC2IS9_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-880' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-844' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__28' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-881'>
+      <class-decl name='__anonymous_struct__28' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-845'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; &gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2IS9_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-883' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-846' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-883' is-artificial='yes'/>
-            <parameter type-id='type-id-882'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-846' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-773'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-806'>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-830' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-830' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-830' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-775' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-811' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__30' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-890'>
+      <class-decl name='__anonymous_struct__30' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-847'>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-956' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1505' column='1' id='type-id-955'/>
+          <typedef-decl name='result_type' type-id='type-id-882' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1505' column='1' id='type-id-881'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;&gt;' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEC2IS9_JEEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1509' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-607'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind_simple' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEC2EOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1514' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_invoke&lt;&gt;' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEE9_M_invokeIJEEEvSt12_Index_tupleIJXspT_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-957'/>
-            <return type-id='type-id-956'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <parameter type-id='type-id-883'/>
+            <return type-id='type-id-882'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEclEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1517' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <return type-id='type-id-955'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <return type-id='type-id-881'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__32' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-941'/>
-      <class-decl name='__anonymous_struct__36' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-958'>
+      <class-decl name='__anonymous_struct__32' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-863'/>
+      <class-decl name='__anonymous_struct__36' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-884'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-940' 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-902'/>
+          <typedef-decl name='allocator_type' type-id='type-id-862' 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-819'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-900' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-959'/>
+          <typedef-decl name='pointer' type-id='type-id-746' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-885'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEESaISG_ELN9__gnu_cxx12_Lock_policyE2EEEE8allocateERSL_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-903'/>
+            <parameter type-id='type-id-820'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-959'/>
+            <return type-id='type-id-885'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEESaISG_ELN9__gnu_cxx12_Lock_policyE2EEEE10deallocateERSL_PSK_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-903'/>
-            <parameter type-id='type-id-959'/>
+            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-885'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__39' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-960'>
+      <class-decl name='__anonymous_struct__39' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-886'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-785' 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-910'/>
+          <typedef-decl name='allocator_type' type-id='type-id-790' 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-821'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEE9constructISF_JSE_EEEvRSG_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-911'/>
-            <parameter type-id='type-id-928'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-822'/>
+            <parameter type-id='type-id-850'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEE7destroyISF_EEvRSG_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911'/>
-            <parameter type-id='type-id-928'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-822'/>
+            <parameter type-id='type-id-850'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__39' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-908'>
+      <class-decl name='__anonymous_struct__39' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-852'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEESaISG_ELN9__gnu_cxx12_Lock_policyE2EEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocated_ptr.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-909' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-853' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-914'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-831'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-915' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-832' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__41' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-961'>
+      <class-decl name='__anonymous_struct__41' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-887'>
         <member-type access='public'>
-          <typedef-decl name='__result_type' type-id='type-id-196' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='506' column='1' id='type-id-951'/>
+          <typedef-decl name='__result_type' type-id='type-id-193' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='506' column='1' id='type-id-873'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__class_type' type-id='type-id-823' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='507' column='1' id='type-id-952'/>
+          <typedef-decl name='__class_type' type-id='type-id-813' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='507' column='1' id='type-id-874'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__43' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-946'/>
-      <class-decl name='__anonymous_struct__44' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-962'>
+      <class-decl name='__anonymous_struct__43' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-868'/>
+      <class-decl name='__anonymous_struct__44' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-888'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-196' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='158' column='1' id='type-id-956'/>
+          <typedef-decl name='type' type-id='type-id-193' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='158' column='1' id='type-id-882'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__45' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-957'/>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-963'>
+      <class-decl name='__anonymous_struct__45' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-883'/>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-921'>
+      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-833'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCCollectorInterface *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo22FTDCCollectorInterfaceELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-922' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-834' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-923'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-835'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCCollectorInterface *, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-836' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-782'>
+      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-798'>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo22FTDCCollectorInterfaceEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-784' is-artificial='yes'/>
-            <parameter type-id='type-id-263'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-809' is-artificial='yes'/>
+            <parameter type-id='type-id-260'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-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/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='862' 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-763' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='862' column='1'/>
+        <parameter type-id='type-id-164' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='862' column='1'/>
         <parameter is-variadic='yes'/>
-        <return type-id='type-id-196'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <namespace-decl name='chrono'>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-788'/>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-964'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-800'/>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-890'>
           <member-function access='public' static='yes'>
             <function-decl name='__cast&lt;long, std::ratio&lt;1, 1000000000&gt; &gt;' mangled-name='_ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1EEEES2_ILl1ELl1000000000EElLb1ELb0EE6__castIlS5_EES4_RKNS1_IT_T0_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-793'/>
-              <return type-id='type-id-965'/>
+              <parameter type-id='type-id-366'/>
+              <return type-id='type-id-891'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-965'/>
-        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-791'/>
+        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-891'/>
+        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-802'/>
       </namespace-decl>
       <namespace-decl name='__cxx11'>
-        <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3008' visibility='default' id='type-id-703'/>
+        <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3008' visibility='default' id='type-id-659'/>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-710'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-730'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-711' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-712'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-747'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-900' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-966'/>
+          <typedef-decl name='pointer' type-id='type-id-746' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-892'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS8_EEvEEEESaISH_ELNS_12_Lock_policyE2EEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-748' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-966'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-892'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS8_EEvEEEESaISH_ELNS_12_Lock_policyE2EEE10deallocateEPSK_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-713' is-artificial='yes'/>
-            <parameter type-id='type-id-966'/>
+            <parameter type-id='type-id-748' is-artificial='yes'/>
+            <parameter type-id='type-id-892'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-714'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-754'>
         <member-function access='public'>
           <function-decl name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEEE9constructISG_JSF_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-715' is-artificial='yes'/>
-            <parameter type-id='type-id-928'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-755' is-artificial='yes'/>
+            <parameter type-id='type-id-850'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEEE7destroyISG_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-715' is-artificial='yes'/>
-            <parameter type-id='type-id-928'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-755' is-artificial='yes'/>
+            <parameter type-id='type-id-850'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-967'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-893'>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-840'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-682'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [104]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA104_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-841' is-artificial='yes'/>
-              <parameter type-id='type-id-701'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-683' is-artificial='yes'/>
+              <parameter type-id='type-id-657'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [36]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA36_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-841' is-artificial='yes'/>
-              <parameter type-id='type-id-702'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-683' is-artificial='yes'/>
+              <parameter type-id='type-id-658'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;std::__cxx11::basic_string&lt;char&gt; &gt;' mangled-name='_ZN10mongoutils3str6streamlsINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-841' is-artificial='yes'/>
-              <parameter type-id='type-id-232'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-683' is-artificial='yes'/>
+              <parameter type-id='type-id-229'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [25]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA25_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-841' is-artificial='yes'/>
+              <parameter type-id='type-id-683' is-artificial='yes'/>
               <parameter type-id='type-id-66'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='Milliseconds' naming-typedef-id='type-id-968' visibility='default' is-declaration-only='yes' id='type-id-969'/>
-      <class-decl name='__class_type' naming-typedef-id='type-id-952' visibility='default' is-declaration-only='yes' id='type-id-823'>
+      <class-decl name='Milliseconds' naming-typedef-id='type-id-894' visibility='default' is-declaration-only='yes' id='type-id-895'/>
+      <class-decl name='__class_type' naming-typedef-id='type-id-874' visibility='default' is-declaration-only='yes' id='type-id-813'>
         <member-function access='public'>
           <function-decl name='setEnabled' mangled-name='_ZN5mongo14FTDCController10setEnabledEb' filepath='src/mongo/db/ftdc/controller.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController10setEnabledEb'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-737'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setPeriod' mangled-name='_ZN5mongo14FTDCController9setPeriodENS_8DurationISt5ratioILl1ELl1000EEEE' filepath='src/mongo/db/ftdc/controller.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController9setPeriodENS_8DurationISt5ratioILl1ELl1000EEEE'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-968'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-894'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setMaxDirectorySizeBytes' mangled-name='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm' filepath='src/mongo/db/ftdc/controller.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-446'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-433'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setMaxFileSizeBytes' mangled-name='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm' filepath='src/mongo/db/ftdc/controller.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-446'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-433'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setMaxSamplesPerArchiveMetricChunk' mangled-name='_ZN5mongo14FTDCController34setMaxSamplesPerArchiveMetricChunkEm' filepath='src/mongo/db/ftdc/controller.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController34setMaxSamplesPerArchiveMetricChunkEm'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setMaxSamplesPerInterimMetricChunk' mangled-name='_ZN5mongo14FTDCController34setMaxSamplesPerInterimMetricChunkEm' filepath='src/mongo/db/ftdc/controller.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController34setMaxSamplesPerInterimMetricChunkEm'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setDirectory' mangled-name='_ZN5mongo14FTDCController12setDirectoryERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/controller.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController12setDirectoryERKN5boost10filesystem4pathE'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
-            <return type-id='type-id-737'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='addPeriodicCollector' mangled-name='_ZN5mongo14FTDCController20addPeriodicCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE' filepath='src/mongo/db/ftdc/controller.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController20addPeriodicCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-779'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='addOnRotateCollector' mangled-name='_ZN5mongo14FTDCController20addOnRotateCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE' filepath='src/mongo/db/ftdc/controller.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController20addOnRotateCollectorESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-779'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getMostRecentPeriodicDocument' mangled-name='_ZN5mongo14FTDCController29getMostRecentPeriodicDocumentEv' filepath='src/mongo/db/ftdc/controller.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController29getMostRecentPeriodicDocumentEv'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <return type-id='type-id-755'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='start' mangled-name='_ZN5mongo14FTDCController5startEv' filepath='src/mongo/db/ftdc/controller.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController5startEv'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='doLoop' mangled-name='_ZN5mongo14FTDCController6doLoopEv' filepath='src/mongo/db/ftdc/controller.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController6doLoopEv'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop' mangled-name='_ZN5mongo14FTDCController4stopEv' filepath='src/mongo/db/ftdc/controller.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController4stopEv'>
-            <parameter type-id='type-id-824' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-814' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-737'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-666'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-821'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-841'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-799' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-737'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-799' is-artificial='yes'/>
-            <parameter type-id='type-id-798'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-786' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-799' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-822'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-842'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reason' mangled-name='_ZNK5mongo6Status6reasonB5cxx11Ev' filepath='src/mongo/base/status.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-739' is-artificial='yes'/>
-            <return type-id='type-id-259'/>
+            <parameter type-id='type-id-786' is-artificial='yes'/>
+            <return type-id='type-id-256'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='code' mangled-name='_ZNK5mongo6Status4codeEv' filepath='src/mongo/base/status.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-739' is-artificial='yes'/>
-            <return type-id='type-id-241'/>
+            <parameter type-id='type-id-786' is-artificial='yes'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-740'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-670'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-743'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-680'>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-809' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-681' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-809' is-artificial='yes'/>
+                <parameter type-id='type-id-681' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-745' is-artificial='yes'/>
+                <parameter type-id='type-id-788' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -7612,724 +7538,713 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-801' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-740'/>
+            <return type-id='type-id-670'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-740'/>
+            <return type-id='type-id-670'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-742' is-artificial='yes'/>
+            <parameter type-id='type-id-777' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo12SharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-801' is-artificial='yes'/>
-            <parameter type-id='type-id-800'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-801' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-802'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-728'>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithISt10unique_ptrINS_15FTDCFileManagerESt14default_deleteIS2_EEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-803' is-artificial='yes'/>
-            <return type-id='type-id-876'/>
+            <parameter type-id='type-id-729' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-804'/>
-      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-806'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-724'/>
+      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-734'>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo17ConstSharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-808' is-artificial='yes'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-970'>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-896'>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-746'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-672'>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-811' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-811' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-748' is-artificial='yes'/>
+            <parameter type-id='type-id-778' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-811' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-812'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-674'>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-813' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-813' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-813' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-814'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-676'>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-815' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-815' is-artificial='yes'/>
-            <parameter type-id='type-id-752'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-684'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='439' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-815' is-artificial='yes'/>
-            <parameter type-id='type-id-752'/>
-            <return type-id='type-id-365'/>
+            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-684'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-815' is-artificial='yes'/>
+            <parameter type-id='type-id-677' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-365'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-749'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-678'>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-816' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-679' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-816' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-679' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-816' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-679' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-816' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-679' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-751' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-787' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-752'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-684'>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-754' is-artificial='yes'/>
+            <parameter type-id='type-id-779' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-817' is-artificial='yes'/>
-            <parameter type-id='type-id-259'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-685' is-artificial='yes'/>
+            <parameter type-id='type-id-256'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-817' is-artificial='yes'/>
+            <parameter type-id='type-id-685' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-755'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-732'>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-818' is-artificial='yes'/>
-            <parameter type-id='type-id-757'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-733' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo7BSONObj4swapERS0_' filepath='src/mongo/bson/bsonobj.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-818' is-artificial='yes'/>
-            <parameter type-id='type-id-591'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-733' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo7BSONObjaSES0_' filepath='src/mongo/bson/bsonobj.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-818' is-artificial='yes'/>
-            <parameter type-id='type-id-755'/>
-            <return type-id='type-id-591'/>
+            <parameter type-id='type-id-733' is-artificial='yes'/>
+            <parameter type-id='type-id-732'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-819'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-718'>
         <member-function access='public'>
           <function-decl name='IdleThreadBlock' mangled-name='_ZN5mongo15IdleThreadBlockC2EPKc' filepath='src/mongo/util/concurrency/idle_thread_block.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~IdleThreadBlock' mangled-name='_ZN5mongo15IdleThreadBlockD2Ev' filepath='src/mongo/util/concurrency/idle_thread_block.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-820' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-827'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-694'>
           <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'>
-              <parameter type-id='type-id-828' is-artificial='yes'/>
-              <return type-id='type-id-830'/>
+              <parameter type-id='type-id-695' is-artificial='yes'/>
+              <return type-id='type-id-693'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-829'/>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-831'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-692'/>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-696'>
           <member-function access='public'>
             <function-decl name='stream' mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv' filepath='src/mongo/logger/logstream_builder.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-833' is-artificial='yes'/>
-              <return type-id='type-id-707'/>
+              <parameter type-id='type-id-697' is-artificial='yes'/>
+              <return type-id='type-id-663'/>
             </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='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-833' is-artificial='yes'/>
+              <parameter type-id='type-id-697' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-832'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/logger/logstream_builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-833' is-artificial='yes'/>
-              <parameter type-id='type-id-259'/>
-              <return type-id='type-id-832'/>
+              <parameter type-id='type-id-697' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;mongo::Status&gt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_' filepath='src/mongo/logger/logstream_builder.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_'>
-              <parameter type-id='type-id-833' is-artificial='yes'/>
-              <parameter type-id='type-id-497'/>
-              <return type-id='type-id-832'/>
+              <parameter type-id='type-id-697' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-834'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-756'>
           <member-function access='public'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-835' is-artificial='yes'/>
-              <parameter type-id='type-id-241'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-757' is-artificial='yes'/>
+              <parameter type-id='type-id-238'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='stdx'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-836'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-702'>
           <member-function access='public'>
             <function-decl name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;, 0&gt;' mangled-name='_ZN5mongo4stdx6threadC2ISt5_BindIFSt7_Mem_fnIMNS_14FTDCControllerEFvvEEPS5_EEJELi0EEEOT_DpOT0_' filepath='src/mongo/stdx/thread.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-839' is-artificial='yes'/>
-              <parameter type-id='type-id-607'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-703' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5mongo4stdx6threadaSEOS1_' filepath='src/mongo/stdx/thread.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-839' is-artificial='yes'/>
-              <parameter type-id='type-id-838'/>
-              <return type-id='type-id-837'/>
+              <parameter type-id='type-id-703' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
-      <typedef-decl name='Milliseconds' type-id='type-id-969' filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-968'/>
+      <typedef-decl name='Milliseconds' type-id='type-id-895' filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-894'/>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-716'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-668'>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
-            <parameter type-id='type-id-119'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-119'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </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.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-776' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
-            <parameter type-id='type-id-287'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-776' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731' is-artificial='yes'/>
-            <return type-id='type-id-810'/>
+            <parameter type-id='type-id-776' is-artificial='yes'/>
+            <return type-id='type-id-736'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-718'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-722'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-972' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-971'/>
+          <typedef-decl name='reference_type' type-id='type-id-898' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-897'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS3_EEEC2EOS7_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='870' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-720' is-artificial='yes'/>
-            <parameter type-id='type-id-719'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-723' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS3_EEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-720' is-artificial='yes'/>
-            <return type-id='type-id-971'/>
+            <parameter type-id='type-id-723' is-artificial='yes'/>
+            <return type-id='type-id-897'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS3_EEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-720' is-artificial='yes'/>
-            <return type-id='type-id-971'/>
+            <parameter type-id='type-id-723' is-artificial='yes'/>
+            <return type-id='type-id-897'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-721'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-686'>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK5boost10filesystem4path5emptyEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='511' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-734' is-artificial='yes'/>
+              <parameter type-id='type-id-780' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-723' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-687' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-724'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-720'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-973' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-972'/>
+            <typedef-decl name='reference_type' type-id='type-id-899' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-898'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-975' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-974'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-901' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-900'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-736' is-artificial='yes'/>
+              <parameter type-id='type-id-784' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEEC2EOS8_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-726' is-artificial='yes'/>
-              <parameter type-id='type-id-725'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-721' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEE9constructEOS7_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-726' is-artificial='yes'/>
-              <parameter type-id='type-id-974'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-721' is-artificial='yes'/>
+              <parameter type-id='type-id-900'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-726' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-721' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-726' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-721' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-726' is-artificial='yes'/>
-              <parameter type-id='type-id-976'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-721' is-artificial='yes'/>
+              <parameter type-id='type-id-902'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-977'>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-903'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-876' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-973'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-899'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-877' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-975'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-901'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-978' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-976'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-904' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-902'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-978' visibility='default' is-declaration-only='yes' id='type-id-979'/>
-      <typedef-decl name='false_' type-id='type-id-979' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-978'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-904' visibility='default' is-declaration-only='yes' id='type-id-905'/>
+      <typedef-decl name='false_' type-id='type-id-905' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-904'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/decompressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-45' 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-45' size-in-bits='64' id='type-id-906'/>
+    <reference-type-def kind='lvalue' type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-909'/>
+    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-911'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-915'/>
+    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-917'/>
+    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-919'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-921'/>
+    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-923'/>
+    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-925'/>
+    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-927'/>
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-929'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-935'/>
+    <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-955'/>
+    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-957'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-959'/>
+    <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-965'/>
+    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-966'/>
+    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-967'/>
+    <qualified-type-def type-id='type-id-932' const='yes' id='type-id-968'/>
+    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-970'/>
+    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-971'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-974'/>
+    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-975'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-978'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-980'/>
+    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-981'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-983'/>
     <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-984'/>
-    <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'/>
+    <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'/>
-    <pointer-type-def type-id='type-id-989' 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-995'/>
-    <reference-type-def kind='lvalue' type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
-    <reference-type-def kind='rvalue' type-id='type-id-996' size-in-bits='64' id='type-id-998'/>
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-999'/>
-    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1003'/>
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
-    <pointer-type-def type-id='type-id-1008' 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-1013'/>
-    <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'/>
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1018'/>
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
-    <qualified-type-def type-id='type-id-1019' restrict='yes' id='type-id-1020'/>
-    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1021'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1021' size-in-bits='64' id='type-id-1022'/>
-    <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'/>
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1026'/>
-    <qualified-type-def type-id='type-id-1027' const='yes' id='type-id-1028'/>
-    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1029'/>
-    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1031'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
-    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1033'/>
-    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1035'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def type-id='type-id-1047' 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'/>
-    <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'/>
-    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1058'/>
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1060'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1061'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1062' size-in-bits='64' id='type-id-1063'/>
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-1064'/>
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-1065'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1066' size-in-bits='64' id='type-id-1067'/>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
-    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1073'/>
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1075'/>
-    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1079'/>
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1081'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1085'/>
-    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1086'/>
-    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1087'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1088'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1090'/>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1093'/>
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1100'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1102'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1105'/>
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1106'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-981'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1107'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1108'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-996'/>
+    <qualified-type-def type-id='type-id-996' restrict='yes' id='type-id-997'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-998'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-999'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-994'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-1000'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1002'/>
+    <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-1009' size-in-bits='64' id='type-id-1010'/>
+    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1012'/>
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
+    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
+    <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1021'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1022'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1023'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1109' visibility='default' is-declaration-only='yes' id='type-id-1110'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1111' visibility='default' is-declaration-only='yes' id='type-id-1112'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1113'>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1024' visibility='default' is-declaration-only='yes' id='type-id-1025'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1026' visibility='default' is-declaration-only='yes' id='type-id-1027'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1028'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1114'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1029'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1094'>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-964'>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPN5mongo7BSONObjEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='1004' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1095' is-artificial='yes'/>
-            <return type-id='type-id-606'/>
+            <parameter type-id='type-id-965' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1046'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-940'>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-1110' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='238' column='1' id='type-id-1049'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1025' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='238' column='1' id='type-id-988'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorImSaImEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorImSaImEE7reserveEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;std::move_iterator&lt;unsigned long *&gt; &gt;' mangled-name='_ZNSt6vectorImSaImEE20_M_allocate_and_copyISt13move_iteratorIPmEEES4_mT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-1115'/>
-            <parameter type-id='type-id-1115'/>
-            <return type-id='type-id-649'/>
+            <parameter type-id='type-id-1030'/>
+            <parameter type-id='type-id-1030'/>
+            <return type-id='type-id-604'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorImSaImEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1048' is-artificial='yes'/>
+            <parameter type-id='type-id-978' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorImSaImEEC2EmRKS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-990'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_initialize' mangled-name='_ZNSt6vectorImSaImEE21_M_default_initializeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorImSaImEEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-651'/>
+            <return type-id='type-id-606'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorImSaImEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1100' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1115'/>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1055'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1030'/>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-946'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-989' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-1116'/>
+          <typedef-decl name='const_iterator' type-id='type-id-907' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-1031'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1118' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-1117'/>
+          <typedef-decl name='pointer' type-id='type-id-1033' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-1032'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;mongo::BSONObj&gt;' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE12emplace_backIJS1_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <parameter type-id='type-id-1089'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1116'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <return type-id='type-id-1031'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
-            <return type-id='type-id-1116'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <return type-id='type-id-1031'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <parameter type-id='type-id-638'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;mongo::BSONObj &amp;&gt;' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE12emplace_backIJRS1_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <parameter type-id='type-id-1088'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='capacity' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE8capacityEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;std::move_iterator&lt;mongo::BSONObj *&gt; &gt;' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE20_M_allocate_and_copyISt13move_iteratorIPS1_EEES6_mT_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-1094'/>
-            <parameter type-id='type-id-1094'/>
-            <return type-id='type-id-1117'/>
+            <parameter type-id='type-id-964'/>
+            <parameter type-id='type-id-964'/>
+            <return type-id='type-id-1032'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE7reserveEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE7reserveEm'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -8337,1252 +8252,1298 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;mongo::BSONObj&gt;' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <parameter type-id='type-id-1089'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;mongo::BSONObj &amp;&gt;' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJRS1_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE19_M_emplace_back_auxIJRS1_EEEvDpOT_'>
-            <parameter type-id='type-id-1106' is-artificial='yes'/>
-            <parameter type-id='type-id-1088'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1092'>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1003'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1093' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1093' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1119'>
+      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1034'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_default_n&lt;unsigned long *, unsigned long&gt;' mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPmmEET_S3_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-455'/>
+            <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-38'/>
-            <return type-id='type-id-455'/>
+            <return type-id='type-id-441'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1120'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1035'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;__gnu_cxx::__normal_iterator&lt;const mongo::BSONObj *, std::vector&lt;mongo::BSONObj, std::allocator&lt;mongo::BSONObj&gt; &gt; &gt;, mongo::BSONObj *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5mongo7BSONObjESt6vectorIS5_SaIS5_EEEEPS5_EET0_T_SE_SD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-989'/>
-            <parameter type-id='type-id-989'/>
-            <parameter type-id='type-id-1091'/>
-            <return type-id='type-id-1091'/>
+            <parameter type-id='type-id-907'/>
+            <parameter type-id='type-id-907'/>
+            <parameter type-id='type-id-999'/>
+            <return type-id='type-id-999'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;mongo::BSONObj *&gt;, mongo::BSONObj *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo7BSONObjEES5_EET0_T_S8_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1094'/>
-            <parameter type-id='type-id-1094'/>
-            <parameter type-id='type-id-1091'/>
-            <return type-id='type-id-1091'/>
+            <parameter type-id='type-id-964'/>
+            <parameter type-id='type-id-964'/>
+            <parameter type-id='type-id-999'/>
+            <return type-id='type-id-999'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1121'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1036'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::BSONObj *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo7BSONObjEEEvT_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1091'/>
-            <parameter type-id='type-id-1091'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-999'/>
+            <parameter type-id='type-id-999'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1122'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1037'>
         <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-186'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-181'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1096'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1009'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1098'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1007'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseImSaImEE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1099' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1008' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1110' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='110' column='1' id='type-id-1043'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1025' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='110' column='1' id='type-id-985'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseImSaImEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1010' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseImSaImEE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
+            <parameter type-id='type-id-1010' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-650'/>
+            <return type-id='type-id-605'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseImSaImEE13_M_deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
-            <parameter type-id='type-id-650'/>
+            <parameter type-id='type-id-1010' is-artificial='yes'/>
+            <parameter type-id='type-id-605'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_create_storage' mangled-name='_ZNSt12_Vector_baseImSaImEE17_M_create_storageEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
+            <parameter type-id='type-id-1010' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseImSaImEEC2EmRKS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
+            <parameter type-id='type-id-1010' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-1045'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-987'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseImSaImEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1097' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1010' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1123'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1038'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1110' 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-1109'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1025' 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-1024'/>
         </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-40'/>
-            <return type-id='type-id-660'/>
+            <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-660'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1101'>
+      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1013'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1103'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1011'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1105' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1012' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_swap_data' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE12_Vector_impl12_M_swap_dataERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1105' is-artificial='yes'/>
-                <parameter type-id='type-id-1104'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1012' is-artificial='yes'/>
+                <parameter type-id='type-id-565'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1112' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='110' column='1' id='type-id-1052'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1027' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='110' column='1' id='type-id-991'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1124' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1118'/>
+          <typedef-decl name='pointer' type-id='type-id-1039' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1033'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1118'/>
+            <return type-id='type-id-1033'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_create_storage' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE17_M_create_storageEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2EmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-993'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
-            <parameter type-id='type-id-635'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1102' is-artificial='yes'/>
-            <parameter type-id='type-id-1118'/>
+            <parameter type-id='type-id-1014' is-artificial='yes'/>
+            <parameter type-id='type-id-1033'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1125'>
+      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1040'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1112' 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-1111'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1027' 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-1026'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1091' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1126'/>
+          <typedef-decl name='pointer' type-id='type-id-999' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1041'/>
         </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-1091'/>
-            <parameter type-id='type-id-1089'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-999'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-40'/>
-            <return type-id='type-id-1126'/>
+            <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-1091'/>
-            <parameter type-id='type-id-1088'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-999'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-1126'/>
+            <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='const_iterator' naming-typedef-id='type-id-1116' visibility='default' is-declaration-only='yes' id='type-id-989'>
+      <class-decl name='const_iterator' naming-typedef-id='type-id-1031' visibility='default' is-declaration-only='yes' id='type-id-907'>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <return type-id='type-id-990'/>
+            <parameter type-id='type-id-909' is-artificial='yes'/>
+            <return type-id='type-id-908'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-983'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-928'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-984' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-929' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-985'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-942'>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-986' is-artificial='yes'/>
+            <parameter type-id='type-id-943' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-660'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE10deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-986' is-artificial='yes'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-943' is-artificial='yes'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-987'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-948'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1091' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1127'/>
+          <typedef-decl name='pointer' type-id='type-id-999' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1042'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE9constructIS2_JS2_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-988' is-artificial='yes'/>
-            <parameter type-id='type-id-1091'/>
-            <parameter type-id='type-id-1089'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
+            <parameter type-id='type-id-999'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-988' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-1127'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-1042'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE9constructIS2_JRS2_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-988' is-artificial='yes'/>
-            <parameter type-id='type-id-1091'/>
-            <parameter type-id='type-id-1088'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
+            <parameter type-id='type-id-999'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE10deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-988' is-artificial='yes'/>
-            <parameter type-id='type-id-1127'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1128'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1043'>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1129'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1044'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1126' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1124'/>
+          <typedef-decl name='pointer' type-id='type-id-1041' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1039'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='type' naming-typedef-id='type-id-1130' visibility='default' is-declaration-only='yes' id='type-id-1040'>
+      <class-decl name='type' naming-typedef-id='type-id-1045' visibility='default' is-declaration-only='yes' id='type-id-982'>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
-            <parameter type-id='type-id-300'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
-            <parameter type-id='type-id-1089'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='init' mangled-name='_ZN5mongo7BSONObj4initEPKc' filepath='src/mongo/bson/bsonobj.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-984' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isValid' mangled-name='_ZNK5mongo7BSONObj7isValidEv' filepath='src/mongo/bson/bsonobj.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-984' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1042' is-artificial='yes'/>
+            <parameter type-id='type-id-984' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo7BSONObj4swapERS0_' filepath='src/mongo/bson/bsonobj.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
-            <parameter type-id='type-id-1088'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo7BSONObjaSES0_' filepath='src/mongo/bson/bsonobj.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1090' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
-            <return type-id='type-id-1088'/>
+            <parameter type-id='type-id-998' is-artificial='yes'/>
+            <parameter type-id='type-id-982'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1059'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-912'>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_12LittleEndianIjEEEENS_6StatusEPT_' filepath='src/mongo/base/data_range_cursor.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <parameter type-id='type-id-1079'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <parameter type-id='type-id-1002'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_12LittleEndianIjEEEENS_10StatusWithIT_EEv' filepath='src/mongo/base/data_range_cursor.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <return type-id='type-id-1131'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <return type-id='type-id-1046'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRangeCursor' mangled-name='_ZN5mongo20ConstDataRangeCursorC2ENS_14ConstDataRangeE' filepath='src/mongo/base/data_range_cursor.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <parameter type-id='type-id-1132'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_10FTDCVarIntEEENS_10StatusWithIT_EEv' filepath='src/mongo/base/data_range_cursor.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <return type-id='type-id-1133'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <return type-id='type-id-1048'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_10FTDCVarIntEEENS_6StatusEPT_' filepath='src/mongo/base/data_range_cursor.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <parameter type-id='type-id-1016'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_' filepath='src/mongo/base/data_range_cursor.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <parameter type-id='type-id-1019'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEv' filepath='src/mongo/base/data_range_cursor.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEv'>
-            <parameter type-id='type-id-1060' is-artificial='yes'/>
-            <return type-id='type-id-1037'/>
+            <parameter type-id='type-id-913' is-artificial='yes'/>
+            <return type-id='type-id-932'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1023'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-916'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1076'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1005'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-975' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </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='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1077'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1006'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1061' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1061' is-artificial='yes'/>
-            <parameter type-id='type-id-161'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1061' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1077'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1006'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1061' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1023'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1066'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-960'>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-961' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo12SharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1068' is-artificial='yes'/>
-            <parameter type-id='type-id-1067'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-961' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1069'>
+      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-962'>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1070' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-963' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo17ConstSharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1070' is-artificial='yes'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-963' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1134'/>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1135'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1049'/>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1050'>
         <member-function access='public' static='yes'>
           <function-decl name='getArrayOffset' mangled-name='_ZN5mongo14FTDCCompressor14getArrayOffsetEjjj' filepath='src/mongo/db/ftdc/compressor.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-445'/>
-            <parameter type-id='type-id-445'/>
-            <parameter type-id='type-id-445'/>
+            <parameter type-id='type-id-432'/>
+            <parameter type-id='type-id-432'/>
+            <parameter type-id='type-id-432'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1133'/>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1136'>
+      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1048'/>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1051'>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1027'>
+      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-950'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_7BSONObjEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1029' is-artificial='yes'/>
+            <parameter type-id='type-id-980' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1073' is-artificial='yes'/>
-            <return type-id='type-id-1088'/>
+            <parameter type-id='type-id-951' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1074'>
+      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-958'>
         <member-function access='public'>
           <function-decl name='uncompress' mangled-name='_ZN5mongo16FTDCDecompressor10uncompressENS_14ConstDataRangeE' filepath='src/mongo/db/ftdc/decompressor.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16FTDCDecompressor10uncompressENS_14ConstDataRangeE'>
-            <parameter type-id='type-id-1075' is-artificial='yes'/>
-            <parameter type-id='type-id-1132'/>
-            <return type-id='type-id-1084'/>
+            <parameter type-id='type-id-959' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-918'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1030'>
+      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-973'>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-1033' is-artificial='yes'/>
-            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-1021'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1032'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-1033' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1080'/>
+            <return type-id='type-id-1020'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1131'/>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1082'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1046'/>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-914'>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1083' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-915' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1083' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-915' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1083' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-915' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1084'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-918'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1085' is-artificial='yes'/>
-            <parameter type-id='type-id-1023'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-919' is-artificial='yes'/>
+            <parameter type-id='type-id-916'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ENS_10ErrorCodes5ErrorEPKc' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1085' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-919' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ES4_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1085' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-919' is-artificial='yes'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1034'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-924'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_14ConstDataRangeEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1036' is-artificial='yes'/>
+            <parameter type-id='type-id-976' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_14ConstDataRangeEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1086' is-artificial='yes'/>
-            <return type-id='type-id-591'/>
+            <parameter type-id='type-id-925' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1132'/>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1037'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1047'/>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-932'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1039' is-artificial='yes'/>
+            <parameter type-id='type-id-977' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1087' is-artificial='yes'/>
-            <return type-id='type-id-555'/>
+            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <return type-id='type-id-565'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1087' is-artificial='yes'/>
-            <parameter type-id='type-id-1023'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-916'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEEC2ES3_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1087' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-1017'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1062'>
+      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1017'>
         <member-function access='public'>
           <function-decl name='Validated' mangled-name='_ZN5mongo9ValidatedINS_7BSONObjEEC2Ev' filepath='src/mongo/base/data_type_validated.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1064' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1018' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1071'/>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1078'/>
-      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1137'>
+      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1015'/>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1001'/>
+      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1052'>
         <member-function access='public' static='yes'>
           <function-decl name='validateLoad' mangled-name='_ZN5mongo9ValidatorINS_7BSONObjEE12validateLoadEPKcm' filepath='src/mongo/rpc/object_check.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1023'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1080'/>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1138'>
+      <class-decl name='__anonymous_struct__21' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1020'/>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1053'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1139'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1054'>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerIjvE4loadEPjPKcmPml' filepath='src/mongo/base/data_type.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-980'/>
+                <parameter type-id='type-id-906'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-1023'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-916'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIjvE10unsafeLoadEPjPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-980'/>
+                <parameter type-id='type-id-906'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1140'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1055'>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIjEEvE4loadEPS3_PKcmPml' filepath='src/mongo/base/data_type_endian.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1079'/>
+                <parameter type-id='type-id-1002'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-1023'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-916'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1141'>
+          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1056'>
             <member-function access='public' static='yes'>
               <function-decl name='defaultConstruct' mangled-name='_ZN5mongo8DataType7HandlerINS_7BSONObjEvE16defaultConstructEv' filepath='src/mongo/bson/bsonobj.h' line='772' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <return type-id='type-id-1040'/>
+                <return type-id='type-id-982'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerINS_7BSONObjEvE4loadEPS2_PKcmPml' filepath='src/mongo/bson/bsonobj.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_7BSONObjEvE4loadEPS2_PKcmPml'>
-                <parameter type-id='type-id-1091'/>
+                <parameter type-id='type-id-999'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-1023'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-916'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1142'>
+          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1057'>
             <member-function access='public' static='yes'>
               <function-decl name='defaultConstruct' mangled-name='_ZN5mongo8DataType7HandlerINS_9ValidatedINS_7BSONObjEEEvE16defaultConstructEv' filepath='src/mongo/base/data_type_validated.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <return type-id='type-id-1062'/>
+                <return type-id='type-id-1017'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerINS_9ValidatedINS_7BSONObjEEEvE4loadEPS4_PKcmPml' filepath='src/mongo/base/data_type_validated.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_9ValidatedINS_7BSONObjEEEvE4loadEPS4_PKcmPml'>
-                <parameter type-id='type-id-1065'/>
+                <parameter type-id='type-id-1019'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-1023'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-916'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1143'>
+          <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-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1144'>
+          <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1059'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1081'/>
+                <parameter type-id='type-id-1021'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;unsigned int&gt;' mangled-name='_ZN5mongo8DataType4loadIjEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-980'/>
+            <parameter type-id='type-id-906'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo8DataType4loadINS_12LittleEndianIjEEEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1079'/>
+            <parameter type-id='type-id-1002'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo8DataType4loadINS_10FTDCVarIntEEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1016'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='defaultConstruct&lt;mongo::BSONObj&gt;' mangled-name='_ZN5mongo8DataType16defaultConstructINS_7BSONObjEEET_v' filepath='src/mongo/base/data_type.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1040'/>
+            <return type-id='type-id-982'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='defaultConstruct&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZN5mongo8DataType16defaultConstructINS_9ValidatedINS_7BSONObjEEEEET_v' filepath='src/mongo/base/data_type.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1062'/>
+            <return type-id='type-id-1017'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZN5mongo8DataType4loadINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1019'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;mongo::BSONObj&gt;' mangled-name='_ZN5mongo8DataType4loadINS_7BSONObjEEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1091'/>
+            <parameter type-id='type-id-999'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1023'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-916'/>
           </function-decl>
         </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-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-1021'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-992'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-922'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1146' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1145'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1061' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1060'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt6vectorIN5mongo7BSONObjESaIS3_EEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-923' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt6vectorIN5mongo7BSONObjESaIS3_EEEC2EOS5_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-1145'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-923' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-994'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-930'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1148' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1147'/>
+          <typedef-decl name='reference_type' type-id='type-id-1063' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1062'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-995' is-artificial='yes'/>
-            <return type-id='type-id-1147'/>
+            <parameter type-id='type-id-931' is-artificial='yes'/>
+            <return type-id='type-id-1062'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo14ConstDataRangeEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-995' is-artificial='yes'/>
-            <return type-id='type-id-1147'/>
+            <parameter type-id='type-id-931' is-artificial='yes'/>
+            <return type-id='type-id-1062'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-996'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-936'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-999' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-999' is-artificial='yes'/>
-            <parameter type-id='type-id-1022'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-999' is-artificial='yes'/>
-            <parameter type-id='type-id-998'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-999' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-999' is-artificial='yes'/>
-            <parameter type-id='type-id-997'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1000'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-938'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1150' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1149'/>
+          <typedef-decl name='reference_type' type-id='type-id-1065' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1064'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1152' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1151'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1067' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1066'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1001' is-artificial='yes'/>
-            <return type-id='type-id-1149'/>
+            <parameter type-id='type-id-939' is-artificial='yes'/>
+            <return type-id='type-id-1064'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1001' is-artificial='yes'/>
-            <return type-id='type-id-1149'/>
+            <parameter type-id='type-id-939' is-artificial='yes'/>
+            <return type-id='type-id-1064'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1001' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-939' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1001' is-artificial='yes'/>
-            <parameter type-id='type-id-1151'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-939' is-artificial='yes'/>
+            <parameter type-id='type-id-1066'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1002'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-952'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1154' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1153'/>
+          <typedef-decl name='reference_type' type-id='type-id-1069' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1068'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo7BSONObjEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1003' is-artificial='yes'/>
-            <return type-id='type-id-1153'/>
+            <parameter type-id='type-id-953' is-artificial='yes'/>
+            <return type-id='type-id-1068'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo7BSONObjEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1003' is-artificial='yes'/>
-            <return type-id='type-id-1153'/>
+            <parameter type-id='type-id-953' is-artificial='yes'/>
+            <return type-id='type-id-1068'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='detail'>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1155'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1070'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-1040' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-1130'/>
+            <typedef-decl name='type' type-id='type-id-982' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-1045'/>
           </member-type>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1004'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-920'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1156' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1146'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1071' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1061'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1005' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-921' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE9constructEOS6_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1005' is-artificial='yes'/>
-              <parameter type-id='type-id-1146'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-921' is-artificial='yes'/>
+              <parameter type-id='type-id-1061'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEEC2EOS6_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1005' is-artificial='yes'/>
-              <parameter type-id='type-id-1146'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-921' is-artificial='yes'/>
+              <parameter type-id='type-id-1061'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1006'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-926'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1157' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1148'/>
+            <typedef-decl name='reference_type' type-id='type-id-1072' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1063'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1007' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-927' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1007' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-927' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1007' is-artificial='yes'/>
-              <parameter type-id='type-id-1158'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-927' is-artificial='yes'/>
+              <parameter type-id='type-id-1073'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1008'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-934'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1159' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1150'/>
+            <typedef-decl name='reference_type' type-id='type-id-1074' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1065'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1160' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1152'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1075' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1067'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1009' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-935' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1009' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-935' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1009' is-artificial='yes'/>
-              <parameter type-id='type-id-1158'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-935' is-artificial='yes'/>
+              <parameter type-id='type-id-1073'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1009' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-935' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEE9constructEOS5_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1009' is-artificial='yes'/>
-              <parameter type-id='type-id-1152'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-935' is-artificial='yes'/>
+              <parameter type-id='type-id-1067'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEEC2EOS5_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1009' is-artificial='yes'/>
-              <parameter type-id='type-id-1152'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-935' is-artificial='yes'/>
+              <parameter type-id='type-id-1067'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1010'>
+        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-944'>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIbE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1011' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-945' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1011' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-945' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1011' is-artificial='yes'/>
-              <parameter type-id='type-id-1158'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-945' is-artificial='yes'/>
+              <parameter type-id='type-id-1073'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1012'>
+        <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-956'>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-1130' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-1014'/>
+            <typedef-decl name='internal_type' type-id='type-id-1045' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-910'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1161' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1154'/>
+            <typedef-decl name='reference_type' type-id='type-id-1076' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1069'/>
           </member-type>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE10get_objectEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='726' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1013' is-artificial='yes'/>
-              <return type-id='type-id-1015'/>
+              <parameter type-id='type-id-957' is-artificial='yes'/>
+              <return type-id='type-id-911'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE8get_implEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='711' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1013' is-artificial='yes'/>
-              <return type-id='type-id-1154'/>
+              <parameter type-id='type-id-957' is-artificial='yes'/>
+              <return type-id='type-id-1069'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1013' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-957' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1013' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-957' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1013' is-artificial='yes'/>
-              <parameter type-id='type-id-1158'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-957' is-artificial='yes'/>
+              <parameter type-id='type-id-1073'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1016'>
+        <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-954'>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageIN5mongo7BSONObjEE7addressEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1017' is-artificial='yes'/>
-              <return type-id='type-id-190'/>
+              <parameter type-id='type-id-955' is-artificial='yes'/>
+              <return type-id='type-id-187'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1162'>
+        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1077'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-591' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1157'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1072'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1163'>
+        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1078'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-555' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1159'/>
+            <typedef-decl name='reference_type' type-id='type-id-565' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1074'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1063' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1160'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-377' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1075'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1164'>
+        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1079'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-638' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1156'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1071'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1165'>
+        <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1080'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1088' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1161'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1076'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-1166' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1158'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-1081' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1073'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1166' visibility='default' is-declaration-only='yes' id='type-id-1167'/>
-      <typedef-decl name='false_' type-id='type-id-1167' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1166'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1081' visibility='default' is-declaration-only='yes' id='type-id-1082'/>
+      <typedef-decl name='false_' type-id='type-id-1082' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1081'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/file_manager.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='16' id='type-id-1168'>
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-1169'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='16' id='type-id-1083'>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-1084'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='16' id='type-id-1170'>
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-1169'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='16' id='type-id-1085'>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-4' id='type-id-1084'/>
     </array-type-def>
-    <reference-type-def kind='rvalue' type-id='type-id-1' size-in-bits='64' id='type-id-1171'/>
-    <qualified-type-def type-id='type-id-1172' const='yes' id='type-id-1173'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1170' 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'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1179'/>
-    <qualified-type-def type-id='type-id-193' const='yes' id='type-id-1180'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1180' size-in-bits='64' id='type-id-225'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1' 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'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1090'/>
+    <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1092'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1093'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1094'/>
+    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-1095'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1095' size-in-bits='64' id='type-id-222'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1099'/>
+    <reference-type-def kind='rvalue' type-id='type-id-73' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-860'/>
+    <reference-type-def kind='lvalue' type-id='type-id-859' size-in-bits='64' id='type-id-861'/>
+    <reference-type-def kind='lvalue' type-id='type-id-238' size-in-bits='64' id='type-id-1102'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1108'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1111'/>
+    <reference-type-def kind='rvalue' 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'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1115'/>
+    <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-1118' size-in-bits='64' id='type-id-1119'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1123'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1129'/>
+    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-1131'/>
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-1133'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-1139'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1153'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1167'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1171'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1174'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1176'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1178'/>
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-1180'/>
     <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1182'/>
-    <reference-type-def kind='lvalue' type-id='type-id-241' size-in-bits='64' id='type-id-1183'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-1184'/>
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-1185'/>
-    <reference-type-def kind='rvalue' type-id='type-id-73' size-in-bits='64' id='type-id-234'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-938'/>
-    <reference-type-def kind='lvalue' type-id='type-id-937' size-in-bits='64' id='type-id-939'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1189'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-1191'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1193'/>
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-1195'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
+    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-1184'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1186'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-1188'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1192'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1194'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1196'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1197'/>
     <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
     <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1201'/>
     <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
@@ -9592,278 +9553,212 @@
     <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1211'/>
     <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-1213'/>
     <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1217'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1218' size-in-bits='64' id='type-id-1219'/>
-    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-1220'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1216'/>
+    <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-1220'/>
     <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-1222'/>
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1224'/>
     <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-1226'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1227' size-in-bits='64' id='type-id-1228'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1229'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-1231'/>
-    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
-    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-1234'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1237'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1238'/>
-    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1239'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1239' size-in-bits='64' id='type-id-1240'/>
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
-    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-1244'/>
-    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1246'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-1248'/>
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-1250'/>
-    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-1252'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1253' size-in-bits='64' id='type-id-1254'/>
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-1255'/>
-    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-1257'/>
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1258'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1259'/>
-    <qualified-type-def type-id='type-id-1259' restrict='yes' id='type-id-1260'/>
-    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1262'/>
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1263'/>
-    <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1265'/>
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1266'/>
-    <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1268'/>
-    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-1269'/>
-    <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1270'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1271'/>
-    <qualified-type-def type-id='type-id-1206' const='yes' id='type-id-1272'/>
-    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-1273'/>
-    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1274'/>
-    <pointer-type-def 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'/>
-    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1279'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-1280'/>
-    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1281'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1281' size-in-bits='64' id='type-id-1282'/>
-    <qualified-type-def type-id='type-id-1230' 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-1235' const='yes' id='type-id-1285'/>
-    <qualified-type-def type-id='type-id-1241' const='yes' id='type-id-1286'/>
-    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1287'/>
-    <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1288'/>
-    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-1289'/>
-    <qualified-type-def type-id='type-id-1256' const='yes' id='type-id-1290'/>
-    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
+    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1228'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1230'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1232'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1234'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1235'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1237'/>
+    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
+    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1240'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-1241'/>
+    <qualified-type-def type-id='type-id-1242' const='yes' id='type-id-1243'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1244'/>
+    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1245'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1246'/>
+    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1247'/>
+    <qualified-type-def type-id='type-id-1136' const='yes' id='type-id-1248'/>
+    <qualified-type-def type-id='type-id-1138' const='yes' id='type-id-1249'/>
+    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1250'/>
+    <qualified-type-def type-id='type-id-1146' const='yes' id='type-id-1251'/>
+    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1252'/>
+    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1253'/>
+    <qualified-type-def type-id='type-id-1208' const='yes' id='type-id-1254'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1255'/>
+    <qualified-type-def type-id='type-id-1183' const='yes' id='type-id-1256'/>
+    <qualified-type-def type-id='type-id-1257' const='yes' id='type-id-1258'/>
+    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1259'/>
+    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1260'/>
+    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1261'/>
+    <qualified-type-def type-id='type-id-1160' const='yes' id='type-id-1262'/>
+    <qualified-type-def type-id='type-id-1126' const='yes' id='type-id-1263'/>
+    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1264'/>
+    <qualified-type-def type-id='type-id-1144' const='yes' id='type-id-1265'/>
+    <qualified-type-def type-id='type-id-1206' const='yes' id='type-id-1266'/>
+    <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1267'/>
+    <qualified-type-def type-id='type-id-1166' const='yes' id='type-id-1268'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-1270'/>
+    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-1271'/>
+    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-1272'/>
+    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-1273'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-1274'/>
+    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-1275'/>
+    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-1276'/>
+    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1277'/>
+    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-1278'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1279'/>
+    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-1280'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1282'/>
+    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-1284'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-1285'/>
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1286'/>
+    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-1287'/>
+    <qualified-type-def type-id='type-id-1288' const='yes' id='type-id-1289'/>
+    <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1291'/>
     <qualified-type-def type-id='type-id-1292' const='yes' id='type-id-1293'/>
-    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1294'/>
-    <qualified-type-def type-id='type-id-1295' const='yes' id='type-id-1296'/>
-    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1297'/>
+    <qualified-type-def type-id='type-id-1294' const='yes' id='type-id-1295'/>
+    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1297'/>
     <qualified-type-def type-id='type-id-1298' const='yes' id='type-id-1299'/>
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1300'/>
-    <qualified-type-def type-id='type-id-1301' const='yes' id='type-id-1302'/>
-    <pointer-type-def type-id='type-id-1302' size-in-bits='64' 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-1307' const='yes' id='type-id-1308'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-1319'/>
-    <qualified-type-def type-id='type-id-1320' const='yes' id='type-id-1321'/>
+    <qualified-type-def type-id='type-id-1300' const='yes' id='type-id-1301'/>
+    <pointer-type-def type-id='type-id-1289' size-in-bits='64' id='type-id-1302'/>
+    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1303'/>
+    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1306'/>
+    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1307'/>
+    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-1308'/>
+    <qualified-type-def type-id='type-id-1302' restrict='yes' id='type-id-1309'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1310' size-in-bits='64' id='type-id-1311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1312' size-in-bits='64' id='type-id-1313'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-1315'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1316' size-in-bits='64' id='type-id-1317'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1318' size-in-bits='64' id='type-id-1319'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1288'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-1320'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
     <pointer-type-def type-id='type-id-1321' size-in-bits='64' id='type-id-1322'/>
-    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1324'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1323'/>
     <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-1325'/>
-    <qualified-type-def type-id='type-id-1326' const='yes' id='type-id-1327'/>
-    <qualified-type-def type-id='type-id-1328' const='yes' id='type-id-1329'/>
-    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
-    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1332'/>
+    <pointer-type-def type-id='type-id-1326' size-in-bits='64' id='type-id-1327'/>
+    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-1329'/>
+    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-1331'/>
     <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-1333'/>
-    <qualified-type-def type-id='type-id-1334' const='yes' id='type-id-1335'/>
-    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
-    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1338'/>
+    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-1335'/>
+    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1337'/>
     <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-1339'/>
-    <qualified-type-def type-id='type-id-1340' const='yes' id='type-id-1341'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-1341'/>
+    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-1343'/>
     <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-1345'/>
-    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-1346'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
-    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-1348'/>
-    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
-    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1349'/>
+    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-1351'/>
     <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1354'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1355'/>
-    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-1356'/>
-    <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-1357'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1358' size-in-bits='64' id='type-id-1359'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1358' size-in-bits='64' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1361'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
+    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-1360' 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-1364' size-in-bits='64' id='type-id-1365'/>
-    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-1367'/>
-    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-1369'/>
-    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1370'/>
-    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1371'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-1373'/>
-    <pointer-type-def type-id='type-id-1314' size-in-bits='64' id='type-id-1374'/>
-    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-1375'/>
-    <pointer-type-def type-id='type-id-1320' size-in-bits='64' id='type-id-1376'/>
-    <pointer-type-def type-id='type-id-1320' size-in-bits='64' id='type-id-1377'/>
-    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-1378'/>
-    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-1380'/>
-    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-1382'/>
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-1384'/>
-    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-1386'/>
-    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-1388'/>
-    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-1390'/>
-    <pointer-type-def type-id='type-id-1326' 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='rvalue' type-id='type-id-1394' size-in-bits='64' id='type-id-1395'/>
-    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-1396'/>
-    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1400'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1401' size-in-bits='64' id='type-id-1402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1328' size-in-bits='64' id='type-id-1403'/>
-    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-1404'/>
-    <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-1406'/>
-    <pointer-type-def type-id='type-id-1407' 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'/>
-    <pointer-type-def type-id='type-id-1411' size-in-bits='64' id='type-id-1412'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1331' 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'/>
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-1421'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1422' size-in-bits='64' id='type-id-1423'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1424' size-in-bits='64' id='type-id-1425'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-1429'/>
-    <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-1431'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1432' size-in-bits='64' id='type-id-1433'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1434' size-in-bits='64' id='type-id-1435'/>
-    <pointer-type-def type-id='type-id-1436' 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-1442' 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='lvalue' type-id='type-id-1446' size-in-bits='64' id='type-id-1447'/>
-    <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-1449'/>
-    <pointer-type-def type-id='type-id-1450' size-in-bits='64' id='type-id-1451'/>
-    <pointer-type-def type-id='type-id-1452' 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-1456' size-in-bits='64' id='type-id-1457'/>
-    <pointer-type-def type-id='type-id-1458' 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-1462' size-in-bits='64' id='type-id-1463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1464' size-in-bits='64' id='type-id-1465'/>
-    <pointer-type-def type-id='type-id-1464' size-in-bits='64' id='type-id-1466'/>
-    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1467'/>
-    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-1469'/>
-    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-1470'/>
-    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
-    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1473'/>
-    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1188'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1474'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1475'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1364'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1365'/>
     <namespace-decl name='std'>
-      <class-decl name='basic_ofstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default' id='type-id-1186'>
+      <class-decl name='basic_ofstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default' id='type-id-1100'>
         <member-function access='public'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
+            <parameter type-id='type-id-1101' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE5closeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='839' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1101' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
+            <parameter type-id='type-id-1101' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-1476'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1366'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1101' 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_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1187' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1101' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1401' visibility='default' is-declaration-only='yes' id='type-id-1477'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1409' visibility='default' is-declaration-only='yes' id='type-id-1478'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1446' visibility='default' is-declaration-only='yes' id='type-id-1479'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1454' visibility='default' is-declaration-only='yes' id='type-id-1480'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1462' visibility='default' is-declaration-only='yes' id='type-id-1481'/>
-      <class-decl name='reverse_iterator' naming-typedef-id='type-id-1482' visibility='default' is-declaration-only='yes' id='type-id-1483'/>
-      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-1484'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1485'>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1310' visibility='default' is-declaration-only='yes' id='type-id-1367'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1312' visibility='default' is-declaration-only='yes' id='type-id-1368'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1314' visibility='default' is-declaration-only='yes' id='type-id-1369'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1316' visibility='default' is-declaration-only='yes' id='type-id-1370'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1318' visibility='default' is-declaration-only='yes' id='type-id-1371'/>
+      <class-decl name='reverse_iterator' naming-typedef-id='type-id-1372' visibility='default' is-declaration-only='yes' id='type-id-1373'/>
+      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-1374'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1375'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1486'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1376'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1328'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1166'>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-1204' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-1487'/>
+          <typedef-decl name='iterator' type-id='type-id-1105' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-1377'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-1483' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='235' column='1' id='type-id-1482'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-1373' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='235' column='1' id='type-id-1372'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;boost::filesystem::path&gt;' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE12emplace_backIJS2_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <parameter type-id='type-id-1236'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <parameter type-id='type-id-1113'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <return type-id='type-id-1487'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <return type-id='type-id-1377'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <return type-id='type-id-1487'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <return type-id='type-id-1377'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rbegin' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE6rbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='583' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <return type-id='type-id-1482'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <return type-id='type-id-1372'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5boost10filesystem4pathESaIS2_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1330' is-artificial='yes'/>
+            <parameter type-id='type-id-1287' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIN5boost10filesystem4pathESaIS2_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1330' is-artificial='yes'/>
+            <parameter type-id='type-id-1287' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -9871,170 +9766,170 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;boost::filesystem::path&gt;' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_'>
-            <parameter type-id='type-id-1404' is-artificial='yes'/>
-            <parameter type-id='type-id-1236'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1167' is-artificial='yes'/>
+            <parameter type-id='type-id-1113'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1411'>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1170'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1171' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
-            <parameter type-id='type-id-858'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1171' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1418'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1177'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCFileManager *, std::default_delete&lt;mongo::FTDCFileManager&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo15FTDCFileManagerESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1413'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1178' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1334'>
+      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1257'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1488'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1378'>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <return type-id='type-id-942'/>
+            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <return type-id='type-id-864'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1279' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <return type-id='type-id-945'/>
+            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <return type-id='type-id-867'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__34' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1440'>
+      <class-decl name='__anonymous_struct__34' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1212'>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIcSaIcEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIcSaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1213' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__35' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1442'>
+      <class-decl name='__anonymous_struct__35' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1214'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__39' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1452'>
+      <class-decl name='__anonymous_struct__39' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1219'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIhSaIhEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1220' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIhSaIhEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1220' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__42' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1460'>
+      <class-decl name='__anonymous_struct__42' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1227'>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorImSaImEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1228' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorImSaImEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1228' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__45' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1489'/>
-      <class-decl name='__anonymous_struct__47' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1464'>
+      <class-decl name='__anonymous_struct__45' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1379'/>
+      <class-decl name='__anonymous_struct__47' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1236'>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='1004' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1466' is-artificial='yes'/>
-            <return type-id='type-id-1465'/>
+            <parameter type-id='type-id-1237' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1340'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1160'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-1202' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-1490'/>
+          <typedef-decl name='const_iterator' type-id='type-id-1103' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-1380'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE12emplace_backIJS6_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <return type-id='type-id-1490'/>
+            <parameter type-id='type-id-1282' is-artificial='yes'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1282' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <return type-id='type-id-1490'/>
+            <parameter type-id='type-id-1282' is-artificial='yes'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1282' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1282' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -10042,861 +9937,861 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE19_M_emplace_back_auxIJS6_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE19_M_emplace_back_auxIJS6_EEEvDpOT_'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1161' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1471'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1162'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCBSONUtil::FTDCType &amp;, mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2IJRS2_S3_RS4_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1473' is-artificial='yes'/>
-            <parameter type-id='type-id-1183'/>
-            <parameter type-id='type-id-1355'/>
-            <parameter type-id='type-id-1359'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-1102'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1473' is-artificial='yes'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1491'>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1392'>
+      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1338'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::BSONObj&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo7BSONObjELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1393' is-artificial='yes'/>
-            <parameter type-id='type-id-1355'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1339' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1394'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1340'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo7BSONObjENS0_6Date_tEEEC2IS1_JRS2_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1396' is-artificial='yes'/>
-            <parameter type-id='type-id-1355'/>
-            <parameter type-id='type-id-1359'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo7BSONObjENS0_6Date_tEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1396' is-artificial='yes'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1397'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1326'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1399'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1336'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1400' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1337' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1493' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1492'/>
+          <typedef-decl name='pointer' type-id='type-id-1383' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1382'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1398' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1327' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE13_M_deallocateEPS6_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1398' is-artificial='yes'/>
-            <parameter type-id='type-id-1492'/>
+            <parameter type-id='type-id-1327' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1398' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1327' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1398' is-artificial='yes'/>
+            <parameter type-id='type-id-1327' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1492'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1494'>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1384'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1477' 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-1401'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1367' 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-1310'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1472' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1495'/>
+          <typedef-decl name='pointer' type-id='type-id-1163' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1385'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEE10deallocateERS7_PS6_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-1402'/>
-            <parameter type-id='type-id-1495'/>
+            <parameter type-id='type-id-1311'/>
+            <parameter type-id='type-id-1385'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt;, std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEE9constructIS6_JS6_EEEvRS7_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-1402'/>
-            <parameter type-id='type-id-1472'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1311'/>
+            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEE8allocateERS7_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-1402'/>
+            <parameter type-id='type-id-1311'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-1495'/>
+            <return type-id='type-id-1385'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1405'>
+      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1328'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1407'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1334'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIN5boost10filesystem4pathESaIS2_EE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1408' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1335' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1497' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1496'/>
+          <typedef-decl name='pointer' type-id='type-id-1387' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1386'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5boost10filesystem4pathESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5boost10filesystem4pathESaIS2_EE13_M_deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <parameter type-id='type-id-1496'/>
+            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1386'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5boost10filesystem4pathESaIS2_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1406' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5boost10filesystem4pathESaIS2_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1406' is-artificial='yes'/>
+            <parameter type-id='type-id-1329' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1496'/>
+            <return type-id='type-id-1386'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1498'>
+      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1388'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1478' 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-1409'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1368' 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-1312'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1238' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1499'/>
+          <typedef-decl name='pointer' type-id='type-id-1115' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1389'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5boost10filesystem4pathEEE10deallocateERS3_PS2_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-1410'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1313'/>
+            <parameter type-id='type-id-1389'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;boost::filesystem::path, boost::filesystem::path&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5boost10filesystem4pathEEE9constructIS2_JS2_EEEvRS3_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-1410'/>
-            <parameter type-id='type-id-1238'/>
-            <parameter type-id='type-id-1236'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1313'/>
+            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1113'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5boost10filesystem4pathEEE8allocateERS3_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-1410'/>
+            <parameter type-id='type-id-1313'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-1499'/>
+            <return type-id='type-id-1389'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1331'>
+      <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1292'>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo15FTDCFileManagerEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1333' is-artificial='yes'/>
-            <parameter type-id='type-id-1346'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1304' is-artificial='yes'/>
+            <parameter type-id='type-id-1172'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1414'>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1330'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCFileManager *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo15FTDCFileManagerELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-1347'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-235'/>
-      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1416'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-232'/>
+      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1332'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCFileManager *, std::default_delete&lt;mongo::FTDCFileManager&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo15FTDCFileManagerESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
-            <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1413'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1333' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1500'>
+      <class-decl name='__anonymous_struct__22' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1390'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-201' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-1501'/>
+          <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-1391'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1502'>
+      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1392'>
       </class-decl>
-      <class-decl name='__anonymous_struct__25' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1420'>
+      <class-decl name='__anonymous_struct__25' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1342'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCBSONUtil::FTDCType &amp;, mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2IRS2_JS3_RS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-1183'/>
-            <parameter type-id='type-id-1355'/>
-            <parameter type-id='type-id-1359'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1102'/>
+            <parameter type-id='type-id-116'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-877'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__26' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1422'>
+      <class-decl name='__anonymous_struct__26' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1393'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ERKN5mongo7BSONObjELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423'/>
-            <return type-id='type-id-306'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__27' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1424'>
+      <class-decl name='__anonymous_struct__27' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1394'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJRKN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425'/>
-            <return type-id='type-id-306'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__28' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1426'>
+      <class-decl name='__anonymous_struct__28' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1344'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
-            <parameter type-id='type-id-1359'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__29' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1428'>
+      <class-decl name='__anonymous_struct__29' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1346'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo6Date_tEEEC2EOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-885'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-377'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo6Date_tEEEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1359'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-236'/>
-      <class-decl name='__anonymous_struct__30' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1430'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-233'/>
+      <class-decl name='__anonymous_struct__30' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1348'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
-            <parameter type-id='type-id-1183'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1102'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__31' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1432'>
+      <class-decl name='__anonymous_struct__31' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1395'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EN5mongo7BSONObjELb0EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433'/>
-            <return type-id='type-id-1354'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__32' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1434'>
+      <class-decl name='__anonymous_struct__32' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1396'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435'/>
-            <return type-id='type-id-1354'/>
+            <parameter type-id='type-id-565'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__33' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1436'>
+      <class-decl name='__anonymous_struct__33' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1352'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1438'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1350'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIcSaIcEE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1439' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1351' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIcSaIcEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1437' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIcSaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1437' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIcSaIcEE13_M_deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1437' is-artificial='yes'/>
-            <parameter type-id='type-id-219'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-216'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__36' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1444'>
+      <class-decl name='__anonymous_struct__36' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1354'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1504' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1503'/>
+          <typedef-decl name='pointer' type-id='type-id-1398' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1397'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1445' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1445' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-1397'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__37' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1505'>
+      <class-decl name='__anonymous_struct__37' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1399'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1479' 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-1446'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1369' 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-1314'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1357' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1506'/>
+          <typedef-decl name='pointer' type-id='type-id-1216' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1400'/>
         </member-type>
         <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-1447'/>
-            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1315'/>
+            <parameter type-id='type-id-1400'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__38' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1448'>
+      <class-decl name='__anonymous_struct__38' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1356'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1450'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1358'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIhSaIhEE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1451' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1359' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIhSaIhEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIhSaIhEE13_M_deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <parameter type-id='type-id-201'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIhSaIhEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1507'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1401'>
         <member-type access='public'>
-          <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='235' column='1' id='type-id-1176'/>
+          <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='235' column='1' id='type-id-1091'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1178'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1098'/>
+            <parameter type-id='type-id-1093'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1185'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1099'/>
+            <parameter type-id='type-id-1094'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1185'/>
+            <return type-id='type-id-1099'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIcE6lengthEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1094'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__40' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1508'>
+      <class-decl name='__anonymous_struct__40' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1402'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1480' 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-1454'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1370' 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-1316'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIhEE10deallocateERS0_Phm' 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-1455'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-1317'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__41' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1456'>
+      <class-decl name='__anonymous_struct__41' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1362'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1458'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1360'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseImSaImEE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1459' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1361' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseImSaImEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseImSaImEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseImSaImEE13_M_deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-650'/>
+            <parameter type-id='type-id-1363' is-artificial='yes'/>
+            <parameter type-id='type-id-605'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__43' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1509'>
+      <class-decl name='__anonymous_struct__43' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1403'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1481' 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-1462'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1371' 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-1318'/>
         </member-type>
         <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-1463'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-1319'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__44' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1510'>
+      <class-decl name='__anonymous_struct__44' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1404'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;boost::filesystem::path *&gt;, boost::filesystem::path *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5boost10filesystem4pathEES6_EET0_T_S9_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1489'/>
-            <parameter type-id='type-id-1489'/>
-            <parameter type-id='type-id-1238'/>
-            <return type-id='type-id-1238'/>
+            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1379'/>
+            <parameter type-id='type-id-1115'/>
+            <return type-id='type-id-1115'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; *&gt;, std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS4_7BSONObjENS4_6Date_tEEEESA_EET0_T_SD_SC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1464'/>
-            <parameter type-id='type-id-1464'/>
-            <parameter type-id='type-id-1472'/>
-            <return type-id='type-id-1472'/>
+            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1163'/>
+            <return type-id='type-id-1163'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__46' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1511'>
+      <class-decl name='__anonymous_struct__46' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1405'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_move_b&lt;boost::filesystem::path *, boost::filesystem::path *&gt;' mangled-name='_ZNSt20__copy_move_backwardILb1ELb0ESt26random_access_iterator_tagE13__copy_move_bIPN5boost10filesystem4pathES6_EET0_T_S8_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='560' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1238'/>
-            <parameter type-id='type-id-1238'/>
-            <parameter type-id='type-id-1238'/>
-            <return type-id='type-id-1238'/>
+            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1115'/>
+            <return type-id='type-id-1115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1337'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1296'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1467' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1339' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1306' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1468'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1324'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1469' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1325' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1512'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1406'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS3_7BSONObjENS3_6Date_tEEEEEvT_SA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1472'/>
-            <parameter type-id='type-id-1472'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-1163'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;boost::filesystem::path *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5boost10filesystem4pathEEEvT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1238'/>
-            <parameter type-id='type-id-1238'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::BSONObj *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo7BSONObjEEEvT_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1357'/>
-            <parameter type-id='type-id-1357'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1216'/>
+            <parameter type-id='type-id-1216'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='__move_median_to_first&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt22__move_median_to_firstIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_SC_SC_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__move_median_to_firstIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_SC_SC_T0_'>
-        <parameter type-id='type-id-1204' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
-        <parameter type-id='type-id-1204' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
-        <parameter type-id='type-id-1204' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
-        <parameter type-id='type-id-1204' name='__c' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
-        <parameter type-id='type-id-1261' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
-        <return type-id='type-id-196'/>
+        <parameter type-id='type-id-1105' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
+        <parameter type-id='type-id-1105' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
+        <parameter type-id='type-id-1105' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
+        <parameter type-id='type-id-1105' name='__c' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
+        <parameter type-id='type-id-1294' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <function-decl name='__unguarded_linear_insert&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Val_less_iter&gt;' mangled-name='_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops14_Val_less_iterEEvT_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops14_Val_less_iterEEvT_T0_'>
-        <parameter type-id='type-id-1204' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1816' column='1'/>
-        <parameter type-id='type-id-1264' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1817' column='1'/>
-        <return type-id='type-id-196'/>
+        <parameter type-id='type-id-1105' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1816' column='1'/>
+        <parameter type-id='type-id-1300' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1817' column='1'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <function-decl name='__insertion_sort&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_'>
-        <parameter type-id='type-id-1204' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1835' column='1'/>
-        <parameter type-id='type-id-1204' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1836' column='1'/>
-        <parameter type-id='type-id-1261' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1836' column='1'/>
-        <return type-id='type-id-196'/>
+        <parameter type-id='type-id-1105' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1835' column='1'/>
+        <parameter type-id='type-id-1105' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1836' column='1'/>
+        <parameter type-id='type-id-1294' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1836' column='1'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <function-decl name='__introsort_loop&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, long, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElNS0_5__ops15_Iter_less_iterEEvT_SC_T0_T1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElNS0_5__ops15_Iter_less_iterEEvT_SC_T0_T1_'>
-        <parameter type-id='type-id-1204' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1935' column='1'/>
-        <parameter type-id='type-id-1204' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1936' column='1'/>
+        <parameter type-id='type-id-1105' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1935' column='1'/>
+        <parameter type-id='type-id-1105' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1936' column='1'/>
         <parameter type-id='type-id-18' name='__depth_limit' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1937' column='1'/>
-        <parameter type-id='type-id-1261' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1937' column='1'/>
-        <return type-id='type-id-196'/>
+        <parameter type-id='type-id-1294' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1937' column='1'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <function-decl name='__adjust_heap&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, long, boost::filesystem::path, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElS4_NS0_5__ops15_Iter_less_iterEEvT_T0_SD_T1_T2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElS4_NS0_5__ops15_Iter_less_iterEEvT_T0_SD_T1_T2_'>
-        <parameter type-id='type-id-1204' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1'/>
+        <parameter type-id='type-id-1105' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1'/>
         <parameter type-id='type-id-18' name='__holeIndex' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1'/>
         <parameter type-id='type-id-18' name='__len' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
-        <parameter type-id='type-id-1235' name='__value' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
-        <parameter type-id='type-id-1261' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
-        <return type-id='type-id-196'/>
+        <parameter type-id='type-id-1112' name='__value' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
+        <parameter type-id='type-id-1294' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <function-decl name='__make_heap&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_'>
-        <parameter type-id='type-id-1204' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
-        <parameter type-id='type-id-1204' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
-        <parameter type-id='type-id-1261' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='318' column='1'/>
-        <return type-id='type-id-196'/>
+        <parameter type-id='type-id-1105' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
+        <parameter type-id='type-id-1105' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
+        <parameter type-id='type-id-1294' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='318' column='1'/>
+        <return type-id='type-id-193'/>
       </function-decl>
       <namespace-decl name='__cxx11'>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='const_iterator' naming-typedef-id='type-id-1490' visibility='default' is-declaration-only='yes' id='type-id-1202'>
+      <class-decl name='const_iterator' naming-typedef-id='type-id-1380' visibility='default' is-declaration-only='yes' id='type-id-1103'>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS2_7BSONObjENS2_6Date_tEEESt6vectorIS7_SaIS7_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1203' is-artificial='yes'/>
-            <return type-id='type-id-990'/>
+            <parameter type-id='type-id-1104' is-artificial='yes'/>
+            <return type-id='type-id-908'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='iterator' naming-typedef-id='type-id-1487' visibility='default' is-declaration-only='yes' id='type-id-1204'>
+      <class-decl name='iterator' naming-typedef-id='type-id-1377' visibility='default' is-declaration-only='yes' id='type-id-1105'>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-1501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='732' column='1' id='type-id-1513'/>
+          <typedef-decl name='difference_type' type-id='type-id-1391' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='732' column='1' id='type-id-1407'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1205' is-artificial='yes'/>
-            <parameter type-id='type-id-1240'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1106' is-artificial='yes'/>
+            <parameter type-id='type-id-1117'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEplEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1271' is-artificial='yes'/>
-            <parameter type-id='type-id-1513'/>
-            <return type-id='type-id-1204'/>
+            <parameter type-id='type-id-1241' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
+            <return type-id='type-id-1105'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1205' is-artificial='yes'/>
-            <return type-id='type-id-279'/>
+            <parameter type-id='type-id-1106' is-artificial='yes'/>
+            <return type-id='type-id-270'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEmiEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1271' is-artificial='yes'/>
-            <parameter type-id='type-id-1513'/>
-            <return type-id='type-id-1204'/>
+            <parameter type-id='type-id-1241' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
+            <return type-id='type-id-1105'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEmmEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1205' is-artificial='yes'/>
-            <return type-id='type-id-279'/>
+            <parameter type-id='type-id-1106' is-artificial='yes'/>
+            <return type-id='type-id-270'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1190'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1229'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE10deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1191' is-artificial='yes'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-1230' is-artificial='yes'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1192'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1120'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1193' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-1121' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1194'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1164'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1472' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1514'/>
+          <typedef-decl name='pointer' type-id='type-id-1163' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1408'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS2_7BSONObjENS2_6Date_tEEEE10deallocateEPS7_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1195' is-artificial='yes'/>
-            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-1165' is-artificial='yes'/>
+            <parameter type-id='type-id-1408'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt;, std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS2_7BSONObjENS2_6Date_tEEEE9constructIS7_JS7_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1195' is-artificial='yes'/>
-            <parameter type-id='type-id-1472'/>
-            <parameter type-id='type-id-641'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1165' is-artificial='yes'/>
+            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS2_7BSONObjENS2_6Date_tEEEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1195' is-artificial='yes'/>
+            <parameter type-id='type-id-1165' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-1514'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-1408'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1196'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1168'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1238' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1515'/>
+          <typedef-decl name='pointer' type-id='type-id-1115' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1409'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10filesystem4pathEE10deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
-            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-1409'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;boost::filesystem::path, boost::filesystem::path&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10filesystem4pathEE9constructIS3_JS3_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
-            <parameter type-id='type-id-1238'/>
-            <parameter type-id='type-id-1236'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-1115'/>
+            <parameter type-id='type-id-1113'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10filesystem4pathEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1197' is-artificial='yes'/>
+            <parameter type-id='type-id-1169' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-1515'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-1409'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1198'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1217'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1357' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1516'/>
+          <typedef-decl name='pointer' type-id='type-id-1216' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1410'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE10deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1199' is-artificial='yes'/>
-            <parameter type-id='type-id-1516'/>
+            <parameter type-id='type-id-1218' is-artificial='yes'/>
+            <parameter type-id='type-id-1410'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1200'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1221'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIhE10deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1201' is-artificial='yes'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-1222' is-artificial='yes'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1517'>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1411'>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1518'>
+      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1412'>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1519'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1413'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1495' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1493'/>
+          <typedef-decl name='pointer' type-id='type-id-1385' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1383'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1520'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1414'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1499' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1497'/>
+          <typedef-decl name='pointer' type-id='type-id-1389' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1387'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1521'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1415'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1506' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1504'/>
+          <typedef-decl name='pointer' type-id='type-id-1400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1398'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1522'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1416'>
       </class-decl>
       <namespace-decl name='__ops'>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1261'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1294'>
           <member-function access='public'>
             <function-decl name='operator()&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt; &gt;' mangled-name='_ZNK9__gnu_cxx5__ops15_Iter_less_iterclINS_17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS6_SaIS6_EEEESB_EEbT_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1263' is-artificial='yes'/>
-              <parameter type-id='type-id-1204'/>
-              <parameter type-id='type-id-1204'/>
+              <parameter type-id='type-id-1305' is-artificial='yes'/>
+              <parameter type-id='type-id-1105'/>
+              <parameter type-id='type-id-1105'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1264'>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1300'>
           <member-function access='public'>
             <function-decl name='operator()&lt;boost::filesystem::path, __gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt; &gt;' mangled-name='_ZNK9__gnu_cxx5__ops14_Val_less_iterclIN5boost10filesystem4pathENS_17__normal_iteratorIPS5_St6vectorIS5_SaIS5_EEEEEEbRT_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1266' is-artificial='yes'/>
-              <parameter type-id='type-id-722'/>
-              <parameter type-id='type-id-1204'/>
+              <parameter type-id='type-id-1308' is-artificial='yes'/>
+              <parameter type-id='type-id-115'/>
+              <parameter type-id='type-id-1105'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1267'>
+        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1298'>
           <member-function access='public'>
             <function-decl name='operator()&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, boost::filesystem::path&gt;' mangled-name='_ZNK9__gnu_cxx5__ops14_Iter_less_valclINS_17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS6_SaIS6_EEEES6_EEbT_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1269' is-artificial='yes'/>
-              <parameter type-id='type-id-1204'/>
-              <parameter type-id='type-id-722'/>
+              <parameter type-id='type-id-1307' is-artificial='yes'/>
+              <parameter type-id='type-id-1105'/>
+              <parameter type-id='type-id-115'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
@@ -10905,424 +10800,424 @@
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1326'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1146'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [2]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA2_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1391' is-artificial='yes'/>
-              <parameter type-id='type-id-1175'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1147' is-artificial='yes'/>
+              <parameter type-id='type-id-1090'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;std::__cxx11::basic_string&lt;char&gt; &gt;' mangled-name='_ZN10mongoutils3str6streamlsINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1391' is-artificial='yes'/>
-              <parameter type-id='type-id-232'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1147' is-artificial='yes'/>
+              <parameter type-id='type-id-229'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [25]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA25_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1391' is-artificial='yes'/>
+              <parameter type-id='type-id-1147' is-artificial='yes'/>
               <parameter type-id='type-id-66'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='Client' size-in-bits='960' visibility='default' id='type-id-1181'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1344'>
+      <class-decl name='Client' size-in-bits='960' visibility='default' id='type-id-1096'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1122'>
         <member-function access='private'>
           <function-decl name='FTDCFileManager' mangled-name='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE' filepath='src/mongo/db/ftdc/file_manager.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <parameter type-id='type-id-1294'/>
-            <parameter type-id='type-id-733'/>
-            <parameter type-id='type-id-1365'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <parameter type-id='type-id-1303'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1125'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='close' mangled-name='_ZN5mongo15FTDCFileManager5closeEv' filepath='src/mongo/db/ftdc/file_manager.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager5closeEv'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <return type-id='type-id-1310'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <return type-id='type-id-1128'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~FTDCFileManager' mangled-name='_ZN5mongo15FTDCFileManagerD2Ev' filepath='src/mongo/db/ftdc/file_manager.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManagerD2Ev'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='create' mangled-name='_ZN5mongo15FTDCFileManager6createEPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionEPNS_6ClientE' filepath='src/mongo/db/ftdc/file_manager.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager6createEPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionEPNS_6ClientE'>
-            <parameter type-id='type-id-1294'/>
-            <parameter type-id='type-id-733'/>
-            <parameter type-id='type-id-1365'/>
-            <parameter type-id='type-id-1182'/>
-            <return type-id='type-id-1349'/>
+            <parameter type-id='type-id-1303'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1125'/>
+            <parameter type-id='type-id-1097'/>
+            <return type-id='type-id-1150'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='scanDirectory' mangled-name='_ZN5mongo15FTDCFileManager13scanDirectoryEv' filepath='src/mongo/db/ftdc/file_manager.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager13scanDirectoryEv'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <return type-id='type-id-1328'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <return type-id='type-id-1166'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='recoverInterimFile' mangled-name='_ZN5mongo15FTDCFileManager18recoverInterimFileEv' filepath='src/mongo/db/ftdc/file_manager.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager18recoverInterimFileEv'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <return type-id='type-id-1340'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <return type-id='type-id-1160'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='generateArchiveFileName' mangled-name='_ZN5mongo15FTDCFileManager23generateArchiveFileNameERKN5boost10filesystem4pathENS_10StringDataE' filepath='src/mongo/db/ftdc/file_manager.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager23generateArchiveFileNameERKN5boost10filesystem4pathENS_10StringDataE'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
-            <parameter type-id='type-id-1295'/>
-            <return type-id='type-id-1298'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1148'/>
+            <return type-id='type-id-1156'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='openArchiveFile' mangled-name='_ZN5mongo15FTDCFileManager15openArchiveFileEPNS_6ClientERKN5boost10filesystem4pathERKSt6vectorISt5tupleIJNS_12FTDCBSONUtil8FTDCTypeENS_7BSONObjENS_6Date_tEEESaISE_EE' filepath='src/mongo/db/ftdc/file_manager.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager15openArchiveFileEPNS_6ClientERKN5boost10filesystem4pathERKSt6vectorISt5tupleIJNS_12FTDCBSONUtil8FTDCTypeENS_7BSONObjENS_6Date_tEEESaISE_EE'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <parameter type-id='type-id-1182'/>
-            <parameter type-id='type-id-733'/>
-            <parameter type-id='type-id-1342'/>
-            <return type-id='type-id-1310'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <parameter type-id='type-id-1097'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-1128'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='trimDirectory' mangled-name='_ZN5mongo15FTDCFileManager13trimDirectoryERSt6vectorIN5boost10filesystem4pathESaIS4_EE' filepath='src/mongo/db/ftdc/file_manager.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager13trimDirectoryERSt6vectorIN5boost10filesystem4pathESaIS4_EE'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <parameter type-id='type-id-1403'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rotate' mangled-name='_ZN5mongo15FTDCFileManager6rotateEPNS_6ClientE' filepath='src/mongo/db/ftdc/file_manager.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager6rotateEPNS_6ClientE'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <parameter type-id='type-id-1182'/>
-            <return type-id='type-id-1310'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <parameter type-id='type-id-1097'/>
+            <return type-id='type-id-1128'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='writeSampleAndRotateIfNeeded' mangled-name='_ZN5mongo15FTDCFileManager28writeSampleAndRotateIfNeededEPNS_6ClientERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/file_manager.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager28writeSampleAndRotateIfNeededEPNS_6ClientERKNS_7BSONObjENS_6Date_tE'>
-            <parameter type-id='type-id-1345' is-artificial='yes'/>
-            <parameter type-id='type-id-1182'/>
-            <parameter type-id='type-id-306'/>
-            <parameter type-id='type-id-1358'/>
-            <return type-id='type-id-1310'/>
+            <parameter type-id='type-id-1123' is-artificial='yes'/>
+            <parameter type-id='type-id-1097'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1417'/>
+            <return type-id='type-id-1128'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1295'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1148'>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1297' is-artificial='yes'/>
+            <parameter type-id='type-id-1273' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
-            <parameter type-id='type-id-259'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1149' is-artificial='yes'/>
+            <parameter type-id='type-id-256'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='toString' mangled-name='_ZNK5mongo10StringData8toStringB5cxx11Ev' filepath='src/mongo/base/string_data.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1297' is-artificial='yes'/>
-            <return type-id='type-id-257'/>
+            <parameter type-id='type-id-1273' is-artificial='yes'/>
+            <return type-id='type-id-254'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='compare' mangled-name='_ZNK5mongo10StringData7compareES0_' filepath='src/mongo/base/string_data.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1297' is-artificial='yes'/>
-            <parameter type-id='type-id-1295'/>
+            <parameter type-id='type-id-1273' is-artificial='yes'/>
+            <parameter type-id='type-id-1148'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1149' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1349'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1150'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt10unique_ptrINS_15FTDCFileManagerESt14default_deleteIS2_EEEC2ENS_10ErrorCodes5ErrorERKN10mongoutils3str6streamE' filepath='src/mongo/base/status_with.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <parameter type-id='type-id-148'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt10unique_ptrINS_15FTDCFileManagerESt14default_deleteIS2_EEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1310'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1128'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt10unique_ptrINS_15FTDCFileManagerESt14default_deleteIS2_EEEC2ES5_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1411'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1151' is-artificial='yes'/>
+            <parameter type-id='type-id-1170'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1523'>
+      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1418'>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1298'>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1156'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithIN5boost10filesystem4pathEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1300' is-artificial='yes'/>
+            <parameter type-id='type-id-1275' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIN5boost10filesystem4pathEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
-            <return type-id='type-id-722'/>
+            <parameter type-id='type-id-1157' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIN5boost10filesystem4pathEEC2ENS_10ErrorCodes5ErrorEPKc' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-1157' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIN5boost10filesystem4pathEEC2ES3_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
-            <parameter type-id='type-id-1235'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1157' is-artificial='yes'/>
+            <parameter type-id='type-id-1112'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1352'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1210'>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1211' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1301'>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1195'>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1355'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1196' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1303' is-artificial='yes'/>
+            <parameter type-id='type-id-1283' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1303' is-artificial='yes'/>
+            <parameter type-id='type-id-1283' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isEmpty' mangled-name='_ZNK5mongo7BSONObj7isEmptyEv' filepath='src/mongo/bson/bsonobj.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1303' is-artificial='yes'/>
+            <parameter type-id='type-id-1283' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1196' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1358'/>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1304'>
+      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1417'/>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1200'>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIbE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <return type-id='type-id-449'/>
+            <parameter type-id='type-id-1201' is-artificial='yes'/>
+            <return type-id='type-id-436'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithIbE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1306' is-artificial='yes'/>
+            <parameter type-id='type-id-1281' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1362'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1225'>
         <member-function access='public'>
           <function-decl name='BlockCompressor' mangled-name='_ZN5mongo15BlockCompressorC2Ev' filepath='src/mongo/db/ftdc/block_compressor.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1524'/>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1364'/>
-      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1366'>
+      <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1419'/>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1124'/>
+      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1223'>
         <member-function access='public'>
           <function-decl name='FTDCFileReader' mangled-name='_ZN5mongo14FTDCFileReaderC2Ev' filepath='src/mongo/db/ftdc/file_reader.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReaderC2Ev'>
-            <parameter type-id='type-id-1367' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1224' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1368'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1231'>
         <member-function access='public'>
           <function-decl name='FTDCCompressor' mangled-name='_ZN5mongo14FTDCCompressorC2EPKNS_10FTDCConfigE' filepath='src/mongo/db/ftdc/compressor.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressorC2EPKNS_10FTDCConfigE'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
-            <parameter type-id='type-id-1294'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1232' is-artificial='yes'/>
+            <parameter type-id='type-id-1303'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1307'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1126'>
         <member-function access='public'>
           <function-decl name='FTDCFileWriter' mangled-name='_ZN5mongo14FTDCFileWriterC2EPKNS_10FTDCConfigE' filepath='src/mongo/db/ftdc/file_writer.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriterC2EPKNS_10FTDCConfigE'>
-            <parameter type-id='type-id-1370' is-artificial='yes'/>
-            <parameter type-id='type-id-1294'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1127' is-artificial='yes'/>
+            <parameter type-id='type-id-1303'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getSize' mangled-name='_ZNK5mongo14FTDCFileWriter7getSizeEv' filepath='src/mongo/db/ftdc/file_writer.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-1284' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1310'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1128'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1372'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1321'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1129' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1373'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1322'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1313' is-artificial='yes'/>
+            <parameter type-id='type-id-1274' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </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='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1373'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1322'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <parameter type-id='type-id-1312'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1129' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1129' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1129' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1310'/>
+            <return type-id='type-id-1128'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo6StatusaSEOS0_' filepath='src/mongo/base/status.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <parameter type-id='type-id-366'/>
-            <return type-id='type-id-365'/>
+            <parameter type-id='type-id-1129' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1314'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1130'>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1131' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1316' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1285' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1317'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1136'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1320'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1144'>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1376' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-1145' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1376' is-artificial='yes'/>
+                <parameter type-id='type-id-1145' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1322' is-artificial='yes'/>
+                <parameter type-id='type-id-1286' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -11330,1179 +11225,1174 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1375' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1137' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1317'/>
+            <return type-id='type-id-1136'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1317'/>
+            <return type-id='type-id-1136'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1319' is-artificial='yes'/>
+            <parameter type-id='type-id-1271' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1375' is-artificial='yes'/>
+            <parameter type-id='type-id-1137' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1323'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1138'>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1325' is-artificial='yes'/>
+            <parameter type-id='type-id-1272' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1139' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1379'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1140'>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1380' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1380' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1380' is-artificial='yes'/>
+            <parameter type-id='type-id-1141' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1381'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1142'>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1382' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1143' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1382' is-artificial='yes'/>
-            <parameter type-id='type-id-1295'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1143' is-artificial='yes'/>
+            <parameter type-id='type-id-1148'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='439' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1382' is-artificial='yes'/>
-            <parameter type-id='type-id-1295'/>
-            <return type-id='type-id-594'/>
+            <parameter type-id='type-id-1143' is-artificial='yes'/>
+            <parameter type-id='type-id-1148'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1382' is-artificial='yes'/>
+            <parameter type-id='type-id-1143' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-594'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1292'/>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1290'/>
       <namespace-decl name='FTDCBSONUtil'>
       </namespace-decl>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1383'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1191'>
           <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'>
-              <parameter type-id='type-id-1384' is-artificial='yes'/>
-              <return type-id='type-id-1386'/>
+              <parameter type-id='type-id-1192' is-artificial='yes'/>
+              <return type-id='type-id-1190'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1385'/>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1387'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1189'/>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1193'>
           <member-function access='public'>
             <function-decl name='stream' mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv' filepath='src/mongo/logger/logstream_builder.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1388' is-artificial='yes'/>
-              <return type-id='type-id-707'/>
+              <parameter type-id='type-id-1194' is-artificial='yes'/>
+              <return type-id='type-id-663'/>
             </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='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1388' is-artificial='yes'/>
+              <parameter type-id='type-id-1194' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-832'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/logger/logstream_builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1388' is-artificial='yes'/>
-              <parameter type-id='type-id-259'/>
-              <return type-id='type-id-832'/>
+              <parameter type-id='type-id-1194' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEm' filepath='src/mongo/logger/logstream_builder.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1388' is-artificial='yes'/>
+              <parameter type-id='type-id-1194' is-artificial='yes'/>
               <parameter type-id='type-id-38'/>
-              <return type-id='type-id-832'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;mongo::Status&gt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_' filepath='src/mongo/logger/logstream_builder.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1388' is-artificial='yes'/>
-              <parameter type-id='type-id-1312'/>
-              <return type-id='type-id-832'/>
+              <parameter type-id='type-id-1194' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1389'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1238'>
           <member-function access='public'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1390' is-artificial='yes'/>
-              <parameter type-id='type-id-241'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1239' is-artificial='yes'/>
+              <parameter type-id='type-id-238'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1206'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1134'>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
-            <parameter type-id='type-id-119'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-119'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </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.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1273' is-artificial='yes'/>
+            <parameter type-id='type-id-1270' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1207' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1135' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1273' is-artificial='yes'/>
+            <parameter type-id='type-id-1270' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1273' is-artificial='yes'/>
-            <return type-id='type-id-1377'/>
+            <parameter type-id='type-id-1270' is-artificial='yes'/>
+            <return type-id='type-id-1235'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1154'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1526' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1525'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1421' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1420'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS3_EEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1209' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS3_EEEC2EOS6_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1209' is-artificial='yes'/>
-            <parameter type-id='type-id-1525'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1155' is-artificial='yes'/>
+            <parameter type-id='type-id-1420'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1210'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1173'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1528' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1527'/>
+          <typedef-decl name='reference_type' type-id='type-id-1423' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1422'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1530' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1529'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1425' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1424'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalINS_10filesystem4pathEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1211' is-artificial='yes'/>
-            <return type-id='type-id-1527'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-1422'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalINS_10filesystem4pathEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1211' is-artificial='yes'/>
-            <return type-id='type-id-1527'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-1422'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalINS_10filesystem4pathEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1211' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalINS_10filesystem4pathEEC2EOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1211' is-artificial='yes'/>
-            <parameter type-id='type-id-1529'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <parameter type-id='type-id-1424'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1212'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'>
         <member-type access='private'>
-          <typedef-decl name='element_type' type-id='type-id-1531' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-1214'/>
+          <typedef-decl name='element_type' type-id='type-id-1426' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-1107'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1275' is-artificial='yes'/>
-            <return type-id='type-id-1215'/>
+            <parameter type-id='type-id-1276' is-artificial='yes'/>
+            <return type-id='type-id-1108'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;boost::filesystem::detail::dir_itr_imp&gt;' mangled-name='_ZN5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEC2IS3_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-1213' is-artificial='yes'/>
-            <parameter type-id='type-id-1234'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1209' is-artificial='yes'/>
+            <parameter type-id='type-id-1111'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1216'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1198'>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIbE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-1199' is-artificial='yes'/>
+            <return type-id='type-id-627'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIbEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-1199' is-artificial='yes'/>
+            <return type-id='type-id-627'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost8optionalIbEaSEOS1_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='940' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1217' is-artificial='yes'/>
-            <parameter type-id='type-id-472'/>
-            <return type-id='type-id-471'/>
+            <parameter type-id='type-id-1199' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='core'>
-        <typedef-decl name='typeinfo' type-id='type-id-1484' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-1532'/>
+        <typedef-decl name='typeinfo' type-id='type-id-1374' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-1427'/>
       </namespace-decl>
       <namespace-decl name='filesystem'>
-        <class-decl name='type' naming-typedef-id='type-id-1533' visibility='default' is-declaration-only='yes' id='type-id-1235'>
+        <class-decl name='type' naming-typedef-id='type-id-1428' visibility='default' is-declaration-only='yes' id='type-id-1112'>
           <member-type access='private'>
-            <typedef-decl name='string_type' type-id='type-id-73' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70' column='1' id='type-id-1172'/>
+            <typedef-decl name='string_type' type-id='type-id-73' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70' column='1' id='type-id-1087'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2EOS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-1236'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-1113'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-1174'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-1089'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator/=' mangled-name='_ZN5boost10filesystem4pathdVERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-1174'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-1089'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator+=' mangled-name='_ZN5boost10filesystem4pathpLERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-1174'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-1089'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='swap' mangled-name='_ZN5boost10filesystem4path4swapERS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-722'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-115'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSEOS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1237' is-artificial='yes'/>
-              <parameter type-id='type-id-1236'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1114' is-artificial='yes'/>
+              <parameter type-id='type-id-1113'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1225'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1181'>
           <member-function access='private'>
             <function-decl name='equal' mangled-name='_ZNK5boost10filesystem18directory_iterator5equalERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='941' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1280' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
+              <parameter type-id='type-id-1277' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZNK5boost10filesystem18directory_iterator11dereferenceEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='933' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1280' is-artificial='yes'/>
-              <return type-id='type-id-1534'/>
+              <parameter type-id='type-id-1277' is-artificial='yes'/>
+              <return type-id='type-id-1429'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='increment' mangled-name='_ZN5boost10filesystem18directory_iterator9incrementEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='939' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1226' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1182' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~directory_iterator' mangled-name='_ZN5boost10filesystem18directory_iteratorD2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='909' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1226' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1182' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='directory_iterator' mangled-name='_ZN5boost10filesystem18directory_iteratorC2ERKNS0_4pathE' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='901' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem18directory_iteratorC2ERKNS0_4pathE'>
-              <parameter type-id='type-id-1226' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1182' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1227'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1204'>
           <member-function access='public'>
             <function-decl name='directory_entry' mangled-name='_ZN5boost10filesystem15directory_entryC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1229' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1205' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='directory_entry' mangled-name='_ZN5boost10filesystem15directory_entryC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='757' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem15directory_entryC2ERKS1_'>
-              <parameter type-id='type-id-1229' is-artificial='yes'/>
-              <parameter type-id='type-id-1282'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1205' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1230'>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1206'>
           <member-function access='public'>
             <function-decl name='file_status' mangled-name='_ZN5boost10filesystem11file_statusC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1231' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1207' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='file_status' mangled-name='_ZN5boost10filesystem11file_statusC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1231' is-artificial='yes'/>
-              <parameter type-id='type-id-1284'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1207' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
         <namespace-decl name='detail'>
-          <class-decl name='type' is-struct='yes' naming-typedef-id='type-id-1531' visibility='default' is-declaration-only='yes' id='type-id-1232'>
+          <class-decl name='type' is-struct='yes' naming-typedef-id='type-id-1426' visibility='default' is-declaration-only='yes' id='type-id-1109'>
             <member-function access='public'>
               <function-decl name='dir_itr_imp' mangled-name='_ZN5boost10filesystem6detail11dir_itr_impC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='860' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1233' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1110' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes'>
               <function-decl name='~dir_itr_imp' mangled-name='_ZN5boost10filesystem6detail11dir_itr_impD2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='866' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1233' is-artificial='yes'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1110' is-artificial='yes'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </namespace-decl>
         <function-decl name='operator/' mangled-name='_ZN5boost10filesystemdvERKNS0_4pathES3_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystemdvERKNS0_4pathES3_'>
-          <parameter type-id='type-id-733' name='lhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
-          <parameter type-id='type-id-733' name='rhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
-          <return type-id='type-id-1235'/>
+          <parameter type-id='type-id-164' name='lhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
+          <parameter type-id='type-id-164' name='rhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
+          <return type-id='type-id-1112'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='iterators'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1535'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1430'>
           <member-function access='private' static='yes'>
             <function-decl name='equal&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_iterator&gt;' mangled-name='_ZN5boost9iterators20iterator_core_access5equalINS_10filesystem18directory_iteratorES4_EEbRKT_RKT0_N4mpl_5bool_ILb1EEE' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-733'/>
-              <parameter type-id='type-id-733'/>
-              <parameter type-id='type-id-1536'/>
+              <parameter type-id='type-id-164'/>
+              <parameter type-id='type-id-164'/>
+              <parameter type-id='type-id-1431'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
             <function-decl name='dereference&lt;boost::filesystem::directory_iterator&gt;' mangled-name='_ZN5boost9iterators20iterator_core_access11dereferenceINS_10filesystem18directory_iteratorEEENT_9referenceERKS5_' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-1534'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-1429'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
             <function-decl name='increment&lt;boost::filesystem::directory_iterator&gt;' mangled-name='_ZN5boost9iterators20iterator_core_access9incrementINS_10filesystem18directory_iteratorEEEvRT_' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-722'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-115'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
         <namespace-decl name='detail'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1241'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1183'>
             <member-type access='private'>
-              <typedef-decl name='reference' type-id='type-id-1228' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='645' column='1' id='type-id-1534'/>
+              <typedef-decl name='reference' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='645' column='1' id='type-id-1429'/>
             </member-type>
             <member-function access='public'>
               <function-decl name='operator*' mangled-name='_ZNK5boost9iterators6detail20iterator_facade_baseINS_10filesystem18directory_iteratorENS3_15directory_entryENS0_25single_pass_traversal_tagERS5_lLb0ELb0EEdeEv' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='653' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1287' is-artificial='yes'/>
-                <return type-id='type-id-1534'/>
+                <parameter type-id='type-id-1278' is-artificial='yes'/>
+                <return type-id='type-id-1429'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='operator++' mangled-name='_ZN5boost9iterators6detail20iterator_facade_baseINS_10filesystem18directory_iteratorENS3_15directory_entryENS0_25single_pass_traversal_tagERS5_lLb0ELb0EEppEv' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='663' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1242' is-artificial='yes'/>
-                <return type-id='type-id-722'/>
+                <parameter type-id='type-id-1184' is-artificial='yes'/>
+                <return type-id='type-id-115'/>
               </function-decl>
             </member-function>
           </class-decl>
-          <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1243'>
+          <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1179'>
             <member-function access='public'>
               <function-decl name='postfix_increment_proxy' mangled-name='_ZN5boost9iterators6detail23postfix_increment_proxyINS_10filesystem18directory_iteratorEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1244' is-artificial='yes'/>
-                <parameter type-id='type-id-733'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-1180' is-artificial='yes'/>
+                <parameter type-id='type-id-164'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </namespace-decl>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1245'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1152'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1537' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1526'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1432' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1421'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1246' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1153' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEE9constructEOS7_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1246' is-artificial='yes'/>
-              <parameter type-id='type-id-1526'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1153' is-artificial='yes'/>
+              <parameter type-id='type-id-1421'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEEC2EOS7_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1246' is-artificial='yes'/>
-              <parameter type-id='type-id-1526'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1153' is-artificial='yes'/>
+              <parameter type-id='type-id-1421'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1247'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1158'>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-1533' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-1249'/>
+            <typedef-decl name='internal_type' type-id='type-id-1428' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-1118'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1538' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1528'/>
+            <typedef-decl name='reference_type' type-id='type-id-1433' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1423'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1539' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1530'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1434' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1425'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <parameter type-id='type-id-1540'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <parameter type-id='type-id-1435'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEE10get_objectEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='726' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <return type-id='type-id-1250'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <return type-id='type-id-1119'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEE8get_implEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='711' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <return type-id='type-id-1528'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <return type-id='type-id-1423'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEEC2EOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <parameter type-id='type-id-1530'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <parameter type-id='type-id-1425'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseINS_10filesystem4pathEE9constructEOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1248' is-artificial='yes'/>
-              <parameter type-id='type-id-1530'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1159' is-artificial='yes'/>
+              <parameter type-id='type-id-1425'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1251'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1175'>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageINS_10filesystem4pathEE7addressEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1252' is-artificial='yes'/>
-              <return type-id='type-id-190'/>
+              <parameter type-id='type-id-1176' is-artificial='yes'/>
+              <return type-id='type-id-187'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1253'>
+        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1202'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1542' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1541'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1437' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1436'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIbE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1289' is-artificial='yes'/>
+              <parameter type-id='type-id-1280' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='assign' mangled-name='_ZN5boost15optional_detail13optional_baseIbE6assignEOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1255' is-artificial='yes'/>
-              <parameter type-id='type-id-1254'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1203' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='assign_value' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12assign_valueEObN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1255' is-artificial='yes'/>
-              <parameter type-id='type-id-1541'/>
-              <parameter type-id='type-id-1540'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1203' is-artificial='yes'/>
+              <parameter type-id='type-id-1436'/>
+              <parameter type-id='type-id-1435'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIbE9constructEOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1255' is-artificial='yes'/>
-              <parameter type-id='type-id-1541'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1203' is-artificial='yes'/>
+              <parameter type-id='type-id-1436'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1255' is-artificial='yes'/>
-              <parameter type-id='type-id-1540'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1203' is-artificial='yes'/>
+              <parameter type-id='type-id-1435'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIbE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1255' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1203' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1255' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1203' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1543'>
+        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1438'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-722' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1538'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1433'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1236' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1539'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1113' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1434'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1544'>
+        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1439'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-858' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1537'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1432'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1545'>
+        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1440'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1171' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1542'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1086' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1437'/>
           </member-type>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='system'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1256'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1132'>
           <member-type access='private'>
-            <typedef-decl name='unspecified_bool_type' type-id='type-id-109' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-1546'/>
+            <typedef-decl name='unspecified_bool_type' type-id='type-id-109' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-1441'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='error_code' mangled-name='_ZN5boost6system10error_codeC2Ev' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1257' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1133' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator void (*)()' mangled-name='_ZNK5boost6system10error_codecvPFvvEEv' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1291' is-artificial='yes'/>
-              <return type-id='type-id-1546'/>
+              <parameter type-id='type-id-1269' is-artificial='yes'/>
+              <return type-id='type-id-1441'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='message' mangled-name='_ZNK5boost6system10error_code7messageB5cxx11Ev' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1291' is-artificial='yes'/>
-              <return type-id='type-id-257'/>
+              <parameter type-id='type-id-1269' is-artificial='yes'/>
+              <return type-id='type-id-254'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='value' mangled-name='_ZNK5boost6system10error_code5valueEv' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1291' is-artificial='yes'/>
+              <parameter type-id='type-id-1269' is-artificial='yes'/>
               <return type-id='type-id-16'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='detail'>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1218'>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1185'>
           <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-1220' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1186' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <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-1220' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1186' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </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-1220' is-artificial='yes'/>
-              <parameter type-id='type-id-1219'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1186' is-artificial='yes'/>
+              <parameter type-id='type-id-115'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='shared_count&lt;boost::filesystem::detail::dir_itr_imp&gt;' mangled-name='_ZN5boost6detail12shared_countC2INS_10filesystem6detail11dir_itr_impEEEPT_' 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' elf-symbol-id='_ZN5boost6detail12shared_countC2INS_10filesystem6detail11dir_itr_impEEEPT_'>
-              <parameter type-id='type-id-1220' is-artificial='yes'/>
-              <parameter type-id='type-id-1234'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1186' is-artificial='yes'/>
+              <parameter type-id='type-id-1111'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1221'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1187'>
           <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-1222' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1188' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </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-1222' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1188' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <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-1222' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1188' 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='~sp_counted_base' mangled-name='_ZN5boost6detail15sp_counted_baseD2Ev' 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' elf-symbol-id='_ZN5boost6detail15sp_counted_baseD2Ev'>
-              <parameter type-id='type-id-1222' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1188' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </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' elf-symbol-id='_ZN5boost6detail15sp_counted_base7destroyEv'>
-              <parameter type-id='type-id-1222' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1188' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1223'>
+        <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1233'>
           <member-function access='public'>
             <function-decl name='sp_counted_impl_p' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEEC2EPS4_' 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-1224' is-artificial='yes'/>
-              <parameter type-id='type-id-1234'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1234' is-artificial='yes'/>
+              <parameter type-id='type-id-1111'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='dispose' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE7disposeEv' 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' elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE7disposeEv'>
-              <parameter type-id='type-id-1224' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1234' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='get_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE11get_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' elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE11get_deleterERKSt9type_info'>
-              <parameter type-id='type-id-1224' is-artificial='yes'/>
-              <parameter type-id='type-id-1278'/>
-              <return type-id='type-id-190'/>
+              <parameter type-id='type-id-1234' is-artificial='yes'/>
+              <parameter type-id='type-id-1244'/>
+              <return type-id='type-id-187'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='get_untyped_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE19get_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' elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE19get_untyped_deleterEv'>
-              <parameter type-id='type-id-1224' is-artificial='yes'/>
-              <return type-id='type-id-190'/>
+              <parameter type-id='type-id-1234' is-artificial='yes'/>
+              <return type-id='type-id-187'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1547'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1442'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-1235' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-1533'/>
+            <typedef-decl name='type' type-id='type-id-1112' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-1428'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1548'>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1443'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-1232' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-1531'/>
+            <typedef-decl name='type' type-id='type-id-1109' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-1426'/>
           </member-type>
         </class-decl>
-        <typedef-decl name='sp_typeinfo' type-id='type-id-1532' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-1276'/>
+        <typedef-decl name='sp_typeinfo' type-id='type-id-1427' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-1242'/>
         <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-196'/>
+          <return type-id='type-id-193'/>
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-1549' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1540'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-1444' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1435'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1549' visibility='default' is-declaration-only='yes' id='type-id-1550'/>
-      <class-decl name='true_' is-struct='yes' naming-typedef-id='type-id-1536' visibility='default' is-declaration-only='yes' id='type-id-1551'/>
-      <typedef-decl name='true_' type-id='type-id-1551' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-1536'/>
-      <typedef-decl name='false_' type-id='type-id-1550' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1549'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1444' visibility='default' is-declaration-only='yes' id='type-id-1445'/>
+      <class-decl name='true_' is-struct='yes' naming-typedef-id='type-id-1431' visibility='default' is-declaration-only='yes' id='type-id-1446'/>
+      <typedef-decl name='true_' type-id='type-id-1446' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-1431'/>
+      <typedef-decl name='false_' type-id='type-id-1445' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1444'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/file_reader.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='128' id='type-id-1552'>
-      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-4' id='type-id-1553'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='128' id='type-id-1447'>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-4' id='type-id-1448'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='152' id='type-id-1554'>
-      <subrange length='19' lower-bound='0' upper-bound='18' type-id='type-id-4' id='type-id-1555'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='152' id='type-id-1449'>
+      <subrange length='19' lower-bound='0' upper-bound='18' type-id='type-id-4' id='type-id-1450'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='280' id='type-id-1556'>
-      <subrange length='35' lower-bound='0' upper-bound='34' type-id='type-id-4' id='type-id-1557'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='280' id='type-id-1451'>
+      <subrange length='35' lower-bound='0' upper-bound='34' type-id='type-id-4' id='type-id-1452'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='128' id='type-id-1558'>
-      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-4' id='type-id-1553'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='128' id='type-id-1453'>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-4' id='type-id-1448'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='152' id='type-id-1559'>
-      <subrange length='19' lower-bound='0' upper-bound='18' type-id='type-id-4' id='type-id-1555'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='152' id='type-id-1454'>
+      <subrange length='19' lower-bound='0' upper-bound='18' type-id='type-id-4' id='type-id-1450'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='280' id='type-id-1560'>
-      <subrange length='35' lower-bound='0' upper-bound='34' type-id='type-id-4' id='type-id-1557'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='280' id='type-id-1455'>
+      <subrange length='35' lower-bound='0' upper-bound='34' type-id='type-id-4' id='type-id-1452'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-1561' const='yes' id='type-id-1562'/>
-    <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-1563'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1558' size-in-bits='64' id='type-id-1564'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1559' size-in-bits='64' id='type-id-1565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1560' size-in-bits='64' id='type-id-1566'/>
-    <qualified-type-def type-id='type-id-1567' const='yes' id='type-id-1568'/>
-    <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-1569'/>
-    <qualified-type-def type-id='type-id-99' const='yes' id='type-id-1570'/>
-    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-194'/>
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1571'/>
-    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-197'/>
-    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-1573'/>
-    <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-1575'/>
-    <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-1577'/>
-    <pointer-type-def type-id='type-id-1578' size-in-bits='64' id='type-id-1579'/>
-    <pointer-type-def type-id='type-id-1580' size-in-bits='64' id='type-id-1581'/>
-    <pointer-type-def type-id='type-id-1582' size-in-bits='64' id='type-id-1583'/>
-    <pointer-type-def type-id='type-id-1584' size-in-bits='64' id='type-id-1585'/>
-    <pointer-type-def type-id='type-id-1586' size-in-bits='64' id='type-id-1587'/>
-    <pointer-type-def type-id='type-id-1588' size-in-bits='64' id='type-id-1589'/>
-    <pointer-type-def type-id='type-id-1590' size-in-bits='64' id='type-id-1591'/>
-    <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-1593'/>
-    <pointer-type-def 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'/>
-    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-1599'/>
-    <pointer-type-def type-id='type-id-1600' size-in-bits='64' id='type-id-1601'/>
-    <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-1603'/>
-    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
-    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
-    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
-    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
-    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
-    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
-    <qualified-type-def type-id='type-id-1574' 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-1619' restrict='yes' id='type-id-1620'/>
-    <qualified-type-def type-id='type-id-1586' const='yes' id='type-id-1621'/>
-    <pointer-type-def type-id='type-id-1621' size-in-bits='64' id='type-id-1622'/>
-    <qualified-type-def type-id='type-id-1600' const='yes' id='type-id-1623'/>
+    <qualified-type-def type-id='type-id-1456' const='yes' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1453' size-in-bits='64' id='type-id-1459'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1454' size-in-bits='64' id='type-id-1460'/>
+    <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'/>
+    <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'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
+    <pointer-type-def 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'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
+    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-1480'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1482'/>
+    <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-1488'/>
+    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
+    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
+    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1498'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1500'/>
+    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-1502'/>
+    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
+    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1506'/>
+    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
+    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-1512'/>
+    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1514'/>
+    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-1516'/>
+    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-1518'/>
+    <pointer-type-def type-id='type-id-1519' size-in-bits='64' id='type-id-1520'/>
+    <pointer-type-def type-id='type-id-1521' 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'/>
+    <pointer-type-def type-id='type-id-1527' size-in-bits='64' id='type-id-1528'/>
+    <pointer-type-def type-id='type-id-1529' size-in-bits='64' id='type-id-1530'/>
+    <pointer-type-def type-id='type-id-1531' size-in-bits='64' id='type-id-1532'/>
+    <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
+    <pointer-type-def type-id='type-id-1535' size-in-bits='64' id='type-id-1536'/>
+    <pointer-type-def type-id='type-id-1537' 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-1541' size-in-bits='64' id='type-id-1542'/>
+    <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-1544'/>
+    <pointer-type-def type-id='type-id-1545' size-in-bits='64' id='type-id-1546'/>
+    <pointer-type-def type-id='type-id-1547' size-in-bits='64' id='type-id-1548'/>
+    <pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
+    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
+    <pointer-type-def type-id='type-id-1553' size-in-bits='64' id='type-id-1554'/>
+    <pointer-type-def type-id='type-id-1535' size-in-bits='64' id='type-id-1555'/>
+    <qualified-type-def type-id='type-id-1491' const='yes' id='type-id-1556'/>
+    <qualified-type-def type-id='type-id-1503' const='yes' id='type-id-1557'/>
+    <qualified-type-def type-id='type-id-1499' const='yes' id='type-id-1558'/>
+    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1559'/>
+    <qualified-type-def type-id='type-id-1517' const='yes' id='type-id-1560'/>
+    <qualified-type-def type-id='type-id-1515' const='yes' id='type-id-1561'/>
+    <qualified-type-def type-id='type-id-1509' const='yes' id='type-id-1562'/>
+    <qualified-type-def type-id='type-id-1511' const='yes' id='type-id-1563'/>
+    <qualified-type-def type-id='type-id-1525' const='yes' id='type-id-1564'/>
+    <qualified-type-def type-id='type-id-1505' const='yes' id='type-id-1565'/>
+    <qualified-type-def type-id='type-id-1529' const='yes' id='type-id-1566'/>
+    <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-1567'/>
+    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-1568'/>
+    <qualified-type-def type-id='type-id-1569' const='yes' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-1477' const='yes' id='type-id-1571'/>
+    <qualified-type-def type-id='type-id-1545' const='yes' id='type-id-1572'/>
+    <qualified-type-def type-id='type-id-1541' const='yes' id='type-id-1573'/>
+    <qualified-type-def type-id='type-id-1551' const='yes' id='type-id-1574'/>
+    <qualified-type-def type-id='type-id-1481' const='yes' id='type-id-1575'/>
+    <qualified-type-def type-id='type-id-1535' const='yes' id='type-id-1576'/>
+    <pointer-type-def type-id='type-id-1556' size-in-bits='64' id='type-id-1577'/>
+    <pointer-type-def type-id='type-id-1557' size-in-bits='64' id='type-id-1578'/>
+    <pointer-type-def type-id='type-id-1558' size-in-bits='64' id='type-id-1579'/>
+    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-1580'/>
+    <pointer-type-def type-id='type-id-1561' size-in-bits='64' id='type-id-1581'/>
+    <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-1582'/>
+    <pointer-type-def type-id='type-id-1563' size-in-bits='64' id='type-id-1583'/>
+    <pointer-type-def type-id='type-id-1564' size-in-bits='64' id='type-id-1584'/>
+    <pointer-type-def type-id='type-id-1559' size-in-bits='64' id='type-id-1585'/>
+    <pointer-type-def type-id='type-id-1565' size-in-bits='64' id='type-id-1586'/>
+    <pointer-type-def type-id='type-id-1566' size-in-bits='64' id='type-id-1587'/>
+    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-1588'/>
+    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-1589'/>
+    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-1590'/>
+    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-1591'/>
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-1592'/>
+    <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-1593'/>
+    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-1594'/>
+    <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-1595'/>
+    <qualified-type-def type-id='type-id-1596' const='yes' id='type-id-1597'/>
+    <pointer-type-def 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'/>
+    <qualified-type-def type-id='type-id-1600' 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-1603'/>
+    <qualified-type-def type-id='type-id-1604' const='yes' id='type-id-1605'/>
+    <qualified-type-def type-id='type-id-1606' const='yes' id='type-id-1607'/>
+    <pointer-type-def type-id='type-id-1605' size-in-bits='64' id='type-id-1608'/>
+    <pointer-type-def type-id='type-id-1607' size-in-bits='64' id='type-id-1609'/>
+    <qualified-type-def type-id='type-id-1608' restrict='yes' id='type-id-1610'/>
+    <pointer-type-def type-id='type-id-1596' size-in-bits='64' id='type-id-1611'/>
+    <pointer-type-def type-id='type-id-1596' size-in-bits='64' id='type-id-1612'/>
+    <qualified-type-def type-id='type-id-1611' const='yes' id='type-id-1613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
+    <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-1600' size-in-bits='64' id='type-id-1618'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1604'/>
+    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1619'/>
+    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-1621'/>
+    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-1622'/>
     <pointer-type-def type-id='type-id-1623' size-in-bits='64' id='type-id-1624'/>
-    <qualified-type-def type-id='type-id-1608' const='yes' id='type-id-1625'/>
     <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1626'/>
-    <qualified-type-def type-id='type-id-1610' const='yes' id='type-id-1627'/>
     <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-1628'/>
-    <qualified-type-def type-id='type-id-1612' 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'/>
-    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
+    <pointer-type-def type-id='type-id-1631' size-in-bits='64' id='type-id-1632'/>
+    <pointer-type-def type-id='type-id-1633' size-in-bits='64' id='type-id-1634'/>
     <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1636'/>
-    <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-1637' size-in-bits='64' id='type-id-1638'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1640'/>
     <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1642'/>
-    <qualified-type-def type-id='type-id-1643' const='yes' id='type-id-1644'/>
-    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-1645'/>
-    <qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1647'/>
-    <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1648'/>
-    <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1650'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1650' size-in-bits='64' id='type-id-1651'/>
-    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-1652'/>
-    <qualified-type-def type-id='type-id-1653' const='yes' id='type-id-1654'/>
-    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
-    <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1657'/>
-    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
-    <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1660'/>
-    <pointer-type-def type-id='type-id-1660' size-in-bits='64' id='type-id-1661'/>
-    <qualified-type-def type-id='type-id-1662' const='yes' id='type-id-1663'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1663' size-in-bits='64' id='type-id-1664'/>
-    <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1665'/>
-    <qualified-type-def type-id='type-id-1666' const='yes' id='type-id-1667'/>
-    <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-1668'/>
-    <qualified-type-def type-id='type-id-1669' const='yes' id='type-id-1670'/>
-    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
-    <qualified-type-def type-id='type-id-1672' const='yes' id='type-id-1673'/>
-    <pointer-type-def 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'/>
-    <qualified-type-def type-id='type-id-1678' const='yes' id='type-id-1679'/>
-    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-1680'/>
-    <qualified-type-def type-id='type-id-1681' const='yes' id='type-id-1682'/>
-    <pointer-type-def type-id='type-id-1682' size-in-bits='64' id='type-id-1683'/>
-    <qualified-type-def type-id='type-id-1684' const='yes' id='type-id-1685'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1685' size-in-bits='64' id='type-id-1686'/>
-    <pointer-type-def type-id='type-id-1685' size-in-bits='64' id='type-id-1687'/>
-    <pointer-type-def type-id='type-id-1631' size-in-bits='64' id='type-id-1688'/>
-    <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
-    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-1691'/>
-    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1692'/>
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1693'/>
-    <pointer-type-def type-id='type-id-1643' 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-1697' size-in-bits='64' id='type-id-1698'/>
-    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1699'/>
-    <pointer-type-def type-id='type-id-1700' size-in-bits='64' id='type-id-1701'/>
-    <pointer-type-def type-id='type-id-1653' size-in-bits='64' id='type-id-1702'/>
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1703'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1704' size-in-bits='64' id='type-id-1705'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1704' size-in-bits='64' id='type-id-1706'/>
-    <pointer-type-def type-id='type-id-1704' size-in-bits='64' id='type-id-1707'/>
-    <pointer-type-def type-id='type-id-1704' size-in-bits='64' id='type-id-1708'/>
-    <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1711'/>
-    <pointer-type-def type-id='type-id-1712' size-in-bits='64' id='type-id-1713'/>
-    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1714'/>
-    <pointer-type-def type-id='type-id-1715' size-in-bits='64' id='type-id-1716'/>
-    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-1718'/>
-    <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-1719'/>
-    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-1720'/>
-    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-1721'/>
-    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-1722'/>
-    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-1723'/>
-    <qualified-type-def type-id='type-id-1722' const='yes' id='type-id-1724'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1724' size-in-bits='64' id='type-id-1725'/>
-    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-1726'/>
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1728'/>
-    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-1730'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1731' size-in-bits='64' id='type-id-1732'/>
-    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-1734'/>
-    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1736'/>
-    <pointer-type-def type-id='type-id-1737' 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-1745' size-in-bits='64' id='type-id-1746'/>
-    <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-1748'/>
-    <pointer-type-def type-id='type-id-1678' size-in-bits='64' id='type-id-1749'/>
-    <pointer-type-def type-id='type-id-1681' size-in-bits='64' id='type-id-1750'/>
-    <pointer-type-def type-id='type-id-1751' 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-1755' size-in-bits='64' id='type-id-1756'/>
-    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-1684' size-in-bits='64' id='type-id-1757'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1574'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1758'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1759'/>
+    <pointer-type-def type-id='type-id-1643' 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-1645' size-in-bits='64' id='type-id-1647'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1648'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1649'/>
     <namespace-decl name='std'>
-      <class-decl name='basic_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' id='type-id-1567'>
+      <class-decl name='basic_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' id='type-id-1462'>
         <member-function access='public'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_filebufIcSt11char_traitsIcEE7is_openEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_ifstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default' id='type-id-1572'>
+      <class-decl name='basic_ifstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default' id='type-id-1467'>
         <member-function access='public'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE5closeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-1476'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1366'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='533' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ios_base' size-in-bits='1728' visibility='default' id='type-id-1760'>
+      <class-decl name='ios_base' size-in-bits='1728' visibility='default' id='type-id-1650'>
         <member-type access='private'>
-          <typedef-decl name='iostate' type-id='type-id-1761' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-195'/>
+          <typedef-decl name='iostate' type-id='type-id-1651' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-192'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='openmode' type-id='type-id-1762' 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-1476'/>
+          <typedef-decl name='openmode' type-id='type-id-1652' 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-1366'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1763'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1653'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1764'/>
+          <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1654'/>
         </member-type>
       </class-decl>
-      <enum-decl name='iostate' naming-typedef-id='type-id-195' is-declaration-only='yes' id='type-id-1761'>
+      <enum-decl name='iostate' naming-typedef-id='type-id-192' is-declaration-only='yes' id='type-id-1651'>
         <underlying-type type-id='type-id-47'/>
       </enum-decl>
-      <enum-decl name='openmode' naming-typedef-id='type-id-1476' is-declaration-only='yes' id='type-id-1762'>
+      <enum-decl name='openmode' naming-typedef-id='type-id-1366' is-declaration-only='yes' id='type-id-1652'>
         <underlying-type type-id='type-id-47'/>
       </enum-decl>
-      <typedef-decl name='streamsize' type-id='type-id-201' 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-198'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1753' visibility='default' is-declaration-only='yes' id='type-id-1765'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1731' visibility='default' is-declaration-only='yes' id='type-id-1766'/>
-      <class-decl name='type' naming-typedef-id='type-id-1767' visibility='default' is-declaration-only='yes' id='type-id-1684'>
+      <typedef-decl name='streamsize' type-id='type-id-198' 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-195'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1616' visibility='default' is-declaration-only='yes' id='type-id-1655'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1614' visibility='default' is-declaration-only='yes' id='type-id-1656'/>
+      <class-decl name='type' naming-typedef-id='type-id-1657' visibility='default' is-declaration-only='yes' id='type-id-1600'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-1582' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-1768'/>
+          <typedef-decl name='const_iterator' type-id='type-id-1469' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-1658'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-1584' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-1769'/>
+          <typedef-decl name='iterator' type-id='type-id-1471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-1659'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1771' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-1770'/>
+          <typedef-decl name='pointer' type-id='type-id-1661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-1660'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EED2Ev'>
-            <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1687' is-artificial='yes'/>
-            <return type-id='type-id-1768'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
+            <return type-id='type-id-1658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='capacity' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE8capacityEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;__gnu_cxx::__normal_iterator&lt;const mongo::BSONObj *, std::vector&lt;mongo::BSONObj, std::allocator&lt;mongo::BSONObj&gt; &gt; &gt; &gt;' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKS1_S3_EEEEPS1_mT_SB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1757' is-artificial='yes'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-1582'/>
-            <parameter type-id='type-id-1582'/>
-            <return type-id='type-id-1770'/>
+            <parameter type-id='type-id-1469'/>
+            <parameter type-id='type-id-1469'/>
+            <return type-id='type-id-1660'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <return type-id='type-id-1769'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <return type-id='type-id-1659'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEaSERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEaSERKS3_'>
-            <parameter type-id='type-id-1757' is-artificial='yes'/>
-            <parameter type-id='type-id-1686'/>
-            <return type-id='type-id-629'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1602'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1757' is-artificial='yes'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-651'/>
+            <return type-id='type-id-606'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1772'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1662'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1773'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1663'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1727'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1485'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIhSaIhEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1486' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1741'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1549'>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj &amp;, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeERKNS0_7BSONObjENS0_6Date_tEEEC2IJS2_RS3_RS6_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1742' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
-            <parameter type-id='type-id-570'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1550' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__25' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1774'/>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1678'>
+      <class-decl name='__anonymous_struct__25' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1664'/>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1477'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-219' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-1775'/>
+          <typedef-decl name='pointer' type-id='type-id-216' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='227' column='1' id='type-id-1665'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIcSaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIcSaIcEED2Ev'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIcSaIcEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
+            <parameter type-id='type-id-1590' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIcSaIcEE6resizeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNSt6vectorIcSaIcEE4dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorIcSaIcEE15_M_erase_at_endEPc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <parameter type-id='type-id-1775'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
+            <parameter type-id='type-id-1665'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIcSaIcEE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
+            <parameter type-id='type-id-1590' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -12510,183 +12400,183 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_append' mangled-name='_ZNSt6vectorIcSaIcEE17_M_default_appendEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIcSaIcEE17_M_default_appendEm'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1776'>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-40'/>
-            <return type-id='type-id-216'/>
+            <return type-id='type-id-213'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1777'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1667'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1766' 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-1731'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1656' 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-1614'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIhEE10deallocateERS0_Phm' 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-1732'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-1615'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1729'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1629'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1778'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1668'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;__gnu_cxx::__normal_iterator&lt;const mongo::BSONObj *, std::vector&lt;mongo::BSONObj, std::allocator&lt;mongo::BSONObj&gt; &gt; &gt;, mongo::BSONObj *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN5mongo7BSONObjESt6vectorIS5_SaIS5_EEEEPS5_EET0_T_SE_SD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1582'/>
-            <parameter type-id='type-id-1582'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-1722'/>
+            <parameter type-id='type-id-1469'/>
+            <parameter type-id='type-id-1469'/>
+            <parameter type-id='type-id-1611'/>
+            <return type-id='type-id-1611'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;mongo::BSONObj *, mongo::BSONObj *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN5mongo7BSONObjES4_EET0_T_S6_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1722'/>
-            <parameter type-id='type-id-1722'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-1722'/>
+            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1611'/>
+            <return type-id='type-id-1611'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1779'>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1669'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;mongo::BSONObj *, mongo::BSONObj *&gt;' mangled-name='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPN5mongo7BSONObjES5_EET0_T_S7_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1722'/>
-            <parameter type-id='type-id-1722'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-1722'/>
+            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1611'/>
+            <return type-id='type-id-1611'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;const mongo::BSONObj *, mongo::BSONObj *&gt;' mangled-name='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKN5mongo7BSONObjEPS4_EET0_T_S9_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1675'/>
-            <parameter type-id='type-id-1675'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-1722'/>
+            <parameter type-id='type-id-1599'/>
+            <parameter type-id='type-id-1599'/>
+            <parameter type-id='type-id-1611'/>
+            <return type-id='type-id-1611'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1733'>
+      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1633'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo6Date_tELb0EEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1634' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1735'>
+      <class-decl name='__anonymous_struct__15' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1635'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::Date_t &amp;&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo6Date_tEEEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1736' is-artificial='yes'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1737'>
+      <class-decl name='__anonymous_struct__16' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1637'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::BSONObj &amp;, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJRKN5mongo7BSONObjENS0_6Date_tEEEC2IRS1_JRS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1738' is-artificial='yes'/>
-            <parameter type-id='type-id-570'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1638' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1739'>
+      <class-decl name='__anonymous_struct__17' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1639'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj &amp;, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeERKNS0_7BSONObjENS0_6Date_tEEEC2IS2_JRS3_RS6_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1740' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
-            <parameter type-id='type-id-570'/>
-            <parameter type-id='type-id-807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1640' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-115'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1743'>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1641'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::BSONObj &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm1ERKN5mongo7BSONObjELb0EEC2IRS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1744' is-artificial='yes'/>
-            <parameter type-id='type-id-570'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1745'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1620'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIcSaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1746' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIcSaIcEE13_M_deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1746' is-artificial='yes'/>
-            <parameter type-id='type-id-219'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-216'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIcSaIcEE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1746' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-219'/>
+            <return type-id='type-id-216'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1747'>
+      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1643'>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1748' is-artificial='yes'/>
-            <parameter type-id='type-id-454'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-442'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1780'>
+      <class-decl name='__anonymous_struct__21' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1670'>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIcE6lengthEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1094'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1178'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1098'/>
+            <parameter type-id='type-id-1093'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1781'>
+      <class-decl name='__anonymous_struct__22' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1671'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_default_n&lt;char *, unsigned long&gt;' mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPcmEET_S3_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-55'/>
@@ -12695,7 +12585,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1782'>
+      <class-decl name='__anonymous_struct__23' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1672'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;char&gt;' mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mIcEEPT_PKS3_S6_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-60'/>
@@ -12705,376 +12595,376 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1783'>
+      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1673'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;char *&gt;, char *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPcES3_EET0_T_S6_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1774'/>
-            <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1664'/>
+            <parameter type-id='type-id-1664'/>
             <parameter type-id='type-id-55'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1681'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1606'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1622' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1622' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1622' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1609' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1784'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1674'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::BSONObj *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo7BSONObjEEEvT_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1722'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1611'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;__gnu_cxx::__normal_iterator&lt;mongo::BSONObj *, std::vector&lt;mongo::BSONObj, std::allocator&lt;mongo::BSONObj&gt; &gt; &gt; &gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS5_SaIS5_EEEEEEvT_SB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1584'/>
-            <parameter type-id='type-id-1584'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1471'/>
+            <parameter type-id='type-id-1471'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1751'>
+      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1623'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1785' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1771'/>
+          <typedef-decl name='pointer' type-id='type-id-1675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='77' column='1' id='type-id-1661'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-1771'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-1661'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1771'/>
+            <return type-id='type-id-1661'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1786'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1676'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1765' 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-1753'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1655' 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-1616'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1722' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1787'/>
+          <typedef-decl name='pointer' type-id='type-id-1611' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-1677'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1672' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-1788'/>
+          <typedef-decl name='value_type' type-id='type-id-1596' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-1678'/>
         </member-type>
         <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-1754'/>
-            <parameter type-id='type-id-1787'/>
+            <parameter type-id='type-id-1617'/>
+            <parameter type-id='type-id-1677'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-1754'/>
+            <parameter type-id='type-id-1617'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-1787'/>
+            <return type-id='type-id-1677'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1755'>
+      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1625'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIhSaIhEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1756' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1626' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIhSaIhEE13_M_deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1756' is-artificial='yes'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-1626' is-artificial='yes'/>
+            <parameter type-id='type-id-201'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_'>
         <parameter type-id='type-id-60' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1'/>
-        <parameter type-id='type-id-232' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1152' column='1'/>
+        <parameter type-id='type-id-229' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1152' column='1'/>
         <return type-id='type-id-73'/>
       </function-decl>
       <namespace-decl name='__cxx11'>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='const_iterator' naming-typedef-id='type-id-1768' visibility='default' is-declaration-only='yes' id='type-id-1582'>
+      <class-decl name='const_iterator' naming-typedef-id='type-id-1658' visibility='default' is-declaration-only='yes' id='type-id-1469'>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1583' is-artificial='yes'/>
-            <return type-id='type-id-990'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <return type-id='type-id-908'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='iterator' naming-typedef-id='type-id-1769' visibility='default' is-declaration-only='yes' id='type-id-1584'>
+      <class-decl name='iterator' naming-typedef-id='type-id-1659' visibility='default' is-declaration-only='yes' id='type-id-1471'>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1585' is-artificial='yes'/>
-            <parameter type-id='type-id-1725'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-320'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1585' is-artificial='yes'/>
-            <return type-id='type-id-279'/>
+            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <return type-id='type-id-270'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1576'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1475'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-1476' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-216'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-213'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1578'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1483'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1722' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1789'/>
+          <typedef-decl name='pointer' type-id='type-id-1611' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='63' column='1' id='type-id-1679'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE10deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1579' is-artificial='yes'/>
-            <parameter type-id='type-id-1789'/>
+            <parameter type-id='type-id-1484' is-artificial='yes'/>
+            <parameter type-id='type-id-1679'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo7BSONObjEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1579' is-artificial='yes'/>
+            <parameter type-id='type-id-1484' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-1789'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-1679'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1580'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1487'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIhE10deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1581' is-artificial='yes'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-1488' is-artificial='yes'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1790'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1680'>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1791'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1681'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1787' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1785'/>
+          <typedef-decl name='pointer' type-id='type-id-1677' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-1675'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-1792'/>
+          <typedef-decl name='value_type' type-id='type-id-1678' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-1682'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1793'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1683'>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1676'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1537'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [35]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA35_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
-              <parameter type-id='type-id-1566'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
+              <parameter type-id='type-id-1461'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;std::__cxx11::basic_string&lt;char&gt; &gt;' mangled-name='_ZN10mongoutils3str6streamlsINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
-              <parameter type-id='type-id-232'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
+              <parameter type-id='type-id-229'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [2]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA2_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
-              <parameter type-id='type-id-1175'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
+              <parameter type-id='type-id-1090'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [36]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA36_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
-              <parameter type-id='type-id-702'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
+              <parameter type-id='type-id-658'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [16]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA16_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
-              <parameter type-id='type-id-1564'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
+              <parameter type-id='type-id-1459'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
               <parameter type-id='type-id-70'/>
-              <return type-id='type-id-180'/>
+              <return type-id='type-id-115'/>
             </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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1726' is-artificial='yes'/>
-              <parameter type-id='type-id-1565'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1538' is-artificial='yes'/>
+              <parameter type-id='type-id-1460'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='value_type' naming-typedef-id='type-id-1788' visibility='default' is-declaration-only='yes' id='type-id-1672'>
+      <class-decl name='value_type' naming-typedef-id='type-id-1678' visibility='default' is-declaration-only='yes' id='type-id-1596'>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
+            <parameter type-id='type-id-1598' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
+            <parameter type-id='type-id-1598' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isEmpty' mangled-name='_ZNK5mongo7BSONObj7isEmptyEv' filepath='src/mongo/bson/bsonobj.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
+            <parameter type-id='type-id-1598' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
-            <parameter type-id='type-id-522'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo7BSONObj4swapERS0_' filepath='src/mongo/bson/bsonobj.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
-            <parameter type-id='type-id-570'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo7BSONObjaSES0_' filepath='src/mongo/bson/bsonobj.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
-            <parameter type-id='type-id-1672'/>
-            <return type-id='type-id-570'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-1596'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
-            <parameter type-id='type-id-571'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='init' mangled-name='_ZN5mongo7BSONObj4initEPKc' filepath='src/mongo/bson/bsonobj.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1723' is-artificial='yes'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isValid' mangled-name='_ZNK5mongo7BSONObj7isValidEv' filepath='src/mongo/bson/bsonobj.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
+            <parameter type-id='type-id-1598' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1631'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1505'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1669'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1535'>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1720' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-1536' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1720' is-artificial='yes'/>
+                <parameter type-id='type-id-1536' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1671' is-artificial='yes'/>
+                <parameter type-id='type-id-1595' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -13082,567 +12972,567 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo12SharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <parameter type-id='type-id-551'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1631'/>
+            <return type-id='type-id-1505'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1631'/>
+            <return type-id='type-id-1505'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1586' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1689'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1507'>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo17ConstSharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1690' is-artificial='yes'/>
-            <parameter type-id='type-id-800'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1508' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1690' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1508' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1634'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1517'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1580' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1691' is-artificial='yes'/>
-            <return type-id='type-id-1183'/>
+            <parameter type-id='type-id-1518' is-artificial='yes'/>
+            <return type-id='type-id-1102'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1637'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1515'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_6Date_tEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-1581' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_6Date_tEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
-            <return type-id='type-id-807'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1794'/>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1640'>
+      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1684'/>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1525'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-1584' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1693' is-artificial='yes'/>
-            <return type-id='type-id-629'/>
+            <parameter type-id='type-id-1526' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1643'>
+      <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1529'>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1530' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
+            <parameter type-id='type-id-1530' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <parameter type-id='type-id-1587' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
+            <parameter type-id='type-id-1530' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1695'>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1531'>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-1532' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-1532' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-1532' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1697'>
+      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1533'>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <parameter type-id='type-id-1539'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='439' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
-            <return type-id='type-id-1359'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <parameter type-id='type-id-1539'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-1359'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEi' filepath='src/mongo/bson/util/builder.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1359'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEc' filepath='src/mongo/bson/util/builder.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-1359'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendIntegral&lt;int&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIiEERS2_T_i' filepath='src/mongo/bson/util/builder.h' line='498' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1359'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1646'>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1539'>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-1588' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <parameter type-id='type-id-259'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
+            <parameter type-id='type-id-256'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKcm' filepath='src/mongo/base/string_data.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1795'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1685'>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1649'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1569'>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-1652' is-artificial='yes'/>
-            <parameter type-id='type-id-1701'/>
+            <parameter type-id='type-id-1589' is-artificial='yes'/>
+            <parameter type-id='type-id-1632'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1651'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-1652' is-artificial='yes'/>
+            <parameter type-id='type-id-1589' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1700'/>
+            <return type-id='type-id-1631'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1653'>
+      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1541'>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcS2_l' filepath='src/mongo/base/data_range.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1542' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='length' mangled-name='_ZNK5mongo14ConstDataRange6lengthEv' filepath='src/mongo/base/data_range.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1655' is-artificial='yes'/>
+            <parameter type-id='type-id-1592' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZNK5mongo14ConstDataRange4readINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_m' filepath='src/mongo/base/data_range.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1655' is-artificial='yes'/>
-            <parameter type-id='type-id-1708'/>
+            <parameter type-id='type-id-1592' is-artificial='yes'/>
+            <parameter type-id='type-id-1647'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1662'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZNK5mongo14ConstDataRange4readINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEm' filepath='src/mongo/base/data_range.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo14ConstDataRange4readINS_9ValidatedINS_7BSONObjEEEEENS_10StatusWithIT_EEm'>
-            <parameter type-id='type-id-1655' is-artificial='yes'/>
+            <parameter type-id='type-id-1592' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1656'/>
+            <return type-id='type-id-1545'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1656'>
+      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1545'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1703' is-artificial='yes'/>
-            <return type-id='type-id-1705'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <return type-id='type-id-565'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1703' is-artificial='yes'/>
-            <parameter type-id='type-id-1662'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1491'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_9ValidatedINS_7BSONObjEEEEC2ES3_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1703' is-artificial='yes'/>
-            <parameter type-id='type-id-1704'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1645'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__24' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1709'>
+      <class-decl name='__anonymous_struct__24' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1553'>
         <member-function access='public'>
           <function-decl name='operator StringData' mangled-name='_ZN5mongo4ItoAcvNS_10StringDataEEv' filepath='src/mongo/util/itoa.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1710' is-artificial='yes'/>
-            <return type-id='type-id-1646'/>
+            <parameter type-id='type-id-1554' is-artificial='yes'/>
+            <return type-id='type-id-1539'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1659'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1481'>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1482' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1482' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1482' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1482' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1594' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1796'/>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1797'/>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1712'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1686'/>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1687'/>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1489'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~FTDCFileReader' mangled-name='_ZN5mongo14FTDCFileReaderD2Ev' filepath='src/mongo/db/ftdc/file_reader.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReaderD2Ev'>
-            <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1490' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='hasNext' mangled-name='_ZN5mongo14FTDCFileReader7hasNextEv' filepath='src/mongo/db/ftdc/file_reader.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReader7hasNextEv'>
-            <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <return type-id='type-id-1717'/>
+            <parameter type-id='type-id-1490' is-artificial='yes'/>
+            <return type-id='type-id-1493'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='readDocument' mangled-name='_ZN5mongo14FTDCFileReader12readDocumentEv' filepath='src/mongo/db/ftdc/file_reader.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReader12readDocumentEv'>
-            <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <return type-id='type-id-1666'/>
+            <parameter type-id='type-id-1490' is-artificial='yes'/>
+            <return type-id='type-id-1503'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='next' mangled-name='_ZN5mongo14FTDCFileReader4nextEv' filepath='src/mongo/db/ftdc/file_reader.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReader4nextEv'>
-            <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <return type-id='type-id-1741'/>
+            <parameter type-id='type-id-1490' is-artificial='yes'/>
+            <return type-id='type-id-1549'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZN5mongo14FTDCFileReader4openERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/file_reader.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReader4openERKN5boost10filesystem4pathE'>
-            <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
-            <return type-id='type-id-1662'/>
+            <parameter type-id='type-id-1490' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1662'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1491'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1715'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1627'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1662'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <parameter type-id='type-id-1664'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
+            <parameter type-id='type-id-1577' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </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='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1716'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1628'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <parameter type-id='type-id-590'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1716'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1628'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1717'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1493'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIbEC2Eb' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1718' is-artificial='yes'/>
+            <parameter type-id='type-id-1494' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIbEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1662'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1494' is-artificial='yes'/>
+            <parameter type-id='type-id-1491'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1666'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1503'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_7BSONObjEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
+            <parameter type-id='type-id-1578' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1719' is-artificial='yes'/>
-            <return type-id='type-id-570'/>
+            <parameter type-id='type-id-1504' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEEC2ENS_10ErrorCodes5ErrorERKN10mongoutils3str6streamE' filepath='src/mongo/base/status_with.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1719' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <parameter type-id='type-id-148'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1504' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEEC2ENS_10ErrorCodes5ErrorEPKc' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1719' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-1504' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEEC2ES1_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1719' is-artificial='yes'/>
-            <parameter type-id='type-id-1672'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1504' is-artificial='yes'/>
+            <parameter type-id='type-id-1596'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1719' is-artificial='yes'/>
-            <parameter type-id='type-id-1662'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1504' is-artificial='yes'/>
+            <parameter type-id='type-id-1491'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1798'>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1688'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1799'>
+          <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-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1800'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1690'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1701'/>
+                <parameter type-id='type-id-1632'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1801'>
+          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1691'>
             <member-function access='public' static='yes'>
               <function-decl name='defaultConstruct' mangled-name='_ZN5mongo8DataType7HandlerINS_7BSONObjEvE16defaultConstructEv' filepath='src/mongo/bson/bsonobj.h' line='772' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <return type-id='type-id-1672'/>
+                <return type-id='type-id-1596'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerINS_7BSONObjEvE4loadEPS2_PKcmPml' filepath='src/mongo/bson/bsonobj.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1722'/>
+                <parameter type-id='type-id-1611'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-1662'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-1491'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1802'>
+          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1692'>
             <member-function access='public' static='yes'>
               <function-decl name='defaultConstruct' mangled-name='_ZN5mongo8DataType7HandlerINS_9ValidatedINS_7BSONObjEEEvE16defaultConstructEv' filepath='src/mongo/base/data_type_validated.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <return type-id='type-id-1704'/>
+                <return type-id='type-id-1645'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerINS_9ValidatedINS_7BSONObjEEEvE4loadEPS4_PKcmPml' filepath='src/mongo/base/data_type_validated.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1708'/>
+                <parameter type-id='type-id-1647'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-1662'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-1491'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -13651,64 +13541,64 @@
           <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-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1701'/>
+            <parameter type-id='type-id-1632'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='defaultConstruct&lt;mongo::BSONObj&gt;' mangled-name='_ZN5mongo8DataType16defaultConstructINS_7BSONObjEEET_v' filepath='src/mongo/base/data_type.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1672'/>
+            <return type-id='type-id-1596'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='defaultConstruct&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZN5mongo8DataType16defaultConstructINS_9ValidatedINS_7BSONObjEEEEET_v' filepath='src/mongo/base/data_type.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1704'/>
+            <return type-id='type-id-1645'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;mongo::Validated&lt;mongo::BSONObj&gt; &gt;' mangled-name='_ZN5mongo8DataType4loadINS_9ValidatedINS_7BSONObjEEEEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1708'/>
+            <parameter type-id='type-id-1647'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1662'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='load&lt;mongo::BSONObj&gt;' mangled-name='_ZN5mongo8DataType4loadINS_7BSONObjEEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1722'/>
+            <parameter type-id='type-id-1611'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-270'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-1662'/>
+            <parameter type-id='type-id-267'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1700'/>
-      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1704'>
+      <class-decl name='__anonymous_struct__20' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1631'/>
+      <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1645'>
         <member-function access='public'>
           <function-decl name='Validated' mangled-name='_ZN5mongo9ValidatedINS_7BSONObjEEC2Ev' filepath='src/mongo/base/data_type_validated.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1707' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1646' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__25' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1803'>
+      <class-decl name='__anonymous_struct__25' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1693'>
         <member-function access='public' static='yes'>
           <function-decl name='validateLoad' mangled-name='_ZN5mongo9ValidatorINS_7BSONObjEE12validateLoadEPKcm' filepath='src/mongo/rpc/object_check.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1662'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -13716,733 +13606,728 @@
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1586'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1479'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-287'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-119'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-119'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1622' is-artificial='yes'/>
+            <parameter type-id='type-id-1585' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-120'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1622' is-artificial='yes'/>
+            <parameter type-id='type-id-1585' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1622' is-artificial='yes'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1585' is-artificial='yes'/>
+            <return type-id='type-id-1555'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1588'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1497'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1541' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1804'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1436' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1694'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIbEC2EOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1589' is-artificial='yes'/>
-            <parameter type-id='type-id-1804'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
+            <parameter type-id='type-id-1694'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIbEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1589' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1590'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1501'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1806' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1805'/>
+          <typedef-decl name='reference_type' type-id='type-id-1696' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1695'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1808' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1807'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1698' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1697'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo7BSONObjEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <return type-id='type-id-1805'/>
+            <parameter type-id='type-id-1502' is-artificial='yes'/>
+            <return type-id='type-id-1695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo7BSONObjEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <return type-id='type-id-1805'/>
+            <parameter type-id='type-id-1502' is-artificial='yes'/>
+            <return type-id='type-id-1695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo7BSONObjEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1502' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo7BSONObjEEC2EOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1591' is-artificial='yes'/>
-            <parameter type-id='type-id-1807'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1502' is-artificial='yes'/>
+            <parameter type-id='type-id-1697'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1592'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1513'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1810' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1809'/>
+          <typedef-decl name='reference_type' type-id='type-id-1700' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1699'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo6Date_tEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <return type-id='type-id-1809'/>
+            <parameter type-id='type-id-1514' is-artificial='yes'/>
+            <return type-id='type-id-1699'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo6Date_tEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <return type-id='type-id-1809'/>
+            <parameter type-id='type-id-1514' is-artificial='yes'/>
+            <return type-id='type-id-1699'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1594'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1519'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1812' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1811'/>
+          <typedef-decl name='reference_type' type-id='type-id-1702' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1701'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1595' is-artificial='yes'/>
-            <return type-id='type-id-1811'/>
+            <parameter type-id='type-id-1520' is-artificial='yes'/>
+            <return type-id='type-id-1701'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1595' is-artificial='yes'/>
-            <return type-id='type-id-1811'/>
+            <parameter type-id='type-id-1520' is-artificial='yes'/>
+            <return type-id='type-id-1701'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1596'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1523'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1814' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1813'/>
+          <typedef-decl name='reference_type' type-id='type-id-1704' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1703'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalISt6vectorIN5mongo7BSONObjESaIS3_EEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1597' is-artificial='yes'/>
-            <return type-id='type-id-1813'/>
+            <parameter type-id='type-id-1524' is-artificial='yes'/>
+            <return type-id='type-id-1703'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalISt6vectorIN5mongo7BSONObjESaIS3_EEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1597' is-artificial='yes'/>
-            <return type-id='type-id-1813'/>
+            <parameter type-id='type-id-1524' is-artificial='yes'/>
+            <return type-id='type-id-1703'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1598'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1543'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1816' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1815'/>
+          <typedef-decl name='reference_type' type-id='type-id-1706' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1705'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-1818' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1817'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-1708' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-1707'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <return type-id='type-id-1815'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <return type-id='type-id-1705'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <return type-id='type-id-1815'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <return type-id='type-id-1705'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo9ValidatedINS1_7BSONObjEEEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-1817'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <parameter type-id='type-id-1707'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1600'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1551'>
           <member-type access='private'>
-            <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67' column='1' id='type-id-1561'/>
+            <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67' column='1' id='type-id-1456'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='c_str' mangled-name='_ZNK5boost10filesystem4path5c_strEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1624' is-artificial='yes'/>
-              <return type-id='type-id-1563'/>
+              <parameter type-id='type-id-1593' is-artificial='yes'/>
+              <return type-id='type-id-1458'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1601' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1552' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1602'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1495'>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIbE9constructEOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1603' is-artificial='yes'/>
-              <parameter type-id='type-id-1541'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-1436'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbEC2EOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1603' is-artificial='yes'/>
-              <parameter type-id='type-id-1541'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-1436'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1603' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1604'>
+        <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1527'>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageISt6vectorIN5mongo7BSONObjESaIS4_EEE7addressEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1605' is-artificial='yes'/>
-              <return type-id='type-id-190'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <return type-id='type-id-187'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1606'>
+        <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1547'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1819' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1816'/>
+            <typedef-decl name='reference_type' type-id='type-id-1709' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1706'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1820' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1818'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1710' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1708'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1607' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1548' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1607' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1548' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1607' is-artificial='yes'/>
-              <parameter type-id='type-id-1821'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1548' is-artificial='yes'/>
+              <parameter type-id='type-id-1711'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1607' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1548' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEE9constructEOS5_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1607' is-artificial='yes'/>
-              <parameter type-id='type-id-1818'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1548' is-artificial='yes'/>
+              <parameter type-id='type-id-1708'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo9ValidatedINS2_7BSONObjEEEEC2EOS5_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1607' is-artificial='yes'/>
-              <parameter type-id='type-id-1818'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1548' is-artificial='yes'/>
+              <parameter type-id='type-id-1708'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1608'>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1499'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1822' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1806'/>
+            <typedef-decl name='reference_type' type-id='type-id-1712' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1696'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1823' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1808'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1713' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-1698'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1609' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1609' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo7BSONObjEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1626' is-artificial='yes'/>
+              <parameter type-id='type-id-1579' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1609' is-artificial='yes'/>
-              <parameter type-id='type-id-1821'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1711'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1609' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE9constructEOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1609' is-artificial='yes'/>
-              <parameter type-id='type-id-1808'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1698'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEEC2EOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1609' is-artificial='yes'/>
-              <parameter type-id='type-id-1808'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1698'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1610'>
+        <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1509'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1824' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1812'/>
+            <typedef-decl name='reference_type' type-id='type-id-1714' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1702'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1611' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1510' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1611' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1510' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1611' is-artificial='yes'/>
-              <parameter type-id='type-id-1821'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1510' is-artificial='yes'/>
+              <parameter type-id='type-id-1711'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1628' is-artificial='yes'/>
+              <parameter type-id='type-id-1582' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1612'>
+        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1511'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1825' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1810'/>
+            <typedef-decl name='reference_type' type-id='type-id-1715' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1700'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo6Date_tEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1613' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1512' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo6Date_tEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1613' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1512' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo6Date_tEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1630' is-artificial='yes'/>
+              <parameter type-id='type-id-1583' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo6Date_tEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1613' is-artificial='yes'/>
-              <parameter type-id='type-id-1821'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1512' is-artificial='yes'/>
+              <parameter type-id='type-id-1711'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1614'>
+        <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1521'>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-1767' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-1616'/>
+            <typedef-decl name='internal_type' type-id='type-id-1657' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-1473'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1826' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1814'/>
+            <typedef-decl name='reference_type' type-id='type-id-1716' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1704'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1615' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1522' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1615' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1522' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1615' is-artificial='yes'/>
-              <parameter type-id='type-id-1821'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1522' is-artificial='yes'/>
+              <parameter type-id='type-id-1711'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE10get_objectEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='726' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1615' is-artificial='yes'/>
-              <return type-id='type-id-1617'/>
+              <parameter type-id='type-id-1522' is-artificial='yes'/>
+              <return type-id='type-id-1474'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE8get_implEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='711' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1615' is-artificial='yes'/>
-              <return type-id='type-id-1814'/>
+              <parameter type-id='type-id-1522' is-artificial='yes'/>
+              <return type-id='type-id-1704'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1827'>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1717'>
         </class-decl>
-        <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1828'>
+        <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1718'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1705' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1819'/>
+            <typedef-decl name='reference_type' type-id='type-id-565' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1709'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1706' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1820'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-377' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1710'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1829'>
+        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1719'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-570' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1822'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1712'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-571' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1823'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-1713'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1830'>
+        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1720'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-807' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1825'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1715'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1831'>
+        <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1721'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1183' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1824'/>
+            <typedef-decl name='reference_type' type-id='type-id-1102' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1714'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1832'>
+        <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1722'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-629' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1826'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1716'/>
           </member-type>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='detail'>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1833'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1723'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-1684' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-1767'/>
+            <typedef-decl name='type' type-id='type-id-1600' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-1657'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-1834' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1821'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-1724' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1711'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1834' visibility='default' is-declaration-only='yes' id='type-id-1835'/>
-      <typedef-decl name='false_' type-id='type-id-1835' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1834'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1724' visibility='default' is-declaration-only='yes' id='type-id-1725'/>
+      <typedef-decl name='false_' type-id='type-id-1725' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1724'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/file_writer.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='632' id='type-id-1836'>
-      <subrange length='79' lower-bound='0' upper-bound='78' type-id='type-id-4' id='type-id-1837'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='632' id='type-id-1726'>
+      <subrange length='79' lower-bound='0' upper-bound='78' type-id='type-id-4' id='type-id-1727'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='632' id='type-id-1838'>
-      <subrange length='79' lower-bound='0' upper-bound='78' type-id='type-id-4' id='type-id-1837'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='632' id='type-id-1728'>
+      <subrange length='79' lower-bound='0' upper-bound='78' type-id='type-id-4' id='type-id-1727'/>
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-1838' size-in-bits='64' id='type-id-1839'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1728' size-in-bits='64' id='type-id-1729'/>
+    <pointer-type-def type-id='type-id-1730' 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'/>
+    <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-1739'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>
+    <pointer-type-def type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
+    <pointer-type-def type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>
+    <pointer-type-def type-id='type-id-1752' size-in-bits='64' id='type-id-1753'/>
+    <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1755'/>
+    <pointer-type-def type-id='type-id-1756' size-in-bits='64' id='type-id-1757'/>
+    <pointer-type-def type-id='type-id-1758' size-in-bits='64' id='type-id-1759'/>
+    <pointer-type-def type-id='type-id-1760' size-in-bits='64' id='type-id-1761'/>
+    <pointer-type-def type-id='type-id-1762' size-in-bits='64' id='type-id-1763'/>
+    <pointer-type-def type-id='type-id-1764' size-in-bits='64' id='type-id-1765'/>
+    <pointer-type-def type-id='type-id-1766' size-in-bits='64' id='type-id-1767'/>
+    <pointer-type-def type-id='type-id-1768' size-in-bits='64' id='type-id-1769'/>
+    <pointer-type-def type-id='type-id-1770' size-in-bits='64' id='type-id-1771'/>
+    <pointer-type-def type-id='type-id-1772' size-in-bits='64' id='type-id-1773'/>
+    <pointer-type-def type-id='type-id-1774' size-in-bits='64' id='type-id-1775'/>
+    <pointer-type-def type-id='type-id-1776' size-in-bits='64' id='type-id-1777'/>
+    <pointer-type-def type-id='type-id-1778' size-in-bits='64' id='type-id-1779'/>
+    <pointer-type-def type-id='type-id-1780' size-in-bits='64' id='type-id-1781'/>
+    <pointer-type-def type-id='type-id-1782' size-in-bits='64' id='type-id-1783'/>
+    <pointer-type-def type-id='type-id-1784' size-in-bits='64' id='type-id-1785'/>
+    <pointer-type-def type-id='type-id-1762' size-in-bits='64' id='type-id-1786'/>
+    <pointer-type-def type-id='type-id-1787' size-in-bits='64' id='type-id-1788'/>
+    <qualified-type-def type-id='type-id-1752' const='yes' id='type-id-1789'/>
+    <qualified-type-def type-id='type-id-1770' const='yes' id='type-id-1790'/>
+    <qualified-type-def type-id='type-id-1746' const='yes' id='type-id-1791'/>
+    <qualified-type-def type-id='type-id-1754' const='yes' id='type-id-1792'/>
+    <qualified-type-def type-id='type-id-1756' const='yes' id='type-id-1793'/>
+    <qualified-type-def type-id='type-id-1766' const='yes' id='type-id-1794'/>
+    <qualified-type-def type-id='type-id-1768' const='yes' id='type-id-1795'/>
+    <qualified-type-def type-id='type-id-1796' const='yes' id='type-id-1797'/>
+    <qualified-type-def type-id='type-id-1798' const='yes' id='type-id-1799'/>
+    <qualified-type-def type-id='type-id-1730' const='yes' id='type-id-1800'/>
+    <qualified-type-def type-id='type-id-1772' const='yes' id='type-id-1801'/>
+    <qualified-type-def type-id='type-id-1778' const='yes' id='type-id-1802'/>
+    <qualified-type-def type-id='type-id-1803' const='yes' id='type-id-1804'/>
+    <qualified-type-def type-id='type-id-1780' const='yes' id='type-id-1805'/>
+    <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1806'/>
+    <qualified-type-def type-id='type-id-1732' const='yes' id='type-id-1807'/>
+    <qualified-type-def type-id='type-id-1762' const='yes' id='type-id-1808'/>
+    <pointer-type-def type-id='type-id-1789' size-in-bits='64' id='type-id-1809'/>
+    <pointer-type-def type-id='type-id-1790' size-in-bits='64' id='type-id-1810'/>
+    <pointer-type-def type-id='type-id-1791' size-in-bits='64' id='type-id-1811'/>
+    <pointer-type-def type-id='type-id-1792' size-in-bits='64' id='type-id-1812'/>
+    <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-1813'/>
+    <pointer-type-def type-id='type-id-1794' size-in-bits='64' id='type-id-1814'/>
+    <pointer-type-def type-id='type-id-1795' size-in-bits='64' id='type-id-1815'/>
+    <pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-1816'/>
+    <pointer-type-def type-id='type-id-1799' size-in-bits='64' id='type-id-1817'/>
+    <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-1818'/>
+    <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1819'/>
+    <pointer-type-def type-id='type-id-1802' size-in-bits='64' id='type-id-1820'/>
+    <pointer-type-def type-id='type-id-1804' size-in-bits='64' id='type-id-1821'/>
+    <pointer-type-def type-id='type-id-1805' size-in-bits='64' id='type-id-1822'/>
+    <pointer-type-def type-id='type-id-1807' size-in-bits='64' id='type-id-1823'/>
+    <pointer-type-def type-id='type-id-1808' size-in-bits='64' id='type-id-1824'/>
+    <qualified-type-def type-id='type-id-1825' const='yes' id='type-id-1826'/>
+    <qualified-type-def type-id='type-id-1827' const='yes' id='type-id-1828'/>
+    <pointer-type-def type-id='type-id-1826' size-in-bits='64' id='type-id-1829'/>
+    <pointer-type-def type-id='type-id-1828' size-in-bits='64' id='type-id-1830'/>
+    <qualified-type-def type-id='type-id-1829' restrict='yes' id='type-id-1831'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1832' size-in-bits='64' id='type-id-1833'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1825'/>
+    <pointer-type-def type-id='type-id-1825' size-in-bits='64' id='type-id-1834'/>
+    <pointer-type-def type-id='type-id-1835' size-in-bits='64' id='type-id-1836'/>
+    <pointer-type-def type-id='type-id-1827' size-in-bits='64' id='type-id-1837'/>
+    <pointer-type-def type-id='type-id-1838' size-in-bits='64' id='type-id-1839'/>
     <pointer-type-def type-id='type-id-1840' size-in-bits='64' id='type-id-1841'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
     <pointer-type-def type-id='type-id-1842' size-in-bits='64' id='type-id-1843'/>
     <pointer-type-def type-id='type-id-1844' size-in-bits='64' id='type-id-1845'/>
-    <pointer-type-def type-id='type-id-1846' size-in-bits='64' id='type-id-1847'/>
-    <pointer-type-def type-id='type-id-1848' size-in-bits='64' id='type-id-1849'/>
-    <pointer-type-def type-id='type-id-1850' 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-1854' size-in-bits='64' id='type-id-1855'/>
-    <pointer-type-def type-id='type-id-1856' size-in-bits='64' id='type-id-1857'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1858' size-in-bits='64' id='type-id-1859'/>
-    <pointer-type-def type-id='type-id-1858' size-in-bits='64' id='type-id-1860'/>
-    <pointer-type-def type-id='type-id-1861' size-in-bits='64' id='type-id-1862'/>
-    <pointer-type-def type-id='type-id-1863' size-in-bits='64' id='type-id-1864'/>
-    <pointer-type-def type-id='type-id-1865' size-in-bits='64' id='type-id-1866'/>
-    <pointer-type-def type-id='type-id-1867' size-in-bits='64' id='type-id-1868'/>
-    <pointer-type-def type-id='type-id-1869' size-in-bits='64' id='type-id-1870'/>
-    <qualified-type-def type-id='type-id-1840' const='yes' id='type-id-1871'/>
-    <pointer-type-def type-id='type-id-1871' size-in-bits='64' id='type-id-1872'/>
-    <qualified-type-def type-id='type-id-1872' restrict='yes' id='type-id-1873'/>
-    <qualified-type-def type-id='type-id-1848' const='yes' id='type-id-1874'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1874' size-in-bits='64' id='type-id-1875'/>
-    <qualified-type-def type-id='type-id-1850' const='yes' id='type-id-1876'/>
-    <pointer-type-def type-id='type-id-1876' size-in-bits='64' id='type-id-1877'/>
-    <qualified-type-def type-id='type-id-1858' const='yes' id='type-id-1878'/>
-    <pointer-type-def type-id='type-id-1878' size-in-bits='64' id='type-id-1879'/>
-    <qualified-type-def type-id='type-id-1865' const='yes' id='type-id-1880'/>
-    <pointer-type-def type-id='type-id-1880' size-in-bits='64' id='type-id-1881'/>
-    <qualified-type-def type-id='type-id-1869' const='yes' id='type-id-1882'/>
-    <pointer-type-def type-id='type-id-1882' size-in-bits='64' id='type-id-1883'/>
-    <qualified-type-def type-id='type-id-1884' const='yes' id='type-id-1885'/>
-    <pointer-type-def type-id='type-id-1885' size-in-bits='64' id='type-id-1886'/>
-    <qualified-type-def type-id='type-id-1887' const='yes' id='type-id-1888'/>
-    <pointer-type-def type-id='type-id-1888' size-in-bits='64' id='type-id-1889'/>
-    <qualified-type-def type-id='type-id-1890' const='yes' id='type-id-1891'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1891' size-in-bits='64' id='type-id-1892'/>
-    <pointer-type-def type-id='type-id-1891' size-in-bits='64' id='type-id-1893'/>
-    <qualified-type-def type-id='type-id-1894' const='yes' id='type-id-1895'/>
-    <pointer-type-def type-id='type-id-1895' size-in-bits='64' id='type-id-1896'/>
-    <qualified-type-def type-id='type-id-1897' const='yes' id='type-id-1898'/>
-    <pointer-type-def type-id='type-id-1898' size-in-bits='64' id='type-id-1899'/>
-    <qualified-type-def type-id='type-id-1900' const='yes' id='type-id-1901'/>
-    <pointer-type-def type-id='type-id-1901' size-in-bits='64' id='type-id-1902'/>
-    <qualified-type-def type-id='type-id-1903' const='yes' id='type-id-1904'/>
-    <pointer-type-def type-id='type-id-1904' size-in-bits='64' id='type-id-1905'/>
-    <qualified-type-def type-id='type-id-1906' const='yes' id='type-id-1907'/>
-    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1908'/>
-    <qualified-type-def type-id='type-id-1909' const='yes' id='type-id-1910'/>
-    <pointer-type-def type-id='type-id-1910' size-in-bits='64' id='type-id-1911'/>
-    <qualified-type-def type-id='type-id-1912' const='yes' id='type-id-1913'/>
-    <pointer-type-def type-id='type-id-1913' size-in-bits='64' id='type-id-1914'/>
-    <qualified-type-def type-id='type-id-1915' const='yes' id='type-id-1916'/>
-    <pointer-type-def type-id='type-id-1916' size-in-bits='64' id='type-id-1917'/>
-    <qualified-type-def type-id='type-id-1918' const='yes' id='type-id-1919'/>
-    <pointer-type-def type-id='type-id-1919' size-in-bits='64' id='type-id-1920'/>
-    <qualified-type-def type-id='type-id-1921' const='yes' id='type-id-1922'/>
-    <pointer-type-def type-id='type-id-1922' size-in-bits='64' id='type-id-1923'/>
-    <pointer-type-def type-id='type-id-1884' size-in-bits='64' id='type-id-1924'/>
-    <pointer-type-def type-id='type-id-1887' size-in-bits='64' id='type-id-1925'/>
-    <pointer-type-def type-id='type-id-1890' size-in-bits='64' id='type-id-1926'/>
-    <pointer-type-def type-id='type-id-1927' size-in-bits='64' id='type-id-1928'/>
-    <pointer-type-def type-id='type-id-1894' size-in-bits='64' id='type-id-1929'/>
-    <pointer-type-def type-id='type-id-1930' size-in-bits='64' id='type-id-1931'/>
-    <pointer-type-def type-id='type-id-1900' size-in-bits='64' id='type-id-1932'/>
-    <pointer-type-def type-id='type-id-1903' size-in-bits='64' id='type-id-1933'/>
-    <pointer-type-def type-id='type-id-1934' size-in-bits='64' id='type-id-1935'/>
-    <pointer-type-def type-id='type-id-1906' size-in-bits='64' id='type-id-1936'/>
-    <pointer-type-def type-id='type-id-1909' size-in-bits='64' id='type-id-1937'/>
-    <pointer-type-def type-id='type-id-1909' size-in-bits='64' id='type-id-1938'/>
-    <pointer-type-def type-id='type-id-1912' size-in-bits='64' id='type-id-1939'/>
-    <pointer-type-def type-id='type-id-1940' size-in-bits='64' id='type-id-1941'/>
-    <pointer-type-def type-id='type-id-1942' size-in-bits='64' id='type-id-1943'/>
-    <pointer-type-def type-id='type-id-1944' size-in-bits='64' id='type-id-1945'/>
-    <pointer-type-def type-id='type-id-1946' size-in-bits='64' id='type-id-1947'/>
-    <pointer-type-def type-id='type-id-1921' size-in-bits='64' id='type-id-1948'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1949' size-in-bits='64' id='type-id-1950'/>
-    <pointer-type-def type-id='type-id-1951' size-in-bits='64' id='type-id-1952'/>
-    <pointer-type-def type-id='type-id-1953' size-in-bits='64' id='type-id-1954'/>
-    <pointer-type-def type-id='type-id-1955' size-in-bits='64' id='type-id-1956'/>
-    <pointer-type-def type-id='type-id-1957' size-in-bits='64' id='type-id-1958'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1959' size-in-bits='64' id='type-id-1960'/>
-    <pointer-type-def type-id='type-id-1961' size-in-bits='64' id='type-id-1962'/>
-    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-229'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1840'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1963'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-1964'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1846'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-1847'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1965' visibility='default' is-declaration-only='yes' id='type-id-1966'/>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-1959' visibility='default' is-declaration-only='yes' id='type-id-1967'/>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1949'/>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1953'>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1848' visibility='default' is-declaration-only='yes' id='type-id-1849'/>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-1832' visibility='default' is-declaration-only='yes' id='type-id-1850'/>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1851'/>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1742'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorImSaImEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1954' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1957'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1748'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIhSaIhEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1958' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1749' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1921'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1827'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1948' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1948' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1948' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1923' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-1830' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1968'>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1951'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1838'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseImSaImEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1952' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseImSaImEE13_M_deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1952' is-artificial='yes'/>
-            <parameter type-id='type-id-650'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <parameter type-id='type-id-605'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1969'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1853'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1966' 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-1965'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1849' 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-1848'/>
         </member-type>
         <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-627'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-563'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1955'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1840'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIhSaIhEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1956' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIhSaIhEE13_M_deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1956' is-artificial='yes'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-201'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1970'>
+      <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1854'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1967' 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-1959'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1850' 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-1832'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIhEE10deallocateERS0_Phm' 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-1960'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-1833'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1971'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1855'>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIcE6lengthEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1094'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1178'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1098'/>
+            <parameter type-id='type-id-1093'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1961'>
+      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1842'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1962' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1843' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14450,370 +14335,370 @@
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1842'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1734'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-1735' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1844'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1744'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE10deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1845' is-artificial='yes'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-1745' is-artificial='yes'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1846'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1750'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIhE10deallocateEPhm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <parameter type-id='type-id-208'/>
+            <parameter type-id='type-id-1751' is-artificial='yes'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1972'>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1856'>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1973'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1857'>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1974'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1858'>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1946'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1764'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [79]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA79_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1947' is-artificial='yes'/>
-              <parameter type-id='type-id-1839'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1765' is-artificial='yes'/>
+              <parameter type-id='type-id-1729'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;std::__cxx11::basic_string&lt;char&gt; &gt;' mangled-name='_ZN10mongoutils3str6streamlsINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1947' is-artificial='yes'/>
-              <parameter type-id='type-id-232'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1765' is-artificial='yes'/>
+              <parameter type-id='type-id-229'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1884'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1730'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1942'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1835'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1924' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1731' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1943'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1836'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1924' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1731' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-1884'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1886' is-artificial='yes'/>
+            <parameter type-id='type-id-1818' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1924' is-artificial='yes'/>
-            <parameter type-id='type-id-497'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1731' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </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='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1943'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1836'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1924' is-artificial='yes'/>
-            <parameter type-id='type-id-798'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1731' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1887'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1732'>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1925' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1733' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1925' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1733' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1925' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1733' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1925' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1733' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1823' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1890'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1770'>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNK5mongo14ConstDataRange4dataEv' filepath='src/mongo/base/data_range.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1893' is-artificial='yes'/>
+            <parameter type-id='type-id-1810' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='length' mangled-name='_ZNK5mongo14ConstDataRange6lengthEv' filepath='src/mongo/base/data_range.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1893' is-artificial='yes'/>
+            <parameter type-id='type-id-1810' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcml' filepath='src/mongo/base/data_range.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
+            <parameter type-id='type-id-1771' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcS2_l' filepath='src/mongo/base/data_range.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
+            <parameter type-id='type-id-1771' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1927'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1760'>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1928' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1761' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1928' is-artificial='yes'/>
-            <parameter type-id='type-id-1894'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1761' is-artificial='yes'/>
+            <parameter type-id='type-id-1766'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='439' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1928' is-artificial='yes'/>
-            <parameter type-id='type-id-1894'/>
-            <return type-id='type-id-1067'/>
+            <parameter type-id='type-id-1761' is-artificial='yes'/>
+            <parameter type-id='type-id-1766'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1928' is-artificial='yes'/>
+            <parameter type-id='type-id-1761' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-1067'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1894'>
+      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1766'>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1896' is-artificial='yes'/>
+            <parameter type-id='type-id-1814' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1929' is-artificial='yes'/>
-            <parameter type-id='type-id-259'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1767' is-artificial='yes'/>
+            <parameter type-id='type-id-256'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1929' is-artificial='yes'/>
+            <parameter type-id='type-id-1767' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1897'>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1798'>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
-            <parameter type-id='type-id-1931'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
+            <parameter type-id='type-id-1845'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-306'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1930'/>
+            <return type-id='type-id-1844'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1975'/>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1900'>
+      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1859'/>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1772'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithIN5boost8optionalISt5tupleIJNS_14ConstDataRangeENS_14FTDCCompressor15CompressorStateENS_6Date_tEEEEEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1902' is-artificial='yes'/>
+            <parameter type-id='type-id-1819' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIN5boost8optionalISt5tupleIJNS_14ConstDataRangeENS_14FTDCCompressor15CompressorStateENS_6Date_tEEEEEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1932' is-artificial='yes'/>
-            <return type-id='type-id-1853'/>
+            <parameter type-id='type-id-1773' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1903'>
+      <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1780'>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEE4isOKEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1905' is-artificial='yes'/>
+            <parameter type-id='type-id-1822' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <return type-id='type-id-1950'/>
+            <parameter type-id='type-id-1781' is-artificial='yes'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1934'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1736'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~FTDCFileWriter' mangled-name='_ZN5mongo14FTDCFileWriterD2Ev' filepath='src/mongo/db/ftdc/file_writer.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriterD2Ev'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='close' mangled-name='_ZN5mongo14FTDCFileWriter5closeEv' filepath='src/mongo/db/ftdc/file_writer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter5closeEv'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZN5mongo14FTDCFileWriter4openERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/file_writer.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter4openERKN5boost10filesystem4pathE'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='writeInterimFileBuffer' mangled-name='_ZN5mongo14FTDCFileWriter22writeInterimFileBufferENS_14ConstDataRangeE' filepath='src/mongo/db/ftdc/file_writer.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter22writeInterimFileBufferENS_14ConstDataRangeE'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <parameter type-id='type-id-1890'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <parameter type-id='type-id-1770'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='writeArchiveFileBuffer' mangled-name='_ZN5mongo14FTDCFileWriter22writeArchiveFileBufferENS_14ConstDataRangeE' filepath='src/mongo/db/ftdc/file_writer.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter22writeArchiveFileBufferENS_14ConstDataRangeE'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <parameter type-id='type-id-1890'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <parameter type-id='type-id-1770'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='writeMetadata' mangled-name='_ZN5mongo14FTDCFileWriter13writeMetadataERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/file_writer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter13writeMetadataERKNS_7BSONObjENS_6Date_tE'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <parameter type-id='type-id-1664'/>
-            <parameter type-id='type-id-1975'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1859'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='writeSample' mangled-name='_ZN5mongo14FTDCFileWriter11writeSampleERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/file_writer.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter11writeSampleERKNS_7BSONObjENS_6Date_tE'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <parameter type-id='type-id-1664'/>
-            <parameter type-id='type-id-1975'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1859'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='flush' mangled-name='_ZN5mongo14FTDCFileWriter5flushERKN5boost8optionalINS_14ConstDataRangeEEENS_6Date_tE' filepath='src/mongo/db/ftdc/file_writer.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter5flushERKN5boost8optionalINS_14ConstDataRangeEEENS_6Date_tE'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <parameter type-id='type-id-1875'/>
-            <parameter type-id='type-id-1975'/>
-            <return type-id='type-id-1884'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <parameter type-id='type-id-1859'/>
+            <return type-id='type-id-1730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closeWithoutFlushForTest' mangled-name='_ZN5mongo14FTDCFileWriter24closeWithoutFlushForTestEv' filepath='src/mongo/db/ftdc/file_writer.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter24closeWithoutFlushForTestEv'>
-            <parameter type-id='type-id-1935' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1737' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1906'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1754'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1909'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1762'>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1937' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-1763' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1937' is-artificial='yes'/>
+                <parameter type-id='type-id-1763' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1911' is-artificial='yes'/>
+                <parameter type-id='type-id-1824' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -14821,145 +14706,145 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1936' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1755' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1906'/>
+            <return type-id='type-id-1754'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1906'/>
+            <return type-id='type-id-1754'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1908' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1936' is-artificial='yes'/>
+            <parameter type-id='type-id-1755' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1912'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1756'>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1939' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1757' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-1757' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1914' is-artificial='yes'/>
+            <parameter type-id='type-id-1813' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-1757' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1940'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1758'>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1941' is-artificial='yes'/>
+            <parameter type-id='type-id-1759' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1941' is-artificial='yes'/>
+            <parameter type-id='type-id-1759' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1941' is-artificial='yes'/>
+            <parameter type-id='type-id-1759' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1976'/>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1915'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1860'/>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1796'>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
+            <parameter type-id='type-id-1816' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
+            <parameter type-id='type-id-1816' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isEmpty' mangled-name='_ZNK5mongo7BSONObj7isEmptyEv' filepath='src/mongo/bson/bsonobj.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
+            <parameter type-id='type-id-1816' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1977'/>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1918'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1861'/>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1803'>
         <member-function access='public'>
           <function-decl name='getSampleCount' mangled-name='_ZNK5mongo14FTDCCompressor14getSampleCountEv' filepath='src/mongo/db/ftdc/compressor.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-1821' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='hasDataToFlush' mangled-name='_ZNK5mongo14FTDCCompressor14hasDataToFlushEv' filepath='src/mongo/db/ftdc/compressor.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-1821' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1978'>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1862'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1979'>
+          <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-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1980'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1864'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1931'/>
+                <parameter type-id='type-id-1845'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -14968,498 +14853,489 @@
           <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-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1931'/>
+            <parameter type-id='type-id-1845'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1930'/>
+      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1844'/>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1944'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1787'>
           <member-function access='public'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1945' is-artificial='yes'/>
-              <parameter type-id='type-id-241'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1788' is-artificial='yes'/>
+              <parameter type-id='type-id-238'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1848'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1740'>
         <member-type access='private'>
-          <typedef-decl name='argument_type' type-id='type-id-1982' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-1981'/>
+          <typedef-decl name='argument_type' type-id='type-id-1866' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-1865'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ENS_6none_tE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='790' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
-            <parameter type-id='type-id-1983'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <parameter type-id='type-id-1867'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ERKS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
-            <parameter type-id='type-id-1981'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <parameter type-id='type-id-1865'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1850'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1746'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-997'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-998'/>
-            <return type-id='type-id-997'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1877' is-artificial='yes'/>
+            <parameter type-id='type-id-1811' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1877' is-artificial='yes'/>
+            <parameter type-id='type-id-1811' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <return type-id='type-id-1938'/>
+            <parameter type-id='type-id-1811' is-artificial='yes'/>
+            <return type-id='type-id-1786'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1852'/>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1854'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1868'/>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1774'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1985' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1984'/>
+          <typedef-decl name='reference_type' type-id='type-id-1870' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1869'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalINS0_ISt5tupleIJN5mongo14ConstDataRangeENS2_14FTDCCompressor15CompressorStateENS2_6Date_tEEEEEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1855' is-artificial='yes'/>
-            <return type-id='type-id-1984'/>
+            <parameter type-id='type-id-1775' is-artificial='yes'/>
+            <return type-id='type-id-1869'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalINS0_ISt5tupleIJN5mongo14ConstDataRangeENS2_14FTDCCompressor15CompressorStateENS2_6Date_tEEEEEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1855' is-artificial='yes'/>
-            <return type-id='type-id-1984'/>
+            <parameter type-id='type-id-1775' is-artificial='yes'/>
+            <return type-id='type-id-1869'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1856'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1784'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-1987' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1986'/>
+          <typedef-decl name='reference_type' type-id='type-id-1872' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-1871'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_6Date_tEEEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1857' is-artificial='yes'/>
-            <return type-id='type-id-1986'/>
+            <parameter type-id='type-id-1785' is-artificial='yes'/>
+            <return type-id='type-id-1871'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalISt5tupleIJN5mongo14ConstDataRangeENS2_6Date_tEEEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1857' is-artificial='yes'/>
-            <return type-id='type-id-1986'/>
+            <parameter type-id='type-id-1785' is-artificial='yes'/>
+            <return type-id='type-id-1871'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1983'/>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1867'/>
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1858'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1752'>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1860' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1753' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='c_str' mangled-name='_ZNK5boost10filesystem4path5c_strEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1879' is-artificial='yes'/>
-              <return type-id='type-id-1563'/>
+              <parameter type-id='type-id-1809' is-artificial='yes'/>
+              <return type-id='type-id-1458'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSEOS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1860' is-artificial='yes'/>
-              <parameter type-id='type-id-1859'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1753' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1861'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1738'>
           <member-type access='private'>
-            <typedef-decl name='argument_type' type-id='type-id-1988' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-1982'/>
+            <typedef-decl name='argument_type' type-id='type-id-1873' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-1866'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ENS_6none_tE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1862' is-artificial='yes'/>
-              <parameter type-id='type-id-1983'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1739' is-artificial='yes'/>
+              <parameter type-id='type-id-1867'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE9constructERKS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1862' is-artificial='yes'/>
-              <parameter type-id='type-id-1982'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1739' is-artificial='yes'/>
+              <parameter type-id='type-id-1866'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ERKS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1862' is-artificial='yes'/>
-              <parameter type-id='type-id-1982'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1739' is-artificial='yes'/>
+              <parameter type-id='type-id-1866'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1863'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1776'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1989' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1985'/>
+            <typedef-decl name='reference_type' type-id='type-id-1874' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1870'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseINS_8optionalISt5tupleIJN5mongo14ConstDataRangeENS4_14FTDCCompressor15CompressorStateENS4_6Date_tEEEEEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1864' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1777' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseINS_8optionalISt5tupleIJN5mongo14ConstDataRangeENS4_14FTDCCompressor15CompressorStateENS4_6Date_tEEEEEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1864' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1777' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseINS_8optionalISt5tupleIJN5mongo14ConstDataRangeENS4_14FTDCCompressor15CompressorStateENS4_6Date_tEEEEEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1864' is-artificial='yes'/>
-              <parameter type-id='type-id-1990'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1777' is-artificial='yes'/>
+              <parameter type-id='type-id-1875'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1865'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1778'>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_14FTDCCompressor15CompressorStateENS3_6Date_tEEEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1881' is-artificial='yes'/>
+              <parameter type-id='type-id-1820' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_14FTDCCompressor15CompressorStateENS3_6Date_tEEEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1866' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1779' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_14FTDCCompressor15CompressorStateENS3_6Date_tEEEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1866' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1779' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_14FTDCCompressor15CompressorStateENS3_6Date_tEEEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1866' is-artificial='yes'/>
-              <parameter type-id='type-id-1990'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1779' is-artificial='yes'/>
+              <parameter type-id='type-id-1875'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1867'>
+        <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1782'>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-1991' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1987'/>
+            <typedef-decl name='reference_type' type-id='type-id-1876' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='227' column='1' id='type-id-1872'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1868' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1783' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1868' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1783' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt5tupleIJN5mongo14ConstDataRangeENS3_6Date_tEEEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1868' is-artificial='yes'/>
-              <parameter type-id='type-id-1990'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1783' is-artificial='yes'/>
+              <parameter type-id='type-id-1875'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1992'>
+        <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1877'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1853' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1989'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1874'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1993'>
+        <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1878'>
           <member-type access='public'>
-            <typedef-decl name='argument_type' type-id='type-id-1892' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-1988'/>
+            <typedef-decl name='argument_type' type-id='type-id-164' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-1873'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1994'>
+        <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1879'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1950' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1991'/>
+            <typedef-decl name='reference_type' type-id='type-id-115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-1876'/>
           </member-type>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='system'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1869'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1768'>
           <member-function access='public'>
             <function-decl name='error_code' mangled-name='_ZN5boost6system10error_codeC2Ev' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1870' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1769' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator void (*)()' mangled-name='_ZNK5boost6system10error_codecvPFvvEEv' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1883' is-artificial='yes'/>
-              <return type-id='type-id-1546'/>
+              <parameter type-id='type-id-1815' is-artificial='yes'/>
+              <return type-id='type-id-1441'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='message' mangled-name='_ZNK5boost6system10error_code7messageB5cxx11Ev' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1883' is-artificial='yes'/>
-              <return type-id='type-id-257'/>
+              <parameter type-id='type-id-1815' is-artificial='yes'/>
+              <return type-id='type-id-254'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-1995' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1990'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-1880' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-1875'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1995' visibility='default' is-declaration-only='yes' id='type-id-1996'/>
-      <typedef-decl name='false_' type-id='type-id-1996' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1995'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-1880' visibility='default' is-declaration-only='yes' id='type-id-1881'/>
+      <typedef-decl name='false_' type-id='type-id-1881' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-1880'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/util.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-1997'>
-      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-4' id='type-id-1998'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-1882'>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-4' id='type-id-1883'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1999'>
-      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-2000'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1884'>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-1885'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='32' id='type-id-2001'>
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-2002'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='32' id='type-id-1886'>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-1887'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='40' id='type-id-2003'>
-      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-2004'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='40' id='type-id-1888'>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-1889'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='48' id='type-id-2005'>
-      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-4' id='type-id-2006'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='48' id='type-id-1890'>
+      <subrange length='6' lower-bound='0' upper-bound='5' type-id='type-id-4' id='type-id-1891'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='56' id='type-id-2007'>
-      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-4' id='type-id-1998'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='56' id='type-id-1892'>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-4' id='type-id-1883'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-2008'>
-      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-2000'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-1893'>
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-4' id='type-id-1885'/>
     </array-type-def>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-2009'/>
-    <qualified-type-def type-id='type-id-447' const='yes' id='type-id-2010'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2010' size-in-bits='64' id='type-id-2011'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2007' size-in-bits='64' id='type-id-2012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2008' size-in-bits='64' id='type-id-2013'/>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-2014'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2014' size-in-bits='64' id='type-id-2015'/>
-    <reference-type-def kind='lvalue' type-id='type-id-16' size-in-bits='64' id='type-id-2016'/>
-    <reference-type-def kind='rvalue' type-id='type-id-19' size-in-bits='64' id='type-id-2017'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-2018'/>
-    <pointer-type-def type-id='type-id-2009' size-in-bits='64' id='type-id-2019'/>
-    <reference-type-def kind='rvalue' type-id='type-id-45' size-in-bits='64' id='type-id-2020'/>
-    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-2021'/>
-    <pointer-type-def type-id='type-id-2022' 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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2030' size-in-bits='64' id='type-id-2031'/>
-    <pointer-type-def type-id='type-id-2030' size-in-bits='64' id='type-id-2032'/>
-    <pointer-type-def type-id='type-id-2033' size-in-bits='64' id='type-id-2034'/>
-    <pointer-type-def type-id='type-id-2035' 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'/>
-    <pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-2046'/>
-    <pointer-type-def type-id='type-id-2047' size-in-bits='64' id='type-id-2048'/>
-    <pointer-type-def type-id='type-id-2049' size-in-bits='64' id='type-id-2050'/>
-    <pointer-type-def type-id='type-id-2051' size-in-bits='64' id='type-id-2052'/>
-    <qualified-type-def type-id='type-id-2022' const='yes' id='type-id-2053'/>
-    <pointer-type-def type-id='type-id-2053' size-in-bits='64' id='type-id-2054'/>
-    <qualified-type-def type-id='type-id-2054' restrict='yes' id='type-id-2055'/>
-    <qualified-type-def type-id='type-id-2030' const='yes' id='type-id-2056'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-1894'/>
+    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-1895'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1895' size-in-bits='64' id='type-id-1896'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1892' size-in-bits='64' id='type-id-1897'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1893' size-in-bits='64' id='type-id-1898'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1899'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1899' size-in-bits='64' id='type-id-1900'/>
+    <reference-type-def kind='lvalue' type-id='type-id-16' size-in-bits='64' id='type-id-1901'/>
+    <reference-type-def kind='rvalue' type-id='type-id-19' size-in-bits='64' id='type-id-1902'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-1903'/>
+    <pointer-type-def type-id='type-id-1894' size-in-bits='64' id='type-id-1904'/>
+    <reference-type-def kind='rvalue' type-id='type-id-45' size-in-bits='64' id='type-id-1905'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-1906'/>
+    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1908'/>
+    <pointer-type-def type-id='type-id-1909' size-in-bits='64' id='type-id-1910'/>
+    <pointer-type-def type-id='type-id-1911' 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-1916'/>
+    <pointer-type-def type-id='type-id-1917' size-in-bits='64' id='type-id-1918'/>
+    <pointer-type-def type-id='type-id-1919' size-in-bits='64' id='type-id-1920'/>
+    <pointer-type-def type-id='type-id-1921' size-in-bits='64' id='type-id-1922'/>
+    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1923'/>
+    <pointer-type-def type-id='type-id-1924' size-in-bits='64' id='type-id-1925'/>
+    <pointer-type-def type-id='type-id-1926' size-in-bits='64' id='type-id-1927'/>
+    <pointer-type-def type-id='type-id-1928' size-in-bits='64' id='type-id-1929'/>
+    <pointer-type-def type-id='type-id-1930' size-in-bits='64' id='type-id-1931'/>
+    <pointer-type-def type-id='type-id-1932' size-in-bits='64' id='type-id-1933'/>
+    <pointer-type-def type-id='type-id-1934' size-in-bits='64' id='type-id-1935'/>
+    <pointer-type-def type-id='type-id-1936' size-in-bits='64' id='type-id-1937'/>
+    <pointer-type-def type-id='type-id-1938' size-in-bits='64' id='type-id-1939'/>
+    <pointer-type-def type-id='type-id-1940' size-in-bits='64' id='type-id-1941'/>
+    <pointer-type-def type-id='type-id-1942' size-in-bits='64' id='type-id-1943'/>
+    <pointer-type-def type-id='type-id-1944' size-in-bits='64' id='type-id-1945'/>
+    <pointer-type-def type-id='type-id-1946' size-in-bits='64' id='type-id-1947'/>
+    <pointer-type-def type-id='type-id-1948' size-in-bits='64' id='type-id-1949'/>
+    <pointer-type-def type-id='type-id-1950' size-in-bits='64' id='type-id-1951'/>
+    <pointer-type-def type-id='type-id-1952' size-in-bits='64' id='type-id-1953'/>
+    <pointer-type-def type-id='type-id-1954' size-in-bits='64' id='type-id-1955'/>
+    <pointer-type-def type-id='type-id-1954' size-in-bits='64' id='type-id-1956'/>
+    <pointer-type-def type-id='type-id-1957' size-in-bits='64' id='type-id-1958'/>
+    <pointer-type-def type-id='type-id-1959' size-in-bits='64' id='type-id-1960'/>
+    <pointer-type-def type-id='type-id-1961' size-in-bits='64' id='type-id-1962'/>
+    <pointer-type-def type-id='type-id-1963' size-in-bits='64' id='type-id-1964'/>
+    <pointer-type-def type-id='type-id-1965' size-in-bits='64' id='type-id-1966'/>
+    <pointer-type-def type-id='type-id-1967' size-in-bits='64' id='type-id-1968'/>
+    <pointer-type-def type-id='type-id-1969' size-in-bits='64' id='type-id-1970'/>
+    <pointer-type-def type-id='type-id-1971' size-in-bits='64' id='type-id-1972'/>
+    <pointer-type-def type-id='type-id-1973' size-in-bits='64' id='type-id-1974'/>
+    <pointer-type-def type-id='type-id-1975' size-in-bits='64' id='type-id-1976'/>
+    <pointer-type-def type-id='type-id-1977' size-in-bits='64' id='type-id-1978'/>
+    <pointer-type-def type-id='type-id-1979' size-in-bits='64' id='type-id-1980'/>
+    <pointer-type-def type-id='type-id-1981' size-in-bits='64' id='type-id-1982'/>
+    <pointer-type-def type-id='type-id-1983' size-in-bits='64' id='type-id-1984'/>
+    <pointer-type-def type-id='type-id-1985' size-in-bits='64' id='type-id-1986'/>
+    <pointer-type-def type-id='type-id-1987' size-in-bits='64' id='type-id-1988'/>
+    <pointer-type-def type-id='type-id-1961' size-in-bits='64' id='type-id-1989'/>
+    <pointer-type-def type-id='type-id-1990' size-in-bits='64' id='type-id-1991'/>
+    <pointer-type-def type-id='type-id-1992' size-in-bits='64' id='type-id-1993'/>
+    <pointer-type-def type-id='type-id-1994' size-in-bits='64' id='type-id-1995'/>
+    <qualified-type-def type-id='type-id-1911' const='yes' id='type-id-1996'/>
+    <qualified-type-def type-id='type-id-1940' const='yes' id='type-id-1997'/>
+    <qualified-type-def type-id='type-id-1907' const='yes' id='type-id-1998'/>
+    <qualified-type-def type-id='type-id-1957' const='yes' id='type-id-1999'/>
+    <qualified-type-def type-id='type-id-2000' const='yes' id='type-id-2001'/>
+    <qualified-type-def type-id='type-id-2002' const='yes' id='type-id-2003'/>
+    <qualified-type-def type-id='type-id-1930' const='yes' id='type-id-2004'/>
+    <qualified-type-def type-id='type-id-1944' const='yes' id='type-id-2005'/>
+    <qualified-type-def type-id='type-id-1954' const='yes' id='type-id-2006'/>
+    <qualified-type-def type-id='type-id-1934' const='yes' id='type-id-2007'/>
+    <qualified-type-def type-id='type-id-1936' const='yes' id='type-id-2008'/>
+    <qualified-type-def type-id='type-id-1959' const='yes' id='type-id-2009'/>
+    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-2010'/>
+    <qualified-type-def type-id='type-id-1979' const='yes' id='type-id-2011'/>
+    <qualified-type-def type-id='type-id-1973' const='yes' id='type-id-2012'/>
+    <qualified-type-def type-id='type-id-1977' const='yes' id='type-id-2013'/>
+    <qualified-type-def type-id='type-id-1942' const='yes' id='type-id-2014'/>
+    <qualified-type-def type-id='type-id-1961' const='yes' id='type-id-2015'/>
+    <pointer-type-def type-id='type-id-1996' size-in-bits='64' id='type-id-2016'/>
+    <pointer-type-def type-id='type-id-1999' size-in-bits='64' id='type-id-2017'/>
+    <pointer-type-def type-id='type-id-1997' size-in-bits='64' id='type-id-2018'/>
+    <pointer-type-def type-id='type-id-2001' size-in-bits='64' id='type-id-2019'/>
+    <pointer-type-def type-id='type-id-2003' size-in-bits='64' id='type-id-2020'/>
+    <pointer-type-def type-id='type-id-2004' size-in-bits='64' id='type-id-2021'/>
+    <pointer-type-def type-id='type-id-2005' size-in-bits='64' id='type-id-2022'/>
+    <pointer-type-def type-id='type-id-1998' size-in-bits='64' id='type-id-2023'/>
+    <pointer-type-def type-id='type-id-2006' size-in-bits='64' id='type-id-2024'/>
+    <pointer-type-def type-id='type-id-2007' size-in-bits='64' id='type-id-2025'/>
+    <pointer-type-def type-id='type-id-2008' size-in-bits='64' id='type-id-2026'/>
+    <pointer-type-def type-id='type-id-2009' size-in-bits='64' id='type-id-2027'/>
+    <pointer-type-def type-id='type-id-2010' size-in-bits='64' id='type-id-2028'/>
+    <pointer-type-def type-id='type-id-2012' size-in-bits='64' id='type-id-2029'/>
+    <pointer-type-def type-id='type-id-2013' size-in-bits='64' id='type-id-2030'/>
+    <pointer-type-def type-id='type-id-2014' size-in-bits='64' id='type-id-2031'/>
+    <pointer-type-def type-id='type-id-2015' size-in-bits='64' id='type-id-2032'/>
+    <qualified-type-def type-id='type-id-2033' const='yes' id='type-id-2034'/>
+    <pointer-type-def type-id='type-id-2034' size-in-bits='64' id='type-id-2035'/>
+    <qualified-type-def type-id='type-id-2036' const='yes' id='type-id-2037'/>
+    <qualified-type-def type-id='type-id-2038' const='yes' id='type-id-2039'/>
+    <qualified-type-def type-id='type-id-2040' const='yes' id='type-id-2041'/>
+    <qualified-type-def type-id='type-id-2042' const='yes' id='type-id-2043'/>
+    <qualified-type-def type-id='type-id-2044' const='yes' id='type-id-2045'/>
+    <qualified-type-def type-id='type-id-2046' const='yes' id='type-id-2047'/>
+    <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2048'/>
+    <pointer-type-def type-id='type-id-2039' size-in-bits='64' id='type-id-2049'/>
+    <pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-2050'/>
+    <qualified-type-def type-id='type-id-2048' restrict='yes' id='type-id-2051'/>
+    <pointer-type-def type-id='type-id-2033' size-in-bits='64' id='type-id-2052'/>
+    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2036'/>
+    <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-2053'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-2042' size-in-bits='64' id='type-id-2054'/>
+    <pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-2055'/>
     <pointer-type-def type-id='type-id-2056' size-in-bits='64' id='type-id-2057'/>
-    <qualified-type-def type-id='type-id-2041' const='yes' id='type-id-2058'/>
-    <pointer-type-def type-id='type-id-2058' size-in-bits='64' id='type-id-2059'/>
-    <qualified-type-def type-id='type-id-2049' const='yes' id='type-id-2060'/>
-    <pointer-type-def type-id='type-id-2060' size-in-bits='64' id='type-id-2061'/>
-    <qualified-type-def type-id='type-id-2062' const='yes' id='type-id-2063'/>
+    <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-2058'/>
+    <pointer-type-def type-id='type-id-2059' size-in-bits='64' id='type-id-2060'/>
+    <pointer-type-def type-id='type-id-2061' size-in-bits='64' id='type-id-2062'/>
     <pointer-type-def type-id='type-id-2063' size-in-bits='64' id='type-id-2064'/>
-    <qualified-type-def type-id='type-id-2065' const='yes' id='type-id-2066'/>
-    <pointer-type-def type-id='type-id-2066' size-in-bits='64' id='type-id-2067'/>
-    <qualified-type-def type-id='type-id-2068' const='yes' id='type-id-2069'/>
-    <qualified-type-def type-id='type-id-2070' const='yes' id='type-id-2071'/>
-    <pointer-type-def type-id='type-id-2071' size-in-bits='64' id='type-id-2072'/>
-    <qualified-type-def type-id='type-id-2073' const='yes' id='type-id-2074'/>
-    <pointer-type-def type-id='type-id-2074' size-in-bits='64' id='type-id-2075'/>
-    <qualified-type-def type-id='type-id-2076' const='yes' id='type-id-2077'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2077' size-in-bits='64' id='type-id-2078'/>
-    <qualified-type-def type-id='type-id-2079' const='yes' id='type-id-2080'/>
-    <pointer-type-def type-id='type-id-2080' size-in-bits='64' id='type-id-2081'/>
-    <qualified-type-def type-id='type-id-2082' const='yes' id='type-id-2083'/>
-    <pointer-type-def type-id='type-id-2083' size-in-bits='64' id='type-id-2084'/>
-    <qualified-type-def type-id='type-id-2085' const='yes' id='type-id-2086'/>
-    <pointer-type-def type-id='type-id-2086' size-in-bits='64' id='type-id-2087'/>
-    <qualified-type-def type-id='type-id-2088' const='yes' id='type-id-2089'/>
-    <pointer-type-def type-id='type-id-2089' size-in-bits='64' id='type-id-2090'/>
-    <qualified-type-def type-id='type-id-2091' const='yes' id='type-id-2092'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2092' size-in-bits='64' id='type-id-2093'/>
-    <pointer-type-def type-id='type-id-2092' size-in-bits='64' id='type-id-2094'/>
-    <qualified-type-def type-id='type-id-2095' const='yes' id='type-id-2096'/>
-    <pointer-type-def type-id='type-id-2096' size-in-bits='64' id='type-id-2097'/>
-    <qualified-type-def type-id='type-id-2098' const='yes' id='type-id-2099'/>
-    <pointer-type-def type-id='type-id-2099' size-in-bits='64' id='type-id-2100'/>
-    <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'/>
-    <qualified-type-def type-id='type-id-2104' const='yes' id='type-id-2105'/>
-    <pointer-type-def type-id='type-id-2105' size-in-bits='64' id='type-id-2106'/>
-    <qualified-type-def type-id='type-id-2107' const='yes' id='type-id-2108'/>
-    <pointer-type-def type-id='type-id-2108' size-in-bits='64' id='type-id-2109'/>
-    <qualified-type-def type-id='type-id-2110' const='yes' id='type-id-2111'/>
-    <qualified-type-def type-id='type-id-2112' const='yes' id='type-id-2113'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2113' size-in-bits='64' id='type-id-2114'/>
-    <pointer-type-def type-id='type-id-2113' size-in-bits='64' id='type-id-2115'/>
-    <qualified-type-def type-id='type-id-2116' const='yes' id='type-id-2117'/>
-    <pointer-type-def type-id='type-id-2117' size-in-bits='64' id='type-id-2118'/>
-    <qualified-type-def type-id='type-id-2119' const='yes' id='type-id-2120'/>
-    <pointer-type-def type-id='type-id-2120' size-in-bits='64' id='type-id-2121'/>
-    <qualified-type-def type-id='type-id-2122' const='yes' id='type-id-2123'/>
-    <pointer-type-def type-id='type-id-2123' size-in-bits='64' id='type-id-2124'/>
-    <pointer-type-def type-id='type-id-2062' size-in-bits='64' id='type-id-2125'/>
-    <pointer-type-def type-id='type-id-2126' size-in-bits='64' id='type-id-2127'/>
-    <pointer-type-def type-id='type-id-2065' size-in-bits='64' id='type-id-2128'/>
-    <pointer-type-def type-id='type-id-2129' size-in-bits='64' id='type-id-2130'/>
-    <pointer-type-def type-id='type-id-2068' size-in-bits='64' id='type-id-2131'/>
-    <pointer-type-def type-id='type-id-2073' size-in-bits='64' id='type-id-2132'/>
-    <pointer-type-def type-id='type-id-2076' size-in-bits='64' id='type-id-2133'/>
-    <pointer-type-def type-id='type-id-2134' size-in-bits='64' id='type-id-2135'/>
-    <pointer-type-def type-id='type-id-2079' size-in-bits='64' id='type-id-2136'/>
-    <pointer-type-def type-id='type-id-2082' size-in-bits='64' id='type-id-2137'/>
-    <pointer-type-def type-id='type-id-2085' size-in-bits='64' id='type-id-2138'/>
-    <pointer-type-def type-id='type-id-2085' size-in-bits='64' id='type-id-2139'/>
-    <pointer-type-def type-id='type-id-2140' size-in-bits='64' id='type-id-2141'/>
-    <pointer-type-def type-id='type-id-2088' size-in-bits='64' id='type-id-2142'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2091' size-in-bits='64' id='type-id-2143'/>
-    <pointer-type-def type-id='type-id-2091' size-in-bits='64' id='type-id-2144'/>
-    <pointer-type-def type-id='type-id-2145' size-in-bits='64' id='type-id-2146'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2095' size-in-bits='64' id='type-id-2147'/>
-    <pointer-type-def type-id='type-id-2095' size-in-bits='64' id='type-id-2148'/>
-    <pointer-type-def type-id='type-id-2095' size-in-bits='64' id='type-id-2149'/>
-    <pointer-type-def type-id='type-id-2098' size-in-bits='64' id='type-id-2150'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2151' size-in-bits='64' id='type-id-2152'/>
-    <pointer-type-def type-id='type-id-2151' size-in-bits='64' id='type-id-2153'/>
-    <pointer-type-def type-id='type-id-2154' size-in-bits='64' id='type-id-2155'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2104' size-in-bits='64' id='type-id-2156'/>
-    <pointer-type-def type-id='type-id-2104' size-in-bits='64' id='type-id-2157'/>
-    <pointer-type-def type-id='type-id-2158' size-in-bits='64' id='type-id-2159'/>
-    <pointer-type-def type-id='type-id-2160' size-in-bits='64' id='type-id-2161'/>
-    <pointer-type-def type-id='type-id-2107' size-in-bits='64' id='type-id-2162'/>
-    <pointer-type-def type-id='type-id-2163' size-in-bits='64' id='type-id-2164'/>
-    <pointer-type-def type-id='type-id-2165' size-in-bits='64' id='type-id-2166'/>
-    <pointer-type-def type-id='type-id-2167' size-in-bits='64' id='type-id-2168'/>
-    <pointer-type-def type-id='type-id-2169' size-in-bits='64' id='type-id-2170'/>
-    <pointer-type-def type-id='type-id-2171' size-in-bits='64' id='type-id-2172'/>
-    <pointer-type-def type-id='type-id-2173' size-in-bits='64' id='type-id-2174'/>
-    <pointer-type-def type-id='type-id-2175' size-in-bits='64' id='type-id-2176'/>
-    <pointer-type-def type-id='type-id-2177' size-in-bits='64' id='type-id-2178'/>
-    <pointer-type-def type-id='type-id-2110' size-in-bits='64' id='type-id-2179'/>
-    <pointer-type-def type-id='type-id-2112' size-in-bits='64' id='type-id-2180'/>
-    <pointer-type-def type-id='type-id-2112' size-in-bits='64' id='type-id-2181'/>
-    <pointer-type-def type-id='type-id-2182' size-in-bits='64' id='type-id-2183'/>
-    <pointer-type-def type-id='type-id-2119' size-in-bits='64' id='type-id-2184'/>
-    <pointer-type-def type-id='type-id-2185' size-in-bits='64' id='type-id-2186'/>
-    <pointer-type-def type-id='type-id-2187' size-in-bits='64' id='type-id-2188'/>
-    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-231'/>
-    <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2022'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-2189'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-2190'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-2065'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-2066'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator_type' naming-typedef-id='type-id-2191' visibility='default' is-declaration-only='yes' id='type-id-2192'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2112'>
+      <class-decl name='allocator_type' naming-typedef-id='type-id-2067' visibility='default' is-declaration-only='yes' id='type-id-2068'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1907'>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2194' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-2193'/>
+          <typedef-decl name='const_reference' type-id='type-id-2070' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-2069'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;unsigned int&gt;' mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJjEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2181' is-artificial='yes'/>
-            <parameter type-id='type-id-2020'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1923' is-artificial='yes'/>
+            <parameter type-id='type-id-1905'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;long long&gt;' mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJxEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2181' is-artificial='yes'/>
-            <parameter type-id='type-id-2017'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1923' is-artificial='yes'/>
+            <parameter type-id='type-id-1902'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;bool&gt;' mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJbEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2181' is-artificial='yes'/>
-            <parameter type-id='type-id-1171'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1923' is-artificial='yes'/>
+            <parameter type-id='type-id-1086'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorImSaImEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2115' is-artificial='yes'/>
+            <parameter type-id='type-id-2023' is-artificial='yes'/>
             <return type-id='type-id-40'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorImSaImEEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2115' is-artificial='yes'/>
+            <parameter type-id='type-id-2023' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2193'/>
+            <return type-id='type-id-2069'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorImSaImEE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2115' is-artificial='yes'/>
+            <parameter type-id='type-id-2023' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-40'/>
@@ -15467,222 +15343,222 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;long long&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_'>
-            <parameter type-id='type-id-2181' is-artificial='yes'/>
-            <parameter type-id='type-id-2017'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1923' is-artificial='yes'/>
+            <parameter type-id='type-id-1902'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;bool&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJbEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJbEEEvDpOT_'>
-            <parameter type-id='type-id-2181' is-artificial='yes'/>
-            <parameter type-id='type-id-1171'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1923' is-artificial='yes'/>
+            <parameter type-id='type-id-1086'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;unsigned int&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_'>
-            <parameter type-id='type-id-2181' is-artificial='yes'/>
-            <parameter type-id='type-id-2020'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1923' is-artificial='yes'/>
+            <parameter type-id='type-id-1905'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2195'/>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2116'>
+      <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2071'/>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2002'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2196'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2072'>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2118' is-artificial='yes'/>
-            <return type-id='type-id-942'/>
+            <parameter type-id='type-id-2020' is-artificial='yes'/>
+            <return type-id='type-id-864'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2118' is-artificial='yes'/>
+            <parameter type-id='type-id-2020' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2118' is-artificial='yes'/>
-            <return type-id='type-id-945'/>
+            <parameter type-id='type-id-2020' is-artificial='yes'/>
+            <return type-id='type-id-867'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2185'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1952'>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo14BSONObjBuilderESt14default_deleteIS1_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2186' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1953' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2197'>
+      <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-216'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2182'>
+      <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2063'>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseImSaImEE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2183' is-artificial='yes'/>
+            <parameter type-id='type-id-2064' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-650'/>
+            <return type-id='type-id-605'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseImSaImEE13_M_deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2183' is-artificial='yes'/>
-            <parameter type-id='type-id-650'/>
+            <parameter type-id='type-id-2064' is-artificial='yes'/>
+            <parameter type-id='type-id-605'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2198'>
+      <class-decl name='__anonymous_struct__11' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2074'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;unsigned long&gt;' mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mImEEPT_PKS3_S6_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-453'/>
-            <parameter type-id='type-id-453'/>
-            <parameter type-id='type-id-455'/>
-            <return type-id='type-id-455'/>
+            <parameter type-id='type-id-440'/>
+            <parameter type-id='type-id-440'/>
+            <parameter type-id='type-id-441'/>
+            <return type-id='type-id-441'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2199'>
+      <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2075'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;unsigned long *&gt;, unsigned long *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPmES3_EET0_T_S6_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2195'/>
-            <parameter type-id='type-id-2195'/>
-            <parameter type-id='type-id-455'/>
-            <return type-id='type-id-455'/>
+            <parameter type-id='type-id-2071'/>
+            <parameter type-id='type-id-2071'/>
+            <parameter type-id='type-id-441'/>
+            <return type-id='type-id-441'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2200'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2076'>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIcE6lengthEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1094'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1184'/>
-            <parameter type-id='type-id-1178'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1098'/>
+            <parameter type-id='type-id-1093'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1185'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1099'/>
+            <parameter type-id='type-id-1094'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-1185'/>
+            <return type-id='type-id-1099'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2201'>
+      <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2077'>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2202'>
+      <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2078'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-2192' 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-2191'/>
+          <typedef-decl name='allocator_type' type-id='type-id-2068' 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-2067'/>
         </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-455'/>
-            <parameter type-id='type-id-1171'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-1086'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-455'/>
-            <parameter type-id='type-id-2017'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-1902'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-455'/>
-            <parameter type-id='type-id-2020'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-1905'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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-40'/>
-            <return type-id='type-id-660'/>
+            <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-660'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2119'>
+      <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2044'>
         <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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2184' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-2058' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </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/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2184' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-2058' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' mangled-name='_ZNSt13__atomic_baseIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2184' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2058' is-artificial='yes'/>
+            <parameter type-id='type-id-206'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNKSt13__atomic_baseIjE4loadESt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2121' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-209'/>
+            <parameter type-id='type-id-2050' is-artificial='yes'/>
+            <parameter type-id='type-id-196'/>
+            <return type-id='type-id-206'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2122'>
+      <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2038'>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2124' is-artificial='yes'/>
-            <parameter type-id='type-id-2148'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2049' is-artificial='yes'/>
+            <parameter type-id='type-id-1955'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2187'>
+      <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2061'>
         <member-function access='public'>
           <function-decl name='atomic' mangled-name='_ZNSt6atomicIjEC2Ej' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2188' is-artificial='yes'/>
-            <parameter type-id='type-id-210'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2062' is-artificial='yes'/>
+            <parameter type-id='type-id-207'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -15690,626 +15566,626 @@
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2024'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1913'>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2025' is-artificial='yes'/>
-            <parameter type-id='type-id-216'/>
+            <parameter type-id='type-id-1914' is-artificial='yes'/>
+            <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2026'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1932'>
         <member-function access='public'>
           <function-decl name='construct&lt;unsigned long, bool&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJbEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2027' is-artificial='yes'/>
-            <parameter type-id='type-id-455'/>
-            <parameter type-id='type-id-1171'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-1086'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;unsigned long, long long&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJxEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2027' is-artificial='yes'/>
-            <parameter type-id='type-id-455'/>
-            <parameter type-id='type-id-2017'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-1902'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;unsigned long, unsigned int&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJjEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2027' is-artificial='yes'/>
-            <parameter type-id='type-id-455'/>
-            <parameter type-id='type-id-2020'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-441'/>
+            <parameter type-id='type-id-1905'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2027' is-artificial='yes'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-660'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorImE10deallocateEPmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2027' is-artificial='yes'/>
-            <parameter type-id='type-id-660'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2203'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2079'>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2204'>
+      <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2080'>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-2011' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-2194'/>
+          <typedef-decl name='const_reference' type-id='type-id-1896' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-2070'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2110'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1979'>
           <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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-2013'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-1898'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;std::__cxx11::basic_string&lt;char&gt; &gt;' mangled-name='_ZN10mongoutils3str6streamlsINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-232'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-229'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [36]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA36_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-702'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-658'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;long long&gt;' mangled-name='_ZN10mongoutils3str6streamlsIxEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-2015'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-1900'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [2]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA2_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-1175'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-1090'/>
+              <return type-id='type-id-115'/>
             </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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-2012'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-1897'/>
+              <return type-id='type-id-115'/>
             </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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2179' is-artificial='yes'/>
-              <parameter type-id='type-id-1565'/>
-              <return type-id='type-id-180'/>
+              <parameter type-id='type-id-1980' is-artificial='yes'/>
+              <parameter type-id='type-id-1460'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='BufBuilder' naming-typedef-id='type-id-2205' visibility='default' is-declaration-only='yes' id='type-id-2062'>
+      <class-decl name='BufBuilder' naming-typedef-id='type-id-2081' visibility='default' is-declaration-only='yes' id='type-id-2033'>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='skip' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE4skipEi' filepath='src/mongo/bson/util/builder.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserveBytes' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE12reserveBytesEi' filepath='src/mongo/bson/util/builder.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE7releaseEv' filepath='src/mongo/bson/util/builder.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
-            <return type-id='type-id-2082'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
+            <return type-id='type-id-1936'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendNumImpl&lt;char&gt;' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIcEEvT_' filepath='src/mongo/bson/util/builder.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendNum' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEc' filepath='src/mongo/bson/util/builder.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendStr' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendStrENS_10StringDataEb' filepath='src/mongo/bson/util/builder.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendBuf' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendBufEPKvm' filepath='src/mongo/bson/util/builder.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendNumImpl&lt;int&gt;' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIiEEvT_' filepath='src/mongo/bson/util/builder.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendNum' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEi' filepath='src/mongo/bson/util/builder.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEEC2Ei'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='buf' mangled-name='_ZNK5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3bufEv' filepath='src/mongo/bson/util/builder.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2064' is-artificial='yes'/>
+            <parameter type-id='type-id-2035' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendNumImpl&lt;long long&gt;' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE13appendNumImplIxEEvT_' filepath='src/mongo/bson/util/builder.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendNum' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE9appendNumEx' filepath='src/mongo/bson/util/builder.h' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='len' mangled-name='_ZNK5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3lenEv' filepath='src/mongo/bson/util/builder.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2064' is-artificial='yes'/>
+            <parameter type-id='type-id-2035' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='buf' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE3bufEv' filepath='src/mongo/bson/util/builder.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='claimReservedBytes' mangled-name='_ZN5mongo11_BufBuilderINS_21SharedBufferAllocatorEE18claimReservedBytesEi' filepath='src/mongo/bson/util/builder.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2125' is-artificial='yes'/>
+            <parameter type-id='type-id-2052' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Milliseconds' naming-typedef-id='type-id-2206' visibility='default' is-declaration-only='yes' id='type-id-2207'/>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2126'>
+      <class-decl name='Milliseconds' naming-typedef-id='type-id-2082' visibility='default' is-declaration-only='yes' id='type-id-2083'/>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1915'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIbEC2ENS_10ErrorCodes5ErrorEPKc' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2127' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIbE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2127' is-artificial='yes'/>
-            <return type-id='type-id-449'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <return type-id='type-id-436'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithIbEC2Eb' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2127' is-artificial='yes'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2065'>
+      <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1957'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2208'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2084'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='toString' mangled-name='_ZNK5mongo10StringData8toStringB5cxx11Ev' filepath='src/mongo/base/string_data.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2067' is-artificial='yes'/>
-            <return type-id='type-id-257'/>
+            <parameter type-id='type-id-2017' is-artificial='yes'/>
+            <return type-id='type-id-254'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='compare' mangled-name='_ZNK5mongo10StringData7compareES0_' filepath='src/mongo/base/string_data.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2067' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-2017' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2128' is-artificial='yes'/>
+            <parameter type-id='type-id-1958' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKcmNS0_14TrustedInitTagE' filepath='src/mongo/base/string_data.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2128' is-artificial='yes'/>
+            <parameter type-id='type-id-1958' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-2208'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2084'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKcm' filepath='src/mongo/base/string_data.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2128' is-artificial='yes'/>
+            <parameter type-id='type-id-1958' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2067' is-artificial='yes'/>
+            <parameter type-id='type-id-2017' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2128' is-artificial='yes'/>
-            <parameter type-id='type-id-259'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1958' is-artificial='yes'/>
+            <parameter type-id='type-id-256'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2209'>
+      <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2085'>
       </class-decl>
-      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2129'>
+      <class-decl name='__anonymous_struct__12' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1921'>
         <member-function access='public'>
           <function-decl name='BSONObjIterator' mangled-name='_ZN5mongo15BSONObjIteratorC2ERKNS_7BSONObjE' filepath='src/mongo/bson/bsonobj.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2130' is-artificial='yes'/>
-            <parameter type-id='type-id-522'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1922' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='more' mangled-name='_ZN5mongo15BSONObjIterator4moreEv' filepath='src/mongo/bson/bsonobj.h' line='619' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2130' is-artificial='yes'/>
+            <parameter type-id='type-id-1922' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='next' mangled-name='_ZN5mongo15BSONObjIterator4nextEv' filepath='src/mongo/bson/bsonobj.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2130' is-artificial='yes'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1922' is-artificial='yes'/>
+            <return type-id='type-id-1930'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2070'>
+      <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2000'>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2131'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-2054'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-306'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2068'/>
+            <return type-id='type-id-2042'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIxEEEERKS0_PT_m' filepath='src/mongo/base/data_view.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2133'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-306'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIxEEEET_m' filepath='src/mongo/base/data_view.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2076'/>
+            <return type-id='type-id-2046'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;mongo::LittleEndian&lt;unsigned long long&gt; &gt;' mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIyEEEERKS0_PT_m' filepath='src/mongo/base/data_view.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2135'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-2057'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-306'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;mongo::LittleEndian&lt;unsigned long long&gt; &gt;' mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIyEEEET_m' filepath='src/mongo/base/data_view.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2134'/>
+            <return type-id='type-id-2056'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;signed char&gt;' mangled-name='_ZNK5mongo13ConstDataView4readIaEERKS0_PT_m' filepath='src/mongo/base/data_view.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2019'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-1904'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-306'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;signed char&gt;' mangled-name='_ZNK5mongo13ConstDataView4readIaEET_m' filepath='src/mongo/base/data_view.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2009'/>
+            <return type-id='type-id-1894'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2073'>
+      <class-decl name='__anonymous_struct__16' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1930'>
         <member-function access='public'>
           <function-decl name='BSONElement' mangled-name='_ZN5mongo11BSONElementC2EPKc' filepath='src/mongo/bson/bsonelement.h' line='657' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2132' is-artificial='yes'/>
+            <parameter type-id='type-id-1931' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONElement' mangled-name='_ZN5mongo11BSONElementC2Ev' filepath='src/mongo/bson/bsonelement.h' line='560' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2132' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1931' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='eoo' mangled-name='_ZNK5mongo11BSONElement3eooEv' filepath='src/mongo/bson/bsonelement.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fieldName' mangled-name='_ZNK5mongo11BSONElement9fieldNameEv' filepath='src/mongo/bson/bsonelement.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fieldNameStringData' mangled-name='_ZNK5mongo11BSONElement19fieldNameStringDataEv' filepath='src/mongo/bson/bsonelement.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2066'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <return type-id='type-id-1999'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fieldNameSize' mangled-name='_ZNK5mongo11BSONElement13fieldNameSizeEv' filepath='src/mongo/bson/bsonelement.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='value' mangled-name='_ZNK5mongo11BSONElement5valueEv' filepath='src/mongo/bson/bsonelement.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='boolean' mangled-name='_ZNK5mongo11BSONElement7booleanEv' filepath='src/mongo/bson/bsonelement.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Bool' mangled-name='_ZNK5mongo11BSONElement4BoolEv' filepath='src/mongo/bson/bsonelement.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='type' mangled-name='_ZNK5mongo11BSONElement4typeEv' filepath='src/mongo/bson/bsonelement.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-241'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isNumber' mangled-name='_ZNK5mongo11BSONElement8isNumberEv' filepath='src/mongo/bson/bsonelement.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='timestamp' mangled-name='_ZNK5mongo11BSONElement9timestampEv' filepath='src/mongo/bson/bsonelement.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2210'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Date' mangled-name='_ZNK5mongo11BSONElement4DateEv' filepath='src/mongo/bson/bsonelement.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2211'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <return type-id='type-id-2087'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='date' mangled-name='_ZNK5mongo11BSONElement4dateEv' filepath='src/mongo/bson/bsonelement.h' line='291' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2211'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <return type-id='type-id-2087'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='binData' mangled-name='_ZNK5mongo11BSONElement7binDataERi' filepath='src/mongo/bson/bsonelement.h' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-2016'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <parameter type-id='type-id-1901'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='valuestrsize' mangled-name='_ZNK5mongo11BSONElement12valuestrsizeEv' filepath='src/mongo/bson/bsonelement.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_numberDouble' mangled-name='_ZNK5mongo11BSONElement13_numberDoubleEv' filepath='src/mongo/bson/bsonelement.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-14'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_numberInt' mangled-name='_ZNK5mongo11BSONElement10_numberIntEv' filepath='src/mongo/bson/bsonelement.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_numberLong' mangled-name='_ZNK5mongo11BSONElement11_numberLongEv' filepath='src/mongo/bson/bsonelement.h' line='321' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-19'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_numberDecimal' mangled-name='_ZNK5mongo11BSONElement14_numberDecimalEv' filepath='src/mongo/bson/bsonelement.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2212'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <return type-id='type-id-2088'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='numberLong' mangled-name='_ZNK5mongo11BSONElement10numberLongEv' filepath='src/mongo/bson/bsonelement.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo11BSONElement10numberLongEv'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
             <return type-id='type-id-19'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='chk' mangled-name='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE' filepath='src/mongo/bson/bsonelement.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <return type-id='type-id-513'/>
+            <parameter type-id='type-id-2021' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <return type-id='type-id-164'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2210'/>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2079'>
+      <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2086'/>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1940'>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
+            <parameter type-id='type-id-2018' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
+            <parameter type-id='type-id-2018' is-artificial='yes'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2136' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1941' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2136' is-artificial='yes'/>
-            <parameter type-id='type-id-571'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1941' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2136' is-artificial='yes'/>
+            <parameter type-id='type-id-1941' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='init' mangled-name='_ZN5mongo7BSONObj4initEPKc' filepath='src/mongo/bson/bsonobj.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2136' is-artificial='yes'/>
+            <parameter type-id='type-id-1941' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isValid' mangled-name='_ZNK5mongo7BSONObj7isValidEv' filepath='src/mongo/bson/bsonobj.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
+            <parameter type-id='type-id-2018' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shareOwnershipWith' mangled-name='_ZNR5mongo7BSONObj18shareOwnershipWithENS_17ConstSharedBufferE' filepath='src/mongo/bson/bsonobj.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2136' is-artificial='yes'/>
-            <parameter type-id='type-id-2140'/>
-            <return type-id='type-id-570'/>
+            <parameter type-id='type-id-1941' is-artificial='yes'/>
+            <parameter type-id='type-id-1938'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2082'>
+      <class-decl name='__anonymous_struct__20' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1936'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2085'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1961'>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2138' is-artificial='yes'/>
+                <parameter type-id='type-id-1962' is-artificial='yes'/>
                 <return type-id='type-id-55'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='Holder' mangled-name='_ZN5mongo12SharedBuffer6HolderC2Ejm' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2138' is-artificial='yes'/>
-                <parameter type-id='type-id-242'/>
+                <parameter type-id='type-id-1962' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <parameter type-id='type-id-39'/>
-                <return type-id='type-id-196'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='isShared' mangled-name='_ZNK5mongo12SharedBuffer6Holder8isSharedEv' filepath='src/mongo/util/shared_buffer.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2087' is-artificial='yes'/>
+                <parameter type-id='type-id-2032' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
@@ -16317,657 +16193,657 @@
         </member-type>
         <member-function access='public'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2137' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1937' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2084' is-artificial='yes'/>
+            <parameter type-id='type-id-2026' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZN5mongo12SharedBuffer8allocateEm' filepath='src/mongo/util/shared_buffer.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2082'/>
+            <return type-id='type-id-1936'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='takeOwnership' mangled-name='_ZN5mongo12SharedBuffer13takeOwnershipEPvm' filepath='src/mongo/util/shared_buffer.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-190'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2082'/>
+            <return type-id='type-id-1936'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo12SharedBuffer7reallocEm' filepath='src/mongo/util/shared_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2137' is-artificial='yes'/>
+            <parameter type-id='type-id-1937' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2140'>
+      <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1938'>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2141' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2088'>
+      <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1942'>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjvE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1943' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjvE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1943' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjvE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-1943' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' mangled-name='_ZN5mongo10AtomicWordIjvEC2Ej' filepath='src/mongo/platform/atomic_word.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1943' is-artificial='yes'/>
+            <parameter type-id='type-id-239'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='load' mangled-name='_ZNK5mongo10AtomicWordIjvE4loadEv' filepath='src/mongo/platform/atomic_word.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2090' is-artificial='yes'/>
-            <return type-id='type-id-242'/>
+            <parameter type-id='type-id-2031' is-artificial='yes'/>
+            <return type-id='type-id-239'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2091'>
+      <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1944'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2145'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2059'/>
         </member-type>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2144' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1945' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2144' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1945' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-2091'/>
+            <return type-id='type-id-1944'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-2022' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </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='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2146'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2060'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2144' is-artificial='yes'/>
-            <parameter type-id='type-id-2093'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1945' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2144' is-artificial='yes'/>
-            <parameter type-id='type-id-2143'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1945' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2146'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2060'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__25' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2213'/>
-      <class-decl name='__anonymous_struct__26' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2095'>
+      <class-decl name='__anonymous_struct__25' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2089'/>
+      <class-decl name='__anonymous_struct__26' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1954'>
         <member-function access='public'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2Ei' filepath='src/mongo/bson/bsonobjbuilder.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataENS_6Date_tE' filepath='src/mongo/bson/bsonobjbuilder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <parameter type-id='type-id-2211'/>
-            <return type-id='type-id-2147'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
+            <parameter type-id='type-id-2087'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataENS_9TimestampE' filepath='src/mongo/bson/bsonobjbuilder.h' line='537' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <parameter type-id='type-id-2210'/>
-            <return type-id='type-id-2147'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
+            <parameter type-id='type-id-2086'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='owned' mangled-name='_ZNK5mongo14BSONObjBuilder5ownedEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='758' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2097' is-artificial='yes'/>
+            <parameter type-id='type-id-2024' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='done' mangled-name='_ZN5mongo14BSONObjBuilder4doneEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='677' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <return type-id='type-id-2079'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <return type-id='type-id-1940'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='obj' mangled-name='_ZN5mongo14BSONObjBuilder3objEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <return type-id='type-id-2079'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <return type-id='type-id-1940'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderD2Ev' filepath='src/mongo/bson/bsonobjbuilder.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendNumber' mangled-name='_ZN5mongo14BSONObjBuilder12appendNumberENS_10StringDataEi' filepath='src/mongo/bson/bsonobjbuilder.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-2147'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendObject' mangled-name='_ZN5mongo14BSONObjBuilder12appendObjectENS_10StringDataEPKci' filepath='src/mongo/bson/bsonobjbuilder.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder12appendObjectENS_10StringDataEPKci'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-2147'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendBinData' mangled-name='_ZN5mongo14BSONObjBuilder13appendBinDataENS_10StringDataEiNS_11BinDataTypeEPKv' filepath='src/mongo/bson/bsonobjbuilder.h' line='563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder13appendBinDataENS_10StringDataEiNS_11BinDataTypeEPKv'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-16'/>
-            <parameter type-id='type-id-241'/>
-            <parameter type-id='type-id-190'/>
-            <return type-id='type-id-2147'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-187'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEx' filepath='src/mongo/bson/bsonobjbuilder.h' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEx'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-2147'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEb' filepath='src/mongo/bson/bsonobjbuilder.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEb'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-2147'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subobjStart' mangled-name='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE' filepath='src/mongo/bson/bsonobjbuilder.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-348'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
+            <return type-id='type-id-373'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE' filepath='src/mongo/bson/bsonobjbuilder.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-348'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subarrayStart' mangled-name='_ZN5mongo14BSONObjBuilder13subarrayStartENS_10StringDataE' filepath='src/mongo/bson/bsonobjbuilder.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder13subarrayStartENS_10StringDataE'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-348'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
+            <return type-id='type-id-373'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendERKNS_11BSONElementE' filepath='src/mongo/bson/bsonobjbuilder.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendERKNS_11BSONElementE'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-513'/>
-            <return type-id='type-id-2147'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_done' mangled-name='_ZN5mongo14BSONObjBuilder5_doneEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi' filepath='src/mongo/bson/bsonobjbuilder.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'>
-            <parameter type-id='type-id-2149' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
+            <parameter type-id='type-id-1956' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-2147'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__27' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2098'>
+      <class-decl name='__anonymous_struct__27' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1959'>
         <member-function access='public'>
           <function-decl name='release' mangled-name='_ZN5mongo21SharedBufferAllocator7releaseEv' filepath='src/mongo/bson/util/builder.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2150' is-artificial='yes'/>
-            <return type-id='type-id-2082'/>
+            <parameter type-id='type-id-1960' is-artificial='yes'/>
+            <return type-id='type-id-1936'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo21SharedBufferAllocator3getEv' filepath='src/mongo/bson/util/builder.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2027' is-artificial='yes'/>
             <return type-id='type-id-55'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='SharedBufferAllocator' mangled-name='_ZN5mongo21SharedBufferAllocatorC2Ev' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2150' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1960' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='malloc' mangled-name='_ZN5mongo21SharedBufferAllocator6mallocEm' filepath='src/mongo/bson/util/builder.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2150' is-artificial='yes'/>
+            <parameter type-id='type-id-1960' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='realloc' mangled-name='_ZN5mongo21SharedBufferAllocator7reallocEm' filepath='src/mongo/bson/util/builder.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2150' is-artificial='yes'/>
+            <parameter type-id='type-id-1960' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__29' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2151'>
+      <class-decl name='__anonymous_struct__29' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1963'>
         <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'>
-            <parameter type-id='type-id-2153' is-artificial='yes'/>
-            <parameter type-id='type-id-2103'/>
+            <parameter type-id='type-id-1964' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2152'/>
+            <return type-id='type-id-115'/>
           </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'>
-            <parameter type-id='type-id-2153' is-artificial='yes'/>
-            <parameter type-id='type-id-303'/>
+            <parameter type-id='type-id-1964' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2152'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIxEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2153' is-artificial='yes'/>
-            <parameter type-id='type-id-2078'/>
+            <parameter type-id='type-id-1964' is-artificial='yes'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-39'/>
-            <return type-id='type-id-2152'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2154'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1946'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2155' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1947' is-artificial='yes'/>
+            <parameter type-id='type-id-1944'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_7BSONObjEEC2ES1_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2155' is-artificial='yes'/>
-            <parameter type-id='type-id-2079'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1947' is-artificial='yes'/>
+            <parameter type-id='type-id-1940'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__30' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2104'>
+      <class-decl name='__anonymous_struct__30' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1977'>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='439' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-2156'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
+            <parameter type-id='type-id-1957'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-2156'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEx' filepath='src/mongo/bson/util/builder.h' line='412' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-2156'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_8BSONTypeE' filepath='src/mongo/bson/util/builder.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <return type-id='type-id-2156'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='str' mangled-name='_ZNK5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE3strB5cxx11Ev' filepath='src/mongo/bson/util/builder.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2106' is-artificial='yes'/>
-            <return type-id='type-id-257'/>
+            <parameter type-id='type-id-2030' is-artificial='yes'/>
+            <return type-id='type-id-254'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsEc' filepath='src/mongo/bson/util/builder.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-2156'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='appendIntegral&lt;long long&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIxEERS2_T_i' filepath='src/mongo/bson/util/builder.h' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE14appendIntegralIxEERS2_T_i'>
-            <parameter type-id='type-id-2157' is-artificial='yes'/>
+            <parameter type-id='type-id-1978' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-2156'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__31' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2212'/>
-      <class-decl name='__anonymous_struct__31' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2158'>
+      <class-decl name='__anonymous_struct__31' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2088'/>
+      <class-decl name='__anonymous_struct__31' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1990'>
         <member-function access='public'>
           <function-decl name='got' mangled-name='_ZN5mongo15BSONSizeTracker3gotEi' filepath='src/mongo/bson/bsonmisc.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2159' is-artificial='yes'/>
+            <parameter type-id='type-id-1991' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-196'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__32' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2160'>
+      <class-decl name='__anonymous_struct__32' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1992'>
         <member-function access='public'>
           <function-decl name='operator StringData' mangled-name='_ZN5mongo4ItoAcvNS_10StringDataEEv' filepath='src/mongo/util/itoa.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2161' is-artificial='yes'/>
-            <return type-id='type-id-2065'/>
+            <parameter type-id='type-id-1993' is-artificial='yes'/>
+            <return type-id='type-id-1957'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2211'/>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2107'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2087'/>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1987'>
         <member-function access='public'>
           <function-decl name='length' mangled-name='_ZNK5mongo14ConstDataRange6lengthEv' filepath='src/mongo/base/data_range.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2109' is-artificial='yes'/>
+            <parameter type-id='type-id-2028' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcml' filepath='src/mongo/base/data_range.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2162' is-artificial='yes'/>
+            <parameter type-id='type-id-1988' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ConstDataRange' mangled-name='_ZN5mongo14ConstDataRangeC2EPKcS2_l' filepath='src/mongo/base/data_range.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2162' is-artificial='yes'/>
+            <parameter type-id='type-id-1988' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-201'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-198'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2163'>
+      <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1965'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_6Date_tEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2164' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1966' is-artificial='yes'/>
+            <parameter type-id='type-id-1944'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_6Date_tEEC2ES1_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2164' is-artificial='yes'/>
-            <parameter type-id='type-id-2211'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1966' is-artificial='yes'/>
+            <parameter type-id='type-id-2087'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2165'>
+      <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1971'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2166' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1972' is-artificial='yes'/>
+            <parameter type-id='type-id-1944'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEEC2ES2_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2166' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1972' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEEC2ENS_10ErrorCodes5ErrorERKN10mongoutils3str6streamE' filepath='src/mongo/base/status_with.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2166' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <parameter type-id='type-id-148'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1972' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2166' is-artificial='yes'/>
-            <return type-id='type-id-1183'/>
+            <parameter type-id='type-id-1972' is-artificial='yes'/>
+            <return type-id='type-id-1102'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2167'>
+      <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1981'>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2168' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1982' is-artificial='yes'/>
+            <parameter type-id='type-id-1944'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithISt6vectorINS_7BSONObjESaIS2_EEEC2ENS_10ErrorCodes5ErrorERKN10mongoutils3str6streamE' filepath='src/mongo/base/status_with.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2168' is-artificial='yes'/>
-            <parameter type-id='type-id-241'/>
-            <parameter type-id='type-id-148'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1982' is-artificial='yes'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2169'/>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2214'/>
-      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2215'>
+      <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1909'/>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2090'/>
+      <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2091'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2216'>
+          <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-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIivE11unsafeStoreERKiPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-70'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2217'>
+          <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2093'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2131'/>
+                <parameter type-id='type-id-2054'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </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='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-303'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2218'>
+          <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2094'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIxvE10unsafeLoadEPxPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2018'/>
+                <parameter type-id='type-id-1903'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIxvE11unsafeStoreERKxPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2015'/>
+                <parameter type-id='type-id-1900'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2219'>
+          <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2095'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIxEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2133'/>
+                <parameter type-id='type-id-2055'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIxEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2078'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2220'>
+          <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2096'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIyvE10unsafeLoadEPyPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2021'/>
+                <parameter type-id='type-id-1906'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2221'>
+          <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2097'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIyEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2135'/>
+                <parameter type-id='type-id-2057'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2222'>
+          <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2098'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIavE10unsafeLoadEPaPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2019'/>
+                <parameter type-id='type-id-1904'/>
                 <parameter type-id='type-id-60'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2223'>
+          <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2099'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIcvE11unsafeStoreERKcPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-253'/>
+                <parameter type-id='type-id-250'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2224'>
+          <class-decl name='__anonymous_struct__8' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2100'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIcEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2103'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
-                <parameter type-id='type-id-270'/>
-                <return type-id='type-id-196'/>
+                <parameter type-id='type-id-267'/>
+                <return type-id='type-id-193'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -16976,667 +16852,667 @@
           <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-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2131'/>
+            <parameter type-id='type-id-2054'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;long long&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIxEEvPT_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-2018'/>
+            <parameter type-id='type-id-1903'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIxEEEEvPT_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-2133'/>
+            <parameter type-id='type-id-2055'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;unsigned long long&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIyEEvPT_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-2021'/>
+            <parameter type-id='type-id-1906'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;unsigned long long&gt; &gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIyEEEEvPT_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-2135'/>
+            <parameter type-id='type-id-2057'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;signed char&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIaEEvPT_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-2019'/>
+            <parameter type-id='type-id-1904'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-253'/>
+            <parameter type-id='type-id-250'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2103'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-70'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </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='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-303'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;long long&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIxEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2015'/>
+            <parameter type-id='type-id-1900'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIxEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2078'/>
+            <parameter type-id='type-id-366'/>
             <parameter type-id='type-id-55'/>
-            <parameter type-id='type-id-270'/>
-            <return type-id='type-id-196'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2068'/>
-      <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2076'/>
-      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2134'/>
-      <class-decl name='__anonymous_struct__28' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2101'/>
-      <typedef-decl name='BufBuilder' type-id='type-id-2062' filepath='src/mongo/bson/util/builder.h' line='365' column='1' id='type-id-2205'/>
-      <var-decl name='kFTDCInterimFile' type-id='type-id-1558' mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1' elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
-      <var-decl name='kFTDCArchiveFile' type-id='type-id-2008' mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1' elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
-      <var-decl name='kFTDCIdField' type-id='type-id-2001' mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1' elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
-      <var-decl name='kFTDCTypeField' type-id='type-id-2003' mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1' elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
-      <var-decl name='kFTDCDataField' type-id='type-id-2003' mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1' elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
-      <var-decl name='kFTDCDocField' type-id='type-id-2001' mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1' elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
-      <var-decl name='kFTDCDocsField' type-id='type-id-2003' mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1' elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
-      <var-decl name='kFTDCCollectStartField' type-id='type-id-2005' mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1' elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
-      <var-decl name='kFTDCCollectEndField' type-id='type-id-2001' mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1' elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
+            <parameter type-id='type-id-267'/>
+            <return type-id='type-id-193'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+      <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2042'/>
+      <class-decl name='__anonymous_struct__18' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2046'/>
+      <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2056'/>
+      <class-decl name='__anonymous_struct__28' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2040'/>
+      <typedef-decl name='BufBuilder' type-id='type-id-2033' filepath='src/mongo/bson/util/builder.h' line='365' column='1' id='type-id-2081'/>
+      <var-decl name='kFTDCInterimFile' type-id='type-id-1453' mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1' elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
+      <var-decl name='kFTDCArchiveFile' type-id='type-id-1893' mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1' elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
+      <var-decl name='kFTDCIdField' type-id='type-id-1886' mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1' elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
+      <var-decl name='kFTDCTypeField' type-id='type-id-1888' mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1' elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
+      <var-decl name='kFTDCDataField' type-id='type-id-1888' mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1' elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
+      <var-decl name='kFTDCDocField' type-id='type-id-1886' mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1' elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
+      <var-decl name='kFTDCDocsField' type-id='type-id-1888' mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1' elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
+      <var-decl name='kFTDCCollectStartField' type-id='type-id-1890' mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1' elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
+      <var-decl name='kFTDCCollectEndField' type-id='type-id-1886' mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1' elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
       <namespace-decl name='FTDCBSONUtil'>
         <function-decl name='extractMetricsFromDocument' mangled-name='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE'>
-          <parameter type-id='type-id-522' name='referenceDoc' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
-          <parameter type-id='type-id-522' name='currentDoc' filepath='src/mongo/db/ftdc/util.cpp' line='234' column='1'/>
-          <parameter type-id='type-id-2180' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
-          <return type-id='type-id-2126'/>
+          <parameter type-id='type-id-164' name='referenceDoc' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
+          <parameter type-id='type-id-164' name='currentDoc' filepath='src/mongo/db/ftdc/util.cpp' line='234' column='1'/>
+          <parameter type-id='type-id-1908' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
+          <return type-id='type-id-1915'/>
         </function-decl>
         <function-decl name='constructDocumentFromMetrics' mangled-name='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE'>
-          <parameter type-id='type-id-522' name='ref' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
-          <parameter type-id='type-id-2114' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
-          <return type-id='type-id-2154'/>
+          <parameter type-id='type-id-164' name='ref' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
+          <parameter type-id='type-id-164' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
+          <return type-id='type-id-1946'/>
         </function-decl>
         <function-decl name='createBSONMetadataDocument' mangled-name='_ZN5mongo12FTDCBSONUtil26createBSONMetadataDocumentERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil26createBSONMetadataDocumentERKNS_7BSONObjENS_6Date_tE'>
-          <parameter type-id='type-id-522' name='metadata' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
-          <parameter type-id='type-id-2211' name='date' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
-          <return type-id='type-id-2079'/>
+          <parameter type-id='type-id-164' name='metadata' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
+          <parameter type-id='type-id-2087' name='date' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
+          <return type-id='type-id-1940'/>
         </function-decl>
         <function-decl name='createBSONMetricChunkDocument' mangled-name='_ZN5mongo12FTDCBSONUtil29createBSONMetricChunkDocumentENS_14ConstDataRangeENS_6Date_tE' filepath='src/mongo/db/ftdc/util.cpp' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil29createBSONMetricChunkDocumentENS_14ConstDataRangeENS_6Date_tE'>
-          <parameter type-id='type-id-2107' name='buf' filepath='src/mongo/db/ftdc/util.cpp' line='355' column='1'/>
-          <parameter type-id='type-id-2211' name='date' filepath='src/mongo/db/ftdc/util.cpp' line='355' column='1'/>
-          <return type-id='type-id-2079'/>
+          <parameter type-id='type-id-1987' name='buf' filepath='src/mongo/db/ftdc/util.cpp' line='355' column='1'/>
+          <parameter type-id='type-id-2087' name='date' filepath='src/mongo/db/ftdc/util.cpp' line='355' column='1'/>
+          <return type-id='type-id-1940'/>
         </function-decl>
         <function-decl name='getBSONDocumentId' mangled-name='_ZN5mongo12FTDCBSONUtil17getBSONDocumentIdERKNS_7BSONObjE' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil17getBSONDocumentIdERKNS_7BSONObjE'>
-          <parameter type-id='type-id-522' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
-          <return type-id='type-id-2163'/>
+          <parameter type-id='type-id-164' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
+          <return type-id='type-id-1965'/>
         </function-decl>
         <function-decl name='getBSONDocumentType' mangled-name='_ZN5mongo12FTDCBSONUtil19getBSONDocumentTypeERKNS_7BSONObjE' filepath='src/mongo/db/ftdc/util.cpp' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil19getBSONDocumentTypeERKNS_7BSONObjE'>
-          <parameter type-id='type-id-522' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='376' column='1'/>
-          <return type-id='type-id-2165'/>
+          <parameter type-id='type-id-164' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='376' column='1'/>
+          <return type-id='type-id-1971'/>
         </function-decl>
         <function-decl name='getBSONDocumentFromMetadataDoc' mangled-name='_ZN5mongo12FTDCBSONUtil30getBSONDocumentFromMetadataDocERKNS_7BSONObjE' filepath='src/mongo/db/ftdc/util.cpp' line='396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil30getBSONDocumentFromMetadataDocERKNS_7BSONObjE'>
-          <parameter type-id='type-id-522' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='396' column='1'/>
-          <return type-id='type-id-2154'/>
+          <parameter type-id='type-id-164' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='396' column='1'/>
+          <return type-id='type-id-1946'/>
         </function-decl>
         <function-decl name='getMetricsFromMetricDoc' mangled-name='_ZN5mongo12FTDCBSONUtil23getMetricsFromMetricDocERKNS_7BSONObjEPNS_16FTDCDecompressorE' filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil23getMetricsFromMetricDocERKNS_7BSONObjEPNS_16FTDCDecompressorE'>
-          <parameter type-id='type-id-522' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'/>
-          <parameter type-id='type-id-2170' name='decompressor' filepath='src/mongo/db/ftdc/util.cpp' line='413' column='1'/>
-          <return type-id='type-id-2167'/>
+          <parameter type-id='type-id-164' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'/>
+          <parameter type-id='type-id-1910' name='decompressor' filepath='src/mongo/db/ftdc/util.cpp' line='413' column='1'/>
+          <return type-id='type-id-1981'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='FTDCUtil'>
         <function-decl name='getInterimFile' mangled-name='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE'>
-          <parameter type-id='type-id-733' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
-          <return type-id='type-id-2041'/>
+          <parameter type-id='type-id-164' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
+          <return type-id='type-id-1911'/>
         </function-decl>
         <function-decl name='getInterimTempFile' mangled-name='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE'>
-          <parameter type-id='type-id-733' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='89' column='1'/>
-          <return type-id='type-id-2041'/>
+          <parameter type-id='type-id-164' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='89' column='1'/>
+          <return type-id='type-id-1911'/>
         </function-decl>
         <function-decl name='roundTime' mangled-name='_ZN5mongo8FTDCUtil9roundTimeENS_6Date_tENS_8DurationISt5ratioILl1ELl1000EEEE' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil9roundTimeENS_6Date_tENS_8DurationISt5ratioILl1ELl1000EEEE'>
-          <parameter type-id='type-id-2211' name='now' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
-          <parameter type-id='type-id-2206' name='period' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
-          <return type-id='type-id-2211'/>
+          <parameter type-id='type-id-2087' name='now' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
+          <parameter type-id='type-id-2082' name='period' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
+          <return type-id='type-id-2087'/>
         </function-decl>
         <function-decl name='getMongoSPath' mangled-name='_ZN5mongo8FTDCUtil13getMongoSPathERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil13getMongoSPathERKN5boost10filesystem4pathE'>
-          <parameter type-id='type-id-733' name='logFile' filepath='src/mongo/db/ftdc/util.cpp' line='106' column='1'/>
-          <return type-id='type-id-2041'/>
+          <parameter type-id='type-id-164' name='logFile' filepath='src/mongo/db/ftdc/util.cpp' line='106' column='1'/>
+          <return type-id='type-id-1911'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2171'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1926'>
           <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'>
-              <parameter type-id='type-id-2172' is-artificial='yes'/>
-              <return type-id='type-id-2174'/>
+              <parameter type-id='type-id-1927' is-artificial='yes'/>
+              <return type-id='type-id-1925'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2173'/>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2175'>
+        <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1924'/>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1928'>
           <member-function access='public'>
             <function-decl name='stream' mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv' filepath='src/mongo/logger/logstream_builder.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2176' is-artificial='yes'/>
-              <return type-id='type-id-707'/>
+              <parameter type-id='type-id-1929' is-artificial='yes'/>
+              <return type-id='type-id-663'/>
             </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='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2176' is-artificial='yes'/>
+              <parameter type-id='type-id-1929' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
-              <return type-id='type-id-832'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsENS_10StringDataE' filepath='src/mongo/logger/logstream_builder.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2176' is-artificial='yes'/>
-              <parameter type-id='type-id-2065'/>
-              <return type-id='type-id-832'/>
+              <parameter type-id='type-id-1929' is-artificial='yes'/>
+              <parameter type-id='type-id-1957'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEi' filepath='src/mongo/logger/logstream_builder.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2176' is-artificial='yes'/>
+              <parameter type-id='type-id-1929' is-artificial='yes'/>
               <parameter type-id='type-id-16'/>
-              <return type-id='type-id-832'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2177'>
+        <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1994'>
           <member-function access='public'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2178' is-artificial='yes'/>
-              <parameter type-id='type-id-241'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1995' is-artificial='yes'/>
+              <parameter type-id='type-id-238'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
-      <typedef-decl name='Milliseconds' type-id='type-id-2207' filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-2206'/>
+      <typedef-decl name='Milliseconds' type-id='type-id-2083' filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-2082'/>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2028'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1919'>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIbEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2029' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIbE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2029' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <return type-id='type-id-627'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIbEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2029' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <return type-id='type-id-627'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIbEC2EOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2029' is-artificial='yes'/>
-            <parameter type-id='type-id-1804'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-1694'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2030'>
+      <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1934'>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </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.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <parameter type-id='type-id-719'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <parameter type-id='type-id-1875'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <parameter type-id='type-id-1875'/>
-            <return type-id='type-id-2031'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <parameter type-id='type-id-164'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <parameter type-id='type-id-2031'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <parameter type-id='type-id-115'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='12' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2057' is-artificial='yes'/>
+            <parameter type-id='type-id-2025' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSEOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2032' is-artificial='yes'/>
-            <parameter type-id='type-id-719'/>
-            <return type-id='type-id-2031'/>
+            <parameter type-id='type-id-1935' is-artificial='yes'/>
+            <parameter type-id='type-id-116'/>
+            <return type-id='type-id-115'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEntEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/operator_bool.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2057' is-artificial='yes'/>
+            <parameter type-id='type-id-2025' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2057' is-artificial='yes'/>
-            <return type-id='type-id-2139'/>
+            <parameter type-id='type-id-2025' is-artificial='yes'/>
+            <return type-id='type-id-1989'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2033'>
+      <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1950'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-2226' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-2225'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-2102' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-2101'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo7BSONObjEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2034' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1951' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo7BSONObjEEC2EOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2034' is-artificial='yes'/>
-            <parameter type-id='type-id-2225'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1951' is-artificial='yes'/>
+            <parameter type-id='type-id-2101'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2035'>
+      <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1969'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-2228' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-2227'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-2104' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-2103'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo6Date_tEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2036' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1970' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo6Date_tEEC2EOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2036' is-artificial='yes'/>
-            <parameter type-id='type-id-2227'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1970' is-artificial='yes'/>
+            <parameter type-id='type-id-2103'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2037'>
+      <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1975'>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-2230' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-2229'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-2106' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-2105'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2038' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1976' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEC2EOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2038' is-artificial='yes'/>
-            <parameter type-id='type-id-2229'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1976' is-artificial='yes'/>
+            <parameter type-id='type-id-2105'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2038' is-artificial='yes'/>
-            <return type-id='type-id-1811'/>
+            <parameter type-id='type-id-1976' is-artificial='yes'/>
+            <return type-id='type-id-1701'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2038' is-artificial='yes'/>
-            <return type-id='type-id-1811'/>
+            <parameter type-id='type-id-1976' is-artificial='yes'/>
+            <return type-id='type-id-1701'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2039'>
+      <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1985'>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalISt6vectorIN5mongo7BSONObjESaIS3_EEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='786' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2040' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-1986' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2041'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1911'>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2EPKc' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2042' is-artificial='yes'/>
-              <parameter type-id='type-id-1563'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1912' is-artificial='yes'/>
+              <parameter type-id='type-id-1458'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2EOS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2042' is-artificial='yes'/>
-              <parameter type-id='type-id-1859'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1912' is-artificial='yes'/>
+              <parameter type-id='type-id-116'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2042' is-artificial='yes'/>
-              <parameter type-id='type-id-733'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1912' is-artificial='yes'/>
+              <parameter type-id='type-id-164'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='has_extension' mangled-name='_ZNK5boost10filesystem4path13has_extensionEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2059' is-artificial='yes'/>
+              <parameter type-id='type-id-2016' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK5boost10filesystem4path5emptyEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='511' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2059' is-artificial='yes'/>
+              <parameter type-id='type-id-2016' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2042' is-artificial='yes'/>
-              <parameter type-id='type-id-1174'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1912' is-artificial='yes'/>
+              <parameter type-id='type-id-1089'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator+=' mangled-name='_ZN5boost10filesystem4pathpLERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2042' is-artificial='yes'/>
-              <parameter type-id='type-id-1174'/>
-              <return type-id='type-id-722'/>
+              <parameter type-id='type-id-1912' is-artificial='yes'/>
+              <parameter type-id='type-id-1089'/>
+              <return type-id='type-id-115'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2043'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1917'>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2044' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1918' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2044' is-artificial='yes'/>
-              <parameter type-id='type-id-2231'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1918' is-artificial='yes'/>
+              <parameter type-id='type-id-2107'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIbE7destroyEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2044' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1918' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbED2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2044' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1918' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIbE9constructEOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2044' is-artificial='yes'/>
-              <parameter type-id='type-id-1541'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1918' is-artificial='yes'/>
+              <parameter type-id='type-id-1436'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIbEC2EOb' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2044' is-artificial='yes'/>
-              <parameter type-id='type-id-1541'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1918' is-artificial='yes'/>
+              <parameter type-id='type-id-1436'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2045'>
+        <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1948'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-2232' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-2226'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-2108' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-2102'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2046' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1949' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEE9constructEOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2046' is-artificial='yes'/>
-              <parameter type-id='type-id-2226'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1949' is-artificial='yes'/>
+              <parameter type-id='type-id-2102'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo7BSONObjEEC2EOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2046' is-artificial='yes'/>
-              <parameter type-id='type-id-2226'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1949' is-artificial='yes'/>
+              <parameter type-id='type-id-2102'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2047'>
+        <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1967'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-2233' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-2228'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-2109' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-2104'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo6Date_tEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2048' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1968' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo6Date_tEE9constructEOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2048' is-artificial='yes'/>
-              <parameter type-id='type-id-2228'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1968' is-artificial='yes'/>
+              <parameter type-id='type-id-2104'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo6Date_tEEC2EOS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2048' is-artificial='yes'/>
-              <parameter type-id='type-id-2228'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1968' is-artificial='yes'/>
+              <parameter type-id='type-id-2104'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2049'>
+        <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1973'>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-2234' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-2230'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-2110' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='230' column='1' id='type-id-2106'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2050' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1974' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE9constructEOS4_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2050' is-artificial='yes'/>
-              <parameter type-id='type-id-2230'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1974' is-artificial='yes'/>
+              <parameter type-id='type-id-2106'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2050' is-artificial='yes'/>
-              <parameter type-id='type-id-2230'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1974' is-artificial='yes'/>
+              <parameter type-id='type-id-2106'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2061' is-artificial='yes'/>
+              <parameter type-id='type-id-2029' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2051'>
+        <class-decl name='__anonymous_struct__8' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1983'>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2052' is-artificial='yes'/>
-              <return type-id='type-id-196'/>
+              <parameter type-id='type-id-1984' is-artificial='yes'/>
+              <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2235'>
+        <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2111'>
         </class-decl>
-        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2236'>
+        <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2112'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-571' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-2232'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-2108'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2237'>
+        <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2113'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-366' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-2233'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-116' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-2109'/>
           </member-type>
         </class-decl>
-        <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2238'>
+        <class-decl name='__anonymous_struct__7' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2114'>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-454' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-2234'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-442' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-2110'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-2239' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-2231'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-2115' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-2107'/>
     <namespace-decl name='mpl_'>
-      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-2239' visibility='default' is-declaration-only='yes' id='type-id-2240'/>
-      <typedef-decl name='false_' type-id='type-id-2240' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-2239'/>
+      <class-decl name='false_' is-struct='yes' naming-typedef-id='type-id-2115' visibility='default' is-declaration-only='yes' id='type-id-2116'/>
+      <typedef-decl name='false_' type-id='type-id-2116' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-2115'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/varint.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <typedef-decl name='ldiv_t' type-id='type-id-21' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-2241'/>
-    <typedef-decl name='lldiv_t' type-id='type-id-21' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-2242'/>
-    <qualified-type-def type-id='type-id-2243' const='yes' id='type-id-2244'/>
-    <pointer-type-def type-id='type-id-2244' size-in-bits='64' id='type-id-2245'/>
-    <qualified-type-def type-id='type-id-2246' const='yes' id='type-id-2247'/>
-    <pointer-type-def type-id='type-id-2247' size-in-bits='64' id='type-id-2248'/>
-    <qualified-type-def type-id='type-id-2248' restrict='yes' id='type-id-2249'/>
-    <pointer-type-def type-id='type-id-2250' size-in-bits='64' id='type-id-2251'/>
-    <pointer-type-def type-id='type-id-2243' size-in-bits='64' id='type-id-2252'/>
-    <class-decl name='tm' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2246'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-2253'/>
-    <qualified-type-def type-id='type-id-190' restrict='yes' id='type-id-2254'/>
+    <typedef-decl name='ldiv_t' type-id='type-id-21' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-2117'/>
+    <typedef-decl name='lldiv_t' type-id='type-id-21' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-2118'/>
+    <pointer-type-def type-id='type-id-2119' size-in-bits='64' id='type-id-2120'/>
+    <qualified-type-def type-id='type-id-2121' const='yes' id='type-id-2122'/>
+    <pointer-type-def type-id='type-id-2122' size-in-bits='64' id='type-id-2123'/>
+    <qualified-type-def type-id='type-id-2124' const='yes' id='type-id-2125'/>
+    <pointer-type-def type-id='type-id-2125' size-in-bits='64' id='type-id-2126'/>
+    <qualified-type-def type-id='type-id-2126' restrict='yes' id='type-id-2127'/>
+    <class-decl name='tm' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2124'/>
+    <pointer-type-def type-id='type-id-2121' size-in-bits='64' id='type-id-2128'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-2129'/>
+    <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-2130'/>
     <namespace-decl name='std'>
     </namespace-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2250'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2119'>
         <member-function access='private'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2251' is-artificial='yes'/>
-            <return type-id='type-id-196'/>
+            <parameter type-id='type-id-2120' is-artificial='yes'/>
+            <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-2250'/>
+            <return type-id='type-id-2119'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2255'>
+      <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2131'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2256'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2132'>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE4loadEPS2_PKcmPml' filepath='src/mongo/db/ftdc/varint.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE4loadEPS2_PKcmPml'>
-                <parameter type-id='type-id-2252'/>
+                <parameter type-id='type-id-2128'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-2250'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-2119'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='store' mangled-name='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE5storeERKS2_PcmPml' filepath='src/mongo/db/ftdc/varint.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE5storeERKS2_PcmPml'>
-                <parameter type-id='type-id-522'/>
+                <parameter type-id='type-id-366'/>
                 <parameter type-id='type-id-55'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-270'/>
-                <parameter type-id='type-id-201'/>
-                <return type-id='type-id-2250'/>
+                <parameter type-id='type-id-267'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-2119'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2243'>
+      <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2121'>
         <member-function access='public'>
           <function-decl name='operator unsigned long' mangled-name='_ZNK5mongo10FTDCVarIntcvmEv' filepath='src/mongo/db/ftdc/varint.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2245' is-artificial='yes'/>
-            <return type-id='type-id-446'/>
+            <parameter type-id='type-id-2123' is-artificial='yes'/>
+            <return type-id='type-id-433'/>
           </function-decl>
         </member-function>
       </class-decl>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index 459527f0..53fa11ad 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -92,30 +92,30 @@
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-20'/>
     <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-26'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-28'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-30'/>
-    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-22'/>
-    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-32'/>
-    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-33'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-13'/>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-34'/>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-35'/>
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-36'/>
-    <qualified-type-def type-id='type-id-37' const='yes' id='type-id-38'/>
-    <reference-type-def kind='lvalue' type-id='type-id-38' size-in-bits='64' id='type-id-39'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-40'/>
-    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-42'/>
-    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-43'/>
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-44'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-45'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-29'/>
+    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-22'/>
+    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-31'/>
+    <reference-type-def kind='lvalue' type-id='type-id-31' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-33'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-34'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-35'/>
+    <qualified-type-def type-id='type-id-36' const='yes' id='type-id-37'/>
+    <reference-type-def kind='lvalue' type-id='type-id-37' size-in-bits='64' id='type-id-38'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-39'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-41'/>
+    <qualified-type-def type-id='type-id-12' const='yes' id='type-id-42'/>
+    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-43'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-44'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-45'/>
     <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-46'/>
-    <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-47'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-48'/>
-    <reference-type-def kind='lvalue' type-id='type-id-37' size-in-bits='64' id='type-id-49'/>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-50'/>
-    <reference-type-def kind='lvalue' type-id='type-id-51' size-in-bits='64' id='type-id-52'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-47'/>
+    <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-48'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-49'/>
+    <reference-type-def kind='lvalue' type-id='type-id-50' size-in-bits='64' id='type-id-51'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-52'/>
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-53'/>
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-54'/>
     <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-55'/>
@@ -125,16 +125,16 @@
         <typedef-decl name='const_pointer' type-id='type-id-13' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='98' column='1' id='type-id-59'/>
       </member-type>
       <member-type access='public'>
-        <typedef-decl name='const_reference' type-id='type-id-33' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-60'/>
+        <typedef-decl name='const_reference' type-id='type-id-32' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-60'/>
       </member-type>
       <member-type access='public'>
         <typedef-decl name='difference_type' type-id='type-id-62' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='96' column='1' id='type-id-61'/>
       </member-type>
       <member-type access='public'>
-        <typedef-decl name='pointer' type-id='type-id-30' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-63'/>
+        <typedef-decl name='pointer' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-63'/>
       </member-type>
       <member-type access='public'>
-        <typedef-decl name='reference' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-64'/>
+        <typedef-decl name='reference' type-id='type-id-28' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-64'/>
       </member-type>
       <member-type access='public'>
         <typedef-decl name='size_type' type-id='type-id-21' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='95' column='1' id='type-id-65'/>
@@ -148,10 +148,10 @@
       <class-decl name='__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-71'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <typedef-decl name='string' type-id='type-id-37' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-51'/>
+      <typedef-decl name='string' type-id='type-id-36' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-50'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <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.8.2/bits/basic_string.h' line='112' column='1' id='type-id-37'>
+      <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.8.2/bits/basic_string.h' line='112' column='1' id='type-id-36'>
         <member-type access='public'>
           <typedef-decl name='const_pointer' type-id='type-id-59' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='126' column='1' id='type-id-72'/>
         </member-type>
@@ -168,7 +168,7 @@
           <typedef-decl name='reference' type-id='type-id-64' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='123' column='1' id='type-id-76'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-65' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-41'/>
+          <typedef-decl name='size_type' type-id='type-id-65' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-40'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-78' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='119' column='1' id='type-id-77'/>
@@ -204,62 +204,62 @@
           <typedef-decl name='traits_type' type-id='type-id-91' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='118' column='1' id='type-id-90'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='npos' type-id='type-id-42' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='285' column='1'/>
+          <var-decl name='npos' type-id='type-id-41' visibility='default' filepath='/usr/include/c++/4.8.2/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-79' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='289' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <parameter type-id='type-id-67'/>
             <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
-            <parameter type-id='type-id-39'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
+            <parameter type-id='type-id-38'/>
             <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
-            <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-41'/>
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
+            <parameter type-id='type-id-38'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-40'/>
             <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
-            <parameter type-id='type-id-39'/>
-            <parameter type-id='type-id-41'/>
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
+            <parameter type-id='type-id-38'/>
+            <parameter type-id='type-id-40'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-67'/>
             <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <parameter type-id='type-id-13'/>
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-67'/>
             <return type-id='type-id-92'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <parameter type-id='type-id-13'/>
             <parameter type-id='type-id-67'/>
             <return type-id='type-id-92'/>
@@ -267,8 +267,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.tcc' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
-            <parameter type-id='type-id-41'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
+            <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-2'/>
             <parameter type-id='type-id-67'/>
             <return type-id='type-id-92'/>
@@ -276,7 +276,7 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~basic_string' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-50' is-artificial='yes'/>
+            <parameter type-id='type-id-49' is-artificial='yes'/>
             <parameter type-id='type-id-5' is-artificial='yes'/>
             <return type-id='type-id-92'/>
           </function-decl>
@@ -302,7 +302,7 @@
       </member-type>
     </class-decl>
     <function-decl name='emit' mangled-name='_Z4emitRSs' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSs'>
-      <parameter type-id='type-id-52' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1'/>
+      <parameter type-id='type-id-51' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
@@ -315,91 +315,91 @@
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-13'/>
-      <return type-id='type-id-30'/>
+      <return type-id='type-id-29'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-28'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <typedef-decl name='__FILE' type-id='type-id-95' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-56'/>
     <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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-54'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-54'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-54'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-54'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-5'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-5'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-5'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-21'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-21'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-21'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-54'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <return type-id='type-id-21'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-5'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-54'/>
     </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-54'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-54'/>
     </function-decl>
@@ -418,77 +418,77 @@
       <return type-id='type-id-5'/>
     </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-36'/>
+      <parameter type-id='type-id-35'/>
       <return type-id='type-id-5'/>
     </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-54'/>
       <parameter type-id='type-id-13'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <return type-id='type-id-21'/>
     </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-30'/>
+      <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <return type-id='type-id-21'/>
     </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-13'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <return type-id='type-id-21'/>
     </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-54'/>
-      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <return type-id='type-id-21'/>
     </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-30'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-47'/>
       <return type-id='type-id-21'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-3'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-4'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <return type-id='type-id-6'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-7'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-20'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-8'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-26'/>
@@ -500,71 +500,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-57'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </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-54'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </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-57'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-5'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-5'/>
     </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-54'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-5'/>
     </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-57'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </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-57'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-5'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-5'/>
     </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-46'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-5'/>
     </function-decl>
@@ -600,7 +600,7 @@
       <return type-id='type-id-54'/>
     </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-46'/>
+      <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-5'/>
     </function-decl>
@@ -612,8 +612,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-54'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-43'/>
       <return type-id='type-id-21'/>
     </function-decl>
     <function-decl name='wctype' filepath='/usr/include/wctype.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -644,8 +644,8 @@
     </namespace-decl>
     <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-105'/>
     <function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
-      <parameter type-id='type-id-52' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
-      <parameter type-id='type-id-52' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
+      <parameter type-id='type-id-51' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
+      <parameter type-id='type-id-51' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 29eda64b..32c1a0a4 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -8037,17 +8037,7 @@
           </enum-decl>
         </member-type>
         <member-type access='public'>
-          <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1037' column='1' id='08f5ca18'>
-            <underlying-type type-id='9cac1fee'/>
-            <enumerator name='MASK_NAVHIDDEN' value='12'/>
-            <enumerator name='SHIFT_NAVHIDDEN' value='2'/>
-            <enumerator name='NAVHIDDEN_ANY' value='0'/>
-            <enumerator name='NAVHIDDEN_NO' value='4'/>
-            <enumerator name='NAVHIDDEN_YES' value='8'/>
-          </enum-decl>
-        </member-type>
-        <member-type access='public'>
-          <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1089' column='1' id='08f5ca19'>
+          <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1089' column='1' id='08f5ca18'>
             <underlying-type type-id='9cac1fee'/>
             <enumerator name='MASK_SCREENSIZE' value='15'/>
             <enumerator name='SCREENSIZE_ANY' value='0'/>
@@ -8067,6 +8057,16 @@
             <enumerator name='LAYOUTDIR_RTL' value='128'/>
           </enum-decl>
         </member-type>
+        <member-type access='public'>
+          <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1037' column='1' id='08f5ca19'>
+            <underlying-type type-id='9cac1fee'/>
+            <enumerator name='MASK_NAVHIDDEN' value='12'/>
+            <enumerator name='SHIFT_NAVHIDDEN' value='2'/>
+            <enumerator name='NAVHIDDEN_ANY' value='0'/>
+            <enumerator name='NAVHIDDEN_NO' value='4'/>
+            <enumerator name='NAVHIDDEN_YES' value='8'/>
+          </enum-decl>
+        </member-type>
         <member-type access='public'>
           <enum-decl name='__anonymous_enum__3' is-anonymous='yes' filepath='frameworks/base/libs/androidfw/include/androidfw/ResourceTypes.h' line='1159' column='1' id='08f5ca1a'>
             <underlying-type type-id='9cac1fee'/>
@@ -18980,7 +18980,6 @@
     <typedef-decl name='pthread_t' type-id='95e97e5f' filepath='bionic/libc/include/bits/pthread_types.h' line='104' column='1' id='4051f5e7'/>
     <typedef-decl name='uint64_t' type-id='8910171f' filepath='bionic/libc/include/stdint.h' line='68' column='1' id='9c313c2d'/>
     <typedef-decl name='uintmax_t' type-id='9c313c2d' filepath='bionic/libc/include/stdint.h' line='103' column='1' id='f8b828c9'/>
-    <pointer-type-def type-id='e7f43f7b' size-in-bits='32' id='8567d8b0'/>
     <pointer-type-def type-id='18a91261' size-in-bits='32' id='8693cef9'/>
     <reference-type-def kind='lvalue' type-id='a78ceb8e' size-in-bits='32' id='e6ba8810'/>
     <pointer-type-def type-id='a78ceb8e' size-in-bits='32' id='f2ba9af4'/>
@@ -19098,6 +19097,7 @@
     <pointer-type-def type-id='c86a67a1' size-in-bits='32' id='0e0ce4d9'/>
     <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='7b0c0278' size-in-bits='32' id='136b85b5'/>
@@ -24528,6 +24528,8 @@
     <pointer-type-def type-id='c58985b9' size-in-bits='32' id='9680af21'/>
     <pointer-type-def type-id='1a4a01cf' size-in-bits='32' id='e13b5c87'/>
     <pointer-type-def type-id='d8cb99c5' size-in-bits='32' id='b98edb26'/>
+    <reference-type-def kind='lvalue' type-id='7a0d17e7' size-in-bits='32' id='6bbc46fb'/>
+    <reference-type-def kind='rvalue' type-id='7a0d17e7' size-in-bits='32' id='76638de7'/>
     <pointer-type-def type-id='7a0d17e7' size-in-bits='32' id='67bc40af'/>
     <pointer-type-def type-id='d684da9f' size-in-bits='32' id='3d8087e7'/>
     <reference-type-def kind='lvalue' type-id='3af595a3' size-in-bits='32' id='8b9865b7'/>
@@ -25770,7 +25772,7 @@
     <pointer-type-def type-id='766bcfe9' size-in-bits='32' id='81dc4c31'/>
     <pointer-type-def type-id='25e1a861' size-in-bits='32' id='61908449'/>
     <reference-type-def kind='rvalue' type-id='749c7aaa' size-in-bits='32' id='b1948937'/>
-    <reference-type-def kind='rvalue' type-id='d871c7fc' size-in-bits='32' id='76638de7'/>
+    <reference-type-def kind='rvalue' type-id='d871c7fc' size-in-bits='32' id='76638de8'/>
     <reference-type-def kind='lvalue' type-id='4c30ca01' size-in-bits='32' id='151635cd'/>
     <pointer-type-def type-id='4c30ca01' size-in-bits='32' id='091622e9'/>
     <reference-type-def kind='lvalue' type-id='eb9aac9f' size-in-bits='32' id='3ce17e43'/>
@@ -30500,7 +30502,7 @@
         </class-decl>
         <class-decl name='__tuple_leaf&lt;0, (lambda at frameworks/base/native/android/surface_control.cpp:282:57) &amp;&amp;, false&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/tuple' line='171' column='1' id='23f669c2'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__value_' type-id='98980936' visibility='default' filepath='external/libcxx/include/tuple' line='173' column='1'/>
+            <var-decl name='__value_' type-id='76638de7' visibility='default' filepath='external/libcxx/include/tuple' line='173' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='__tuple_leaf' filepath='external/libcxx/include/tuple' line='186' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -31186,7 +31188,7 @@
             <typedef-decl name='pointer' type-id='67bc40af' filepath='external/libcxx/include/memory' line='1786' column='1' id='0504ba27'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference' type-id='9167eb94' filepath='external/libcxx/include/memory' line='1788' column='1' id='3a1429ea'/>
+            <typedef-decl name='reference' type-id='6bbc46fb' filepath='external/libcxx/include/memory' line='1788' column='1' id='3a1429ea'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='allocator' filepath='external/libcxx/include/memory' line='1798' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -35836,7 +35838,7 @@
         <class-decl name='__invoke_void_return_wrapper&lt;void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__functional_base' line='344' column='1' id='e354cd9b'>
           <member-function access='public' static='yes'>
             <function-decl name='__call&lt;(lambda at frameworks/base/native/android/surface_control.cpp:282:57) &amp;, void *, long long, const android::sp&lt;android::Fence&gt; &amp;, const std::__1::vector&lt;android::SurfaceControlStats, std::__1::allocator&lt;android::SurfaceControlStats&gt; &gt; &amp;&gt;' mangled-name='_ZNSt3__128__invoke_void_return_wrapperIvE6__callIJRZ33ASurfaceTransaction_setOnCompleteE3$_0PvxRKN7android2spINS6_5FenceEEERKNS_6vectorINS6_19SurfaceControlStatsENS_9allocatorISD_EEEEEEEvDpOT_' filepath='external/libcxx/include/__functional_base' line='348' column='1' visibility='default' binding='global' size-in-bits='32'>
-              <parameter type-id='9167eb94'/>
+              <parameter type-id='6bbc46fb'/>
               <parameter type-id='94effc77'/>
               <parameter type-id='75f9e64b'/>
               <parameter type-id='bac2bb80'/>
@@ -37487,7 +37489,7 @@
             <member-function access='public'>
               <function-decl name='__alloc_func' filepath='external/libcxx/include/functional' line='1496' column='1' visibility='default' binding='global' size-in-bits='32'>
                 <parameter type-id='61908449' is-artificial='yes'/>
-                <parameter type-id='76638de7'/>
+                <parameter type-id='76638de8'/>
                 <return type-id='48b5725f'/>
               </function-decl>
             </member-function>
@@ -37510,7 +37512,7 @@
             <member-function access='public'>
               <function-decl name='__alloc_func' mangled-name='_ZNSt3__110__function12__alloc_funcIZ33ASurfaceTransaction_setOnCompleteE3$_0NS_9allocatorIS2_EEFvPvxRKN7android2spINS6_5FenceEEERKNS_6vectorINS6_19SurfaceControlStatsENS3_ISD_EEEEEEC2EOS2_OS4_' filepath='external/libcxx/include/functional' line='1517' column='1' visibility='default' binding='global' size-in-bits='32'>
                 <parameter type-id='61908449' is-artificial='yes'/>
-                <parameter type-id='76638de7'/>
+                <parameter type-id='76638de8'/>
                 <parameter type-id='b1948937'/>
                 <return type-id='48b5725f'/>
               </function-decl>
@@ -37590,7 +37592,7 @@
             <member-function access='public'>
               <function-decl name='__func' filepath='external/libcxx/include/functional' line='1583' column='1' visibility='default' binding='global' size-in-bits='32'>
                 <parameter type-id='48e19127' is-artificial='yes'/>
-                <parameter type-id='98980936'/>
+                <parameter type-id='76638de7'/>
                 <return type-id='48b5725f'/>
               </function-decl>
             </member-function>
@@ -37613,7 +37615,7 @@
             <member-function access='public'>
               <function-decl name='__func' mangled-name='_ZNSt3__110__function6__funcIZ33ASurfaceTransaction_setOnCompleteE3$_0NS_9allocatorIS2_EEFvPvxRKN7android2spINS6_5FenceEEERKNS_6vectorINS6_19SurfaceControlStatsENS3_ISD_EEEEEEC2EOS2_OS4_' filepath='external/libcxx/include/functional' line='1595' column='1' visibility='default' binding='global' size-in-bits='32'>
                 <parameter type-id='48e19127' is-artificial='yes'/>
-                <parameter type-id='98980936'/>
+                <parameter type-id='76638de7'/>
                 <parameter type-id='2dd38501'/>
                 <return type-id='48b5725f'/>
               </function-decl>
@@ -37693,7 +37695,7 @@
             <member-function access='public'>
               <function-decl name='__value_func&lt;(lambda at frameworks/base/native/android/surface_control.cpp:282:57), std::__1::allocator&lt;(lambda at frameworks/base/native/android/surface_control.cpp:282:57)&gt; &gt;' mangled-name='_ZNSt3__110__function12__value_funcIFvPvxRKN7android2spINS3_5FenceEEERKNS_6vectorINS3_19SurfaceControlStatsENS_9allocatorISA_EEEEEEC2IZ33ASurfaceTransaction_setOnCompleteE3$_0NSB_ISJ_EEEEOT_T0_' filepath='external/libcxx/include/functional' line='1695' column='1' visibility='default' binding='global' size-in-bits='32'>
                 <parameter type-id='c458ede8' is-artificial='yes'/>
-                <parameter type-id='98980936'/>
+                <parameter type-id='76638de7'/>
                 <parameter type-id='7d748444'/>
                 <return type-id='48b5725f'/>
               </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 805ff811..a7cc8997 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -2168,56 +2168,50 @@
     <array-type-def dimensions='1' type-id='type-id-158' size-in-bits='320' id='type-id-159'>
       <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-38' id='type-id-157'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='2560' id='type-id-161'>
-      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-38' id='type-id-162'/>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='unknown' id='type-id-161'>
+      <subrange length='unknown' lower-bound='0' upper-bound='-1' type-id='type-id-38' id='type-id-162'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='1152' id='type-id-163'>
-      <subrange length='9' lower-bound='0' upper-bound='8' type-id='type-id-38' id='type-id-164'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='unknown' id='type-id-166'>
-      <subrange length='unknown' lower-bound='0' upper-bound='-1' type-id='type-id-38' id='type-id-167'/>
-    </array-type-def>
-    <class-decl name='AutoData' size-in-bits='192' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='208' column='1' id='type-id-168'>
+    <class-decl name='AutoData' size-in-bits='192' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='208' column='1' id='type-id-163'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='cpu_addr' type-id='type-id-169' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='251' column='1'/>
+        <var-decl name='cpu_addr' type-id='type-id-164' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='ref_count' type-id='type-id-170' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='255' column='1'/>
+        <var-decl name='ref_count' type-id='type-id-165' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='255' column='1'/>
       </data-member>
       <member-function access='private' const='yes'>
         <function-decl name='get_reference' mangled-name='_ZNK8AutoData13get_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8AutoData13get_referenceEv'>
-          <parameter type-id='type-id-171' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-166' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='nullify_reference' mangled-name='_ZN8AutoData17nullify_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8AutoData17nullify_referenceEv'>
-          <parameter type-id='type-id-172' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='remove_reference' mangled-name='_ZN8AutoData16remove_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8AutoData16remove_referenceEv'>
-          <parameter type-id='type-id-172' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='add_reference' mangled-name='_ZN8AutoData13add_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8AutoData13add_referenceEv'>
-          <parameter type-id='type-id-172' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='operator&lt;' mangled-name='_ZNK8AutoDataltERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8AutoDataltERKS_'>
-          <parameter type-id='type-id-171' is-artificial='yes'/>
-          <parameter type-id='type-id-173'/>
+          <parameter type-id='type-id-166' is-artificial='yes'/>
+          <parameter type-id='type-id-168'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='AutoData' mangled-name='_ZN8AutoDataC4EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-172' is-artificial='yes'/>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
@@ -2225,14 +2219,14 @@
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='AutoData' mangled-name='_ZN8AutoDataC2EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8AutoDataC2EPKvm'>
-          <parameter type-id='type-id-172' is-artificial='yes'/>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='MemRange' size-in-bits='128' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='46' column='1' id='type-id-174'>
+    <class-decl name='MemRange' size-in-bits='128' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='46' column='1' id='type-id-169'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='m_start' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='76' column='1'/>
       </data-member>
@@ -2241,26 +2235,26 @@
       </data-member>
       <member-function access='private' const='yes'>
         <function-decl name='overlaps' mangled-name='_ZNK8MemRange8overlapsERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8MemRange8overlapsERKS_'>
-          <parameter type-id='type-id-175' is-artificial='yes'/>
-          <parameter type-id='type-id-176'/>
+          <parameter type-id='type-id-170' is-artificial='yes'/>
+          <parameter type-id='type-id-171'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='end' mangled-name='_ZNK8MemRange3endEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8MemRange3endEv'>
-          <parameter type-id='type-id-175' is-artificial='yes'/>
+          <parameter type-id='type-id-170' is-artificial='yes'/>
           <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='start' mangled-name='_ZNK8MemRange5startEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8MemRange5startEv'>
-          <parameter type-id='type-id-175' is-artificial='yes'/>
+          <parameter type-id='type-id-170' is-artificial='yes'/>
           <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='MemRange' mangled-name='_ZN8MemRangeC4EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-177' is-artificial='yes'/>
+          <parameter type-id='type-id-172' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
@@ -2268,7 +2262,7 @@
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='MemRange' mangled-name='_ZN8MemRangeC2EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8MemRangeC2EPKvm'>
-          <parameter type-id='type-id-177' is-artificial='yes'/>
+          <parameter type-id='type-id-172' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
@@ -2276,35 +2270,35 @@
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='contains' mangled-name='_ZNK8MemRange8containsERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8MemRange8containsERKS_'>
-          <parameter type-id='type-id-175' is-artificial='yes'/>
-          <parameter type-id='type-id-176'/>
+          <parameter type-id='type-id-170' is-artificial='yes'/>
+          <parameter type-id='type-id-171'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='length' mangled-name='_ZNK8MemRange6lengthEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK8MemRange6lengthEv'>
-          <parameter type-id='type-id-175' is-artificial='yes'/>
+          <parameter type-id='type-id-170' is-artificial='yes'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='MemRange' mangled-name='_ZN8MemRangeC4EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-177' is-artificial='yes'/>
+          <parameter type-id='type-id-172' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='PtrData' size-in-bits='832' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='81' column='1' id='type-id-178'>
+    <class-decl name='PtrData' size-in-bits='832' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='81' column='1' id='type-id-173'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='cpu_addr' type-id='type-id-169' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='137' column='1'/>
+        <var-decl name='cpu_addr' type-id='type-id-164' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='cpu_buf' type-id='type-id-179' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='140' column='1'/>
+        <var-decl name='cpu_buf' type-id='type-id-174' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='mic_buf' type-id='type-id-179' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='141' column='1'/>
+        <var-decl name='mic_buf' type-id='type-id-174' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='141' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <var-decl name='mic_addr' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='144' column='1'/>
@@ -2319,35 +2313,35 @@
         <var-decl name='is_static' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='153' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
-        <var-decl name='alloc_ptr_data_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='154' column='1'/>
+        <var-decl name='alloc_ptr_data_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='154' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <var-decl name='ref_count' type-id='type-id-170' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='158' column='1'/>
+        <var-decl name='ref_count' type-id='type-id-165' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='158' column='1'/>
       </data-member>
       <member-function access='private' const='yes'>
         <function-decl name='operator&lt;' mangled-name='_ZNK7PtrDataltERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK7PtrDataltERKS_'>
-          <parameter type-id='type-id-181' is-artificial='yes'/>
-          <parameter type-id='type-id-182'/>
+          <parameter type-id='type-id-176' is-artificial='yes'/>
+          <parameter type-id='type-id-177'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PtrData' mangled-name='_ZN7PtrDataC4ERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
-          <parameter type-id='type-id-182'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
+          <parameter type-id='type-id-177'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PtrData' mangled-name='_ZN7PtrDataC2ERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7PtrDataC2ERKS_'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
-          <parameter type-id='type-id-182'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
+          <parameter type-id='type-id-177'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PtrData' mangled-name='_ZN7PtrDataC4EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
@@ -2355,7 +2349,7 @@
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PtrData' mangled-name='_ZN7PtrDataC2EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7PtrDataC2EPKvm'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
@@ -2363,85 +2357,85 @@
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='get_reference' mangled-name='_ZNK7PtrData13get_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK7PtrData13get_referenceEv'>
-          <parameter type-id='type-id-181' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-176' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='remove_reference' mangled-name='_ZN7PtrData16remove_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7PtrData16remove_referenceEv'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='add_reference' mangled-name='_ZN7PtrData13add_referenceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7PtrData13add_referenceEv'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
-          <return type-id='type-id-170'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
+          <return type-id='type-id-165'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PtrData' mangled-name='_ZN7PtrDataC4ERKS_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
-          <parameter type-id='type-id-182'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
+          <parameter type-id='type-id-177'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PtrData' mangled-name='_ZN7PtrDataC4EPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-183' is-artificial='yes'/>
+          <parameter type-id='type-id-178' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='PtrDataTable' size-in-bits='704' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='163' column='1' id='type-id-184'>
+    <class-decl name='PtrDataTable' size-in-bits='704' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='163' column='1' id='type-id-179'>
       <member-type access='private'>
-        <typedef-decl name='PtrSet' type-id='type-id-186' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='165' column='1' id='type-id-185'/>
+        <typedef-decl name='PtrSet' type-id='type-id-181' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='165' column='1' id='type-id-180'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='list' type-id='type-id-185' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='203' column='1'/>
+        <var-decl name='list' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
-        <var-decl name='m_ptr_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='204' column='1'/>
+        <var-decl name='m_ptr_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='204' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='insert_ptr_data' mangled-name='_ZN12PtrDataTable15insert_ptr_dataEPKvmRb' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12PtrDataTable15insert_ptr_dataEPKvmRb'>
-          <parameter type-id='type-id-187' is-artificial='yes'/>
+          <parameter type-id='type-id-182' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
-          <parameter type-id='type-id-188'/>
-          <return type-id='type-id-183'/>
+          <parameter type-id='type-id-183'/>
+          <return type-id='type-id-178'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='remove_ptr_data' mangled-name='_ZN12PtrDataTable15remove_ptr_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12PtrDataTable15remove_ptr_dataEPKv'>
-          <parameter type-id='type-id-187' is-artificial='yes'/>
+          <parameter type-id='type-id-182' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='find_ptr_data' mangled-name='_ZN12PtrDataTable13find_ptr_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12PtrDataTable13find_ptr_dataEPKv'>
-          <parameter type-id='type-id-187' is-artificial='yes'/>
+          <parameter type-id='type-id-182' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <return type-id='type-id-183'/>
+          <return type-id='type-id-178'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-152' size-in-bits='2048' id='type-id-189'>
-      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-38' id='type-id-190'/>
+    <array-type-def dimensions='1' type-id='type-id-152' size-in-bits='2048' id='type-id-184'>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-38' id='type-id-185'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-152' size-in-bits='448' id='type-id-191'>
-      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-38' id='type-id-192'/>
+    <array-type-def dimensions='1' type-id='type-id-152' size-in-bits='448' id='type-id-186'>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-38' id='type-id-187'/>
     </array-type-def>
-    <enum-decl name='TARGET_TYPE' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='61' column='1' id='type-id-193'>
+    <enum-decl name='TARGET_TYPE' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='61' column='1' id='type-id-188'>
       <underlying-type type-id='type-id-2'/>
       <enumerator name='TARGET_NONE' value='0'/>
       <enumerator name='TARGET_HOST' value='1'/>
       <enumerator name='TARGET_MIC' value='2'/>
     </enum-decl>
-    <enum-decl name='_Offload_result' naming-typedef-id='type-id-194' linkage-name='15_Offload_result' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='80' column='1' id='type-id-195'>
+    <enum-decl name='_Offload_result' naming-typedef-id='type-id-189' linkage-name='15_Offload_result' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='80' column='1' id='type-id-190'>
       <underlying-type type-id='type-id-2'/>
       <enumerator name='OFFLOAD_SUCCESS' value='0'/>
       <enumerator name='OFFLOAD_DISABLED' value='1'/>
@@ -2450,7 +2444,7 @@
       <enumerator name='OFFLOAD_PROCESS_DIED' value='4'/>
       <enumerator name='OFFLOAD_ERROR' value='5'/>
     </enum-decl>
-    <enum-decl name='error_types' naming-typedef-id='type-id-196' linkage-name='11error_types' filepath='../../../gcc/liboffloadmic/runtime/liboffload_error_codes.h' line='38' column='1' id='type-id-197'>
+    <enum-decl name='error_types' naming-typedef-id='type-id-191' linkage-name='11error_types' filepath='../../../gcc/liboffloadmic/runtime/liboffload_error_codes.h' line='38' column='1' id='type-id-192'>
       <underlying-type type-id='type-id-2'/>
       <enumerator name='c_device_is_not_available' value='0'/>
       <enumerator name='c_invalid_device_number' value='1'/>
@@ -2598,12 +2592,12 @@
       <enumerator name='c_report_stream' value='143'/>
       <enumerator name='c_unload_library' value='144'/>
     </enum-decl>
-    <class-decl name='Arr_Desc' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='46' column='1' id='type-id-198'>
+    <class-decl name='Arr_Desc' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='46' column='1' id='type-id-193'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='base' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='47' column='1'/>
+        <var-decl name='base' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rank' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='48' column='1'/>
+        <var-decl name='rank' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='dim' type-id='type-id-159' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='49' column='1'/>
@@ -2611,33 +2605,33 @@
     </class-decl>
     <class-decl name='CeanReadDim' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='52' column='1' id='type-id-155'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='count' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='53' column='1'/>
+        <var-decl name='count' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='size' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='54' column='1'/>
+        <var-decl name='size' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='54' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='CeanReadRanges' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='58' column='1' id='type-id-200'>
+    <class-decl name='CeanReadRanges' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='58' column='1' id='type-id-195'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arr_desc' type-id='type-id-201' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='59' column='1'/>
+        <var-decl name='arr_desc' type-id='type-id-196' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='ptr' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='current_number' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='61' column='1'/>
+        <var-decl name='current_number' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='range_max_number' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='62' column='1'/>
+        <var-decl name='range_max_number' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='range_size' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='63' column='1'/>
+        <var-decl name='range_size' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='last_noncont_ind' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='init_offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='65' column='1'/>
+        <var-decl name='init_offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='Dim' type-id='type-id-156' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='66' column='1'/>
@@ -2645,22 +2639,22 @@
     </class-decl>
     <class-decl name='Dim_Desc' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='38' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='39' column='1'/>
+        <var-decl name='size' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lindex' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='40' column='1'/>
+        <var-decl name='lindex' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lower' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='41' column='1'/>
+        <var-decl name='lower' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='upper' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='42' column='1'/>
+        <var-decl name='upper' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='stride' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='43' column='1'/>
+        <var-decl name='stride' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/cean_util.h' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='DynLib' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='285' column='1' id='type-id-202'>
+    <class-decl name='DynLib' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='285' column='1' id='type-id-197'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='292' column='1'/>
       </data-member>
@@ -2668,30 +2662,30 @@
         <var-decl name='data' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='295' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='lib' type-id='type-id-203' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='297' column='1'/>
+        <var-decl name='lib' type-id='type-id-198' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='297' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='DynLib' mangled-name='_ZN6DynLibC4EPKcPKvP10coilibrary' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-204' is-artificial='yes'/>
+          <parameter type-id='type-id-199' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-205'/>
+          <parameter type-id='type-id-200'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='DynLib' mangled-name='_ZN6DynLibC2EPKcPKvP10coilibrary' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6DynLibC2EPKcPKvP10coilibrary'>
-          <parameter type-id='type-id-204' is-artificial='yes'/>
+          <parameter type-id='type-id-199' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-205'/>
+          <parameter type-id='type-id-200'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Engine' size-in-bits='5504' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='395' column='1' id='type-id-206'>
+    <class-decl name='Engine' size-in-bits='5504' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='395' column='1' id='type-id-201'>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='647' column='1' id='type-id-207'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='647' column='1' id='type-id-202'>
           <underlying-type type-id='type-id-2'/>
           <enumerator name='c_func_compute' value='0'/>
           <enumerator name='c_func_myo_init' value='1'/>
@@ -2704,10 +2698,10 @@
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <typedef-decl name='SignalMap' type-id='type-id-209' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='608' column='1' id='type-id-208'/>
+        <typedef-decl name='SignalMap' type-id='type-id-204' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='608' column='1' id='type-id-203'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='m_persist_list' type-id='type-id-210' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='563' column='1'/>
+        <var-decl name='m_persist_list' type-id='type-id-205' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='563' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <var-decl name='m_index' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='611' column='1'/>
@@ -2716,37 +2710,37 @@
         <var-decl name='m_physical_index' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='612' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='m_proc_number' type-id='type-id-170' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='615' column='1'/>
+        <var-decl name='m_proc_number' type-id='type-id-165' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='615' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='m_process' type-id='type-id-211' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='618' column='1'/>
+        <var-decl name='m_process' type-id='type-id-206' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='618' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
         <var-decl name='m_ready' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='622' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
-        <var-decl name='m_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='623' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='623' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <var-decl name='m_images' type-id='type-id-212' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='626' column='1'/>
+        <var-decl name='m_images' type-id='type-id-207' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='626' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <var-decl name='m_ptr_set' type-id='type-id-184' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='629' column='1'/>
+        <var-decl name='m_ptr_set' type-id='type-id-179' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='629' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
-        <var-decl name='m_targetptr_set' type-id='type-id-184' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='630' column='1'/>
+        <var-decl name='m_targetptr_set' type-id='type-id-179' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='630' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2368'>
-        <var-decl name='m_signal_map' type-id='type-id-208' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='633' column='1'/>
+        <var-decl name='m_signal_map' type-id='type-id-203' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='633' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2752'>
-        <var-decl name='m_signal_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='634' column='1'/>
+        <var-decl name='m_signal_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='634' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
-        <var-decl name='m_stream_map' type-id='type-id-213' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='637' column='1'/>
+        <var-decl name='m_stream_map' type-id='type-id-208' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='637' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3456'>
-        <var-decl name='m_stream_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='638' column='1'/>
+        <var-decl name='m_stream_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='638' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3776'>
         <var-decl name='m_num_cores' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='639' column='1'/>
@@ -2755,22 +2749,22 @@
         <var-decl name='m_num_threads' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='640' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3840'>
-        <var-decl name='m_cpus' type-id='type-id-214' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='641' column='1'/>
+        <var-decl name='m_cpus' type-id='type-id-209' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='641' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4864'>
-        <var-decl name='m_dyn_libs' type-id='type-id-215' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='644' column='1'/>
+        <var-decl name='m_dyn_libs' type-id='type-id-210' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='644' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
-        <var-decl name='m_func_names' type-id='type-id-191' mangled-name='_ZN6Engine12m_func_namesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='659' column='1' elf-symbol-id='_ZN6Engine12m_func_namesE'/>
+        <var-decl name='m_func_names' type-id='type-id-186' mangled-name='_ZN6Engine12m_func_namesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='659' column='1' elf-symbol-id='_ZN6Engine12m_func_namesE'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
-        <var-decl name='m_funcs' type-id='type-id-216' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='662' column='1'/>
+        <var-decl name='m_funcs' type-id='type-id-211' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='662' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
-        <var-decl name='c_signal_max' type-id='type-id-217' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='665' column='1'/>
+        <var-decl name='c_signal_max' type-id='type-id-212' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='665' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
-        <var-decl name='c_signal_names' type-id='type-id-189' mangled-name='_ZN6Engine14c_signal_namesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='666' column='1' elf-symbol-id='_ZN6Engine14c_signal_namesE'/>
+        <var-decl name='c_signal_names' type-id='type-id-184' mangled-name='_ZN6Engine14c_signal_namesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='666' column='1' elf-symbol-id='_ZN6Engine14c_signal_namesE'/>
       </data-member>
       <member-function access='private' static='yes'>
         <function-decl name='destroy_thread_data' mangled-name='_ZN6Engine19destroy_thread_dataEPv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine19destroy_thread_dataEPv'>
@@ -2780,47 +2774,47 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='get_auto_vars' mangled-name='_ZN6Engine13get_auto_varsEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine13get_auto_varsEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <return type-id='type-id-219'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <return type-id='type-id-214'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_thread_id' mangled-name='_ZN6Engine13get_thread_idEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine13get_thread_idEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='stream_destroy' mangled-name='_ZN6Engine14stream_destroyEm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine14stream_destroyEm'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <parameter type-id='type-id-220'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <parameter type-id='type-id-215'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_pipeline' mangled-name='_ZN6Engine12get_pipelineEm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine12get_pipelineEm'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <parameter type-id='type-id-220'/>
-          <return type-id='type-id-221'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <parameter type-id='type-id-215'/>
+          <return type-id='type-id-216'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='get_pipeline' mangled-name='_ZN6Engine12get_pipelineEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='598' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine12get_pipelineEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <return type-id='type-id-221'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <return type-id='type-id-216'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init_device' mangled-name='_ZN6Engine11init_deviceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine11init_deviceEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <return type-id='type-id-222'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <return type-id='type-id-217'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='compute' mangled-name='_ZN6Engine7computeEmRKNSt7__cxx114listIP9coibufferSaIS3_EEEPKvtPvtjPK8coieventPSB_' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine7computeEmRKNSt7__cxx114listIP9coibufferSaIS3_EEEPKvtPvtjPK8coieventPSB_'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <parameter type-id='type-id-220'/>
-          <parameter type-id='type-id-223'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <parameter type-id='type-id-215'/>
+          <parameter type-id='type-id-218'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-20'/>
           <parameter type-id='type-id-150'/>
@@ -2833,13 +2827,13 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='init_ptr_data' mangled-name='_ZN6Engine13init_ptr_dataEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine13init_ptr_dataEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='unload_library' mangled-name='_ZN6Engine14unload_libraryEPKvPKc' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine14unload_libraryEPKvPKc'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-152'/>
           <return type-id='type-id-154'/>
@@ -2847,41 +2841,41 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='load_libraries' mangled-name='_ZN6Engine14load_librariesEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine14load_librariesEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini_process' mangled-name='_ZN6Engine12fini_processEb' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine12fini_processEb'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-149'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init_process' mangled-name='_ZN6Engine12init_processEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine12init_processEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN6Engine4initEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine4initEv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='insert_ptr_data' mangled-name='_ZN6Engine15insert_ptr_dataEPKvmRb' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine15insert_ptr_dataEPKvmRb'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
-          <parameter type-id='type-id-188'/>
-          <return type-id='type-id-183'/>
+          <parameter type-id='type-id-183'/>
+          <return type-id='type-id-178'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='set_indexes' mangled-name='_ZN6Engine11set_indexesEii' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine11set_indexesEii'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
           <return type-id='type-id-154'/>
@@ -2889,151 +2883,151 @@
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Engine' mangled-name='_ZN6EngineD4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='570' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' 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='~Engine' mangled-name='_ZN6EngineD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6EngineD2Ev'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' 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' constructor='yes'>
         <function-decl name='Engine' mangled-name='_ZN6EngineC4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='Engine' mangled-name='_ZN6EngineC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6EngineC2Ev'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='find_signal' mangled-name='_ZN6Engine11find_signalEPKvb' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine11find_signalEPKvb'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-149'/>
-          <return type-id='type-id-224'/>
+          <return type-id='type-id-219'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_signal' mangled-name='_ZN6Engine10add_signalEPKvP17OffloadDescriptor' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine10add_signalEPKvP17OffloadDescriptor'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-224'/>
+          <parameter type-id='type-id-219'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='remove_auto_data' mangled-name='_ZN6Engine16remove_auto_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='520' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine16remove_auto_dataEPKv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='insert_auto_data' mangled-name='_ZN6Engine16insert_auto_dataEPKvm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine16insert_auto_dataEPKvm'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
-          <return type-id='type-id-172'/>
+          <return type-id='type-id-167'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='find_auto_data' mangled-name='_ZN6Engine14find_auto_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine14find_auto_dataEPKv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <return type-id='type-id-172'/>
+          <return type-id='type-id-167'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='remove_targetptr_data' mangled-name='_ZN6Engine21remove_targetptr_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='497' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine21remove_targetptr_dataEPKv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='remove_ptr_data' mangled-name='_ZN6Engine15remove_ptr_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine15remove_ptr_dataEPKv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='insert_targetptr_data' mangled-name='_ZN6Engine21insert_targetptr_dataEPKvmRb' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine21insert_targetptr_dataEPKvmRb'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
-          <parameter type-id='type-id-188'/>
-          <return type-id='type-id-183'/>
+          <parameter type-id='type-id-183'/>
+          <return type-id='type-id-178'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='find_targetptr_data' mangled-name='_ZN6Engine19find_targetptr_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='480' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine19find_targetptr_dataEPKv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <return type-id='type-id-183'/>
+          <return type-id='type-id-178'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='find_ptr_data' mangled-name='_ZN6Engine13find_ptr_dataEPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine13find_ptr_dataEPKv'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <return type-id='type-id-183'/>
+          <return type-id='type-id-178'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_lib' mangled-name='_ZN6Engine7add_libERK11TargetImage' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine7add_libERK11TargetImage'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
-          <parameter type-id='type-id-225'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
+          <parameter type-id='type-id-220'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' const='yes'>
         <function-decl name='get_process' mangled-name='_ZNK6Engine11get_processEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK6Engine11get_processEv'>
-          <parameter type-id='type-id-226' is-artificial='yes'/>
-          <return type-id='type-id-227'/>
+          <parameter type-id='type-id-221' is-artificial='yes'/>
+          <return type-id='type-id-222'/>
         </function-decl>
       </member-function>
       <member-function access='public' const='yes'>
         <function-decl name='get_logical_index' mangled-name='_ZNK6Engine17get_logical_indexEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK6Engine17get_logical_indexEv'>
-          <parameter type-id='type-id-226' is-artificial='yes'/>
+          <parameter type-id='type-id-221' is-artificial='yes'/>
           <return type-id='type-id-30'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='fini_myo' mangled-name='_ZN6Engine8fini_myoEP8coievent' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine8fini_myoEP8coievent'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-44'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='init_myo' mangled-name='_ZN6Engine8init_myoEP8coievent' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Engine8init_myoEP8coievent'>
-          <parameter type-id='type-id-218' is-artificial='yes'/>
+          <parameter type-id='type-id-213' is-artificial='yes'/>
           <parameter type-id='type-id-44'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' const='yes'>
         <function-decl name='get_physical_index' mangled-name='_ZNK6Engine18get_physical_indexEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK6Engine18get_physical_indexEv'>
-          <parameter type-id='type-id-226' is-artificial='yes'/>
+          <parameter type-id='type-id-221' is-artificial='yes'/>
           <return type-id='type-id-30'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='FunctionDescriptor' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='467' column='1' id='type-id-228'>
+    <class-decl name='FunctionDescriptor' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='467' column='1' id='type-id-223'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='in_datalen' type-id='type-id-229' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='470' column='1'/>
+        <var-decl name='in_datalen' type-id='type-id-224' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='out_datalen' type-id='type-id-229' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='473' column='1'/>
+        <var-decl name='out_datalen' type-id='type-id-224' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='473' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='console_enabled' type-id='type-id-37' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='478' column='1'/>
@@ -3054,29 +3048,29 @@
         <var-decl name='data_offset' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='492' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='data' type-id='type-id-166' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='495' column='1'/>
+        <var-decl name='data' type-id='type-id-161' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='495' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='OffloadDescriptor' size-in-bits='2368' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='68' column='1' id='type-id-230'>
+    <class-decl name='OffloadDescriptor' size-in-bits='2368' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='68' column='1' id='type-id-225'>
       <member-type access='private'>
-        <class-decl name='ReadArrElements&lt;long int&gt;' size-in-bits='512' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='230' column='1' id='type-id-231'>
+        <class-decl name='ReadArrElements&lt;long int&gt;' size-in-bits='512' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='230' column='1' id='type-id-226'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='ranges' type-id='type-id-232' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='269' column='1'/>
+            <var-decl name='ranges' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='269' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='val' type-id='type-id-170' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='270' column='1'/>
+            <var-decl name='val' type-id='type-id-165' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='270' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='128'>
             <var-decl name='el_size' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='271' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='size' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='272' column='1'/>
+            <var-decl name='size' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='272' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='256'>
-            <var-decl name='offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='273' column='1'/>
+            <var-decl name='offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='273' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
-            <var-decl name='length_cur' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='274' column='1'/>
+            <var-decl name='length_cur' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='274' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='384'>
             <var-decl name='is_empty' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='275' column='1'/>
@@ -3085,33 +3079,33 @@
             <var-decl name='count' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='276' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='448'>
-            <var-decl name='base' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='277' column='1'/>
+            <var-decl name='base' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='277' column='1'/>
           </data-member>
           <member-function access='private'>
             <function-decl name='read_next' mangled-name='_ZN17OffloadDescriptor15ReadArrElementsIlE9read_nextEb' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor15ReadArrElementsIlE9read_nextEb'>
-              <parameter type-id='type-id-234' is-artificial='yes'/>
+              <parameter type-id='type-id-229' is-artificial='yes'/>
               <parameter type-id='type-id-149'/>
               <return type-id='type-id-149'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='ReadArrElements' mangled-name='_ZN17OffloadDescriptor15ReadArrElementsIlEC4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-234' is-artificial='yes'/>
+              <parameter type-id='type-id-229' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='ReadArrElements' mangled-name='_ZN17OffloadDescriptor15ReadArrElementsIlEC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor15ReadArrElementsIlEC2Ev'>
-              <parameter type-id='type-id-234' is-artificial='yes'/>
+              <parameter type-id='type-id-229' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='ReadArrElements&lt;void*&gt;' size-in-bits='512' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='230' column='1' id='type-id-235'>
+        <class-decl name='ReadArrElements&lt;void*&gt;' size-in-bits='512' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='230' column='1' id='type-id-230'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='ranges' type-id='type-id-232' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='269' column='1'/>
+            <var-decl name='ranges' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='269' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
             <var-decl name='val' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='270' column='1'/>
@@ -3120,13 +3114,13 @@
             <var-decl name='el_size' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='271' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='size' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='272' column='1'/>
+            <var-decl name='size' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='272' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='256'>
-            <var-decl name='offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='273' column='1'/>
+            <var-decl name='offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='273' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
-            <var-decl name='length_cur' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='274' column='1'/>
+            <var-decl name='length_cur' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='274' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='384'>
             <var-decl name='is_empty' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='275' column='1'/>
@@ -3135,31 +3129,31 @@
             <var-decl name='count' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='276' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='448'>
-            <var-decl name='base' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='277' column='1'/>
+            <var-decl name='base' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='277' column='1'/>
           </data-member>
           <member-function access='private'>
             <function-decl name='read_next' mangled-name='_ZN17OffloadDescriptor15ReadArrElementsIPvE9read_nextEb' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor15ReadArrElementsIPvE9read_nextEb'>
-              <parameter type-id='type-id-236' is-artificial='yes'/>
+              <parameter type-id='type-id-231' is-artificial='yes'/>
               <parameter type-id='type-id-149'/>
               <return type-id='type-id-149'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='ReadArrElements' mangled-name='_ZN17OffloadDescriptor15ReadArrElementsIPvEC4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-236' is-artificial='yes'/>
+              <parameter type-id='type-id-231' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='ReadArrElements' mangled-name='_ZN17OffloadDescriptor15ReadArrElementsIPvEC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor15ReadArrElementsIPvEC2Ev'>
-              <parameter type-id='type-id-236' is-artificial='yes'/>
+              <parameter type-id='type-id-231' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <enum-decl name='OmpAsyncLastEventType' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='71' column='1' id='type-id-237'>
+        <enum-decl name='OmpAsyncLastEventType' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='71' column='1' id='type-id-232'>
           <underlying-type type-id='type-id-2'/>
           <enumerator name='c_last_not' value='0'/>
           <enumerator name='c_last_write' value='1'/>
@@ -3168,53 +3162,53 @@
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='VarExtra' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='216' column='1' id='type-id-238'>
+        <class-decl name='VarExtra' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='216' column='1' id='type-id-233'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='src_data' type-id='type-id-183' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='217' column='1'/>
+            <var-decl name='src_data' type-id='type-id-178' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='217' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='dst_data' type-id='type-id-183' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='218' column='1'/>
+            <var-decl name='dst_data' type-id='type-id-178' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='218' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='auto_data' type-id='type-id-172' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='219' column='1'/>
+            <var-decl name='auto_data' type-id='type-id-167' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='219' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='cpu_disp' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='220' column='1'/>
+            <var-decl name='cpu_disp' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='220' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
-            <var-decl name='cpu_offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='221' column='1'/>
+            <var-decl name='cpu_offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='221' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
             <var-decl name='alloc' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='222' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='384'>
-            <var-decl name='read_rng_src' type-id='type-id-232' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='223' column='1'/>
+            <var-decl name='read_rng_src' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='223' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='448'>
-            <var-decl name='read_rng_dst' type-id='type-id-232' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='224' column='1'/>
+            <var-decl name='read_rng_dst' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='224' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='512'>
-            <var-decl name='ptr_arr_offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='225' column='1'/>
+            <var-decl name='ptr_arr_offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='225' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='576'>
             <var-decl name='is_arr_ptr_el' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='226' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='608'>
-            <var-decl name='omp_last_event_type' type-id='type-id-237' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='227' column='1'/>
+            <var-decl name='omp_last_event_type' type-id='type-id-232' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='227' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <typedef-decl name='BufferList' type-id='type-id-240' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='213' column='1' id='type-id-239'/>
+        <typedef-decl name='BufferList' type-id='type-id-235' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='213' column='1' id='type-id-234'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='m_stack_ptr_data' type-id='type-id-183' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='281' column='1'/>
+        <var-decl name='m_stack_ptr_data' type-id='type-id-178' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='281' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='m_destroy_stack' type-id='type-id-241' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='282' column='1'/>
+        <var-decl name='m_destroy_stack' type-id='type-id-236' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='282' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='m_device' type-id='type-id-242' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='285' column='1'/>
+        <var-decl name='m_device' type-id='type-id-237' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='285' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <var-decl name='m_wait_all_devices' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='288' column='1'/>
@@ -3223,40 +3217,40 @@
         <var-decl name='m_is_mandatory' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='291' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='336'>
-        <var-decl name='m_is_openmp' type-id='type-id-243' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='294' column='1'/>
+        <var-decl name='m_is_openmp' type-id='type-id-238' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='294' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='384'>
-        <var-decl name='m_in' type-id='type-id-244' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='297' column='1'/>
+        <var-decl name='m_in' type-id='type-id-239' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='297' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <var-decl name='m_out' type-id='type-id-244' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='300' column='1'/>
+        <var-decl name='m_out' type-id='type-id-239' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='300' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <var-decl name='m_compute_buffers' type-id='type-id-239' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='303' column='1'/>
+        <var-decl name='m_compute_buffers' type-id='type-id-234' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='303' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <var-decl name='m_destroy_buffers' type-id='type-id-239' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='306' column='1'/>
+        <var-decl name='m_destroy_buffers' type-id='type-id-234' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='306' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <var-decl name='m_vars' type-id='type-id-245' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='309' column='1'/>
+        <var-decl name='m_vars' type-id='type-id-240' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='309' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
-        <var-decl name='m_vars_extra' type-id='type-id-246' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='310' column='1'/>
+        <var-decl name='m_vars_extra' type-id='type-id-241' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='310' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
         <var-decl name='m_vars_total' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='311' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
-        <var-decl name='m_status' type-id='type-id-247' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='314' column='1'/>
+        <var-decl name='m_status' type-id='type-id-242' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='314' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1536'>
-        <var-decl name='m_func_desc' type-id='type-id-248' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='317' column='1'/>
+        <var-decl name='m_func_desc' type-id='type-id-243' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='317' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1600'>
         <var-decl name='m_func_desc_size' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='318' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
-        <var-decl name='m_inout_buf' type-id='type-id-179' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='321' column='1'/>
+        <var-decl name='m_inout_buf' type-id='type-id-174' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='321' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1728'>
         <var-decl name='m_in_deps' type-id='type-id-44' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='324' column='1'/>
@@ -3277,10 +3271,10 @@
         <var-decl name='m_out_deps_allocated' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='329' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1984'>
-        <var-decl name='m_stream' type-id='type-id-220' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='332' column='1'/>
+        <var-decl name='m_stream' type-id='type-id-215' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='332' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2048'>
-        <var-decl name='m_timer_data' type-id='type-id-249' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='335' column='1'/>
+        <var-decl name='m_timer_data' type-id='type-id-244' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='335' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2112'>
         <var-decl name='m_in_datalen' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='338' column='1'/>
@@ -3304,81 +3298,81 @@
         <var-decl name='m_traceback_called' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='360' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
-        <var-decl name='m_omp_async_last_event_type' type-id='type-id-237' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='362' column='1'/>
+        <var-decl name='m_omp_async_last_event_type' type-id='type-id-232' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='362' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_stream' mangled-name='_ZN17OffloadDescriptor10get_streamEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor10get_streamEv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <return type-id='type-id-220'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <return type-id='type-id-215'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set_stream' mangled-name='_ZN17OffloadDescriptor10set_streamEm' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor10set_streamEm'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-220'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-215'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~OffloadDescriptor' mangled-name='_ZN17OffloadDescriptorD4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' 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='~OffloadDescriptor' mangled-name='_ZN17OffloadDescriptorD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptorD2Ev'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' 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' constructor='yes'>
         <function-decl name='OffloadDescriptor' mangled-name='_ZN17OffloadDescriptorC4EiP15_Offload_statusbbP20OffloadHostTimerData' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-247'/>
+          <parameter type-id='type-id-242'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-149'/>
-          <parameter type-id='type-id-249'/>
+          <parameter type-id='type-id-244'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='OffloadDescriptor' mangled-name='_ZN17OffloadDescriptorC2EiP15_Offload_statusbbP20OffloadHostTimerData' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptorC2EiP15_Offload_statusbbP20OffloadHostTimerData'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-247'/>
+          <parameter type-id='type-id-242'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-149'/>
-          <parameter type-id='type-id-249'/>
+          <parameter type-id='type-id-244'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='get_stream_in_dependencies' mangled-name='_ZN17OffloadDescriptor26get_stream_in_dependenciesERjRP8coievent' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor26get_stream_in_dependenciesERjRP8coievent'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-250'/>
-          <parameter type-id='type-id-251'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-245'/>
+          <parameter type-id='type-id-246'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='gen_var_descs_for_pointer_array' mangled-name='_ZN17OffloadDescriptor31gen_var_descs_for_pointer_arrayEi' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor31gen_var_descs_for_pointer_arrayEi'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='scatter_copyout_data' mangled-name='_ZN17OffloadDescriptor20scatter_copyout_dataEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor20scatter_copyout_dataEv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='receive_pointer_data' mangled-name='_ZN17OffloadDescriptor20receive_pointer_dataEbbPv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor20receive_pointer_dataEbbPv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-150'/>
@@ -3387,11 +3381,11 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='receive_noncontiguous_pointer_data' mangled-name='_ZN17OffloadDescriptor34receive_noncontiguous_pointer_dataEiP9coibufferP8coieventRmjS3_' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor34receive_noncontiguous_pointer_dataEiP9coibufferP8coieventRmjS3_'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-247'/>
           <parameter type-id='type-id-44'/>
-          <parameter type-id='type-id-253'/>
+          <parameter type-id='type-id-248'/>
           <parameter type-id='type-id-17'/>
           <parameter type-id='type-id-44'/>
           <return type-id='type-id-149'/>
@@ -3399,20 +3393,20 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='compute' mangled-name='_ZN17OffloadDescriptor7computeEPv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor7computeEPv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='gather_copyin_data' mangled-name='_ZN17OffloadDescriptor18gather_copyin_dataEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor18gather_copyin_dataEv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='send_pointer_data' mangled-name='_ZN17OffloadDescriptor17send_pointer_dataEbPv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor17send_pointer_dataEbPv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-149'/>
@@ -3420,12 +3414,12 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='send_noncontiguous_pointer_data' mangled-name='_ZN17OffloadDescriptor31send_noncontiguous_pointer_dataEiP7PtrDataS1_P8coieventRmjS3_' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor31send_noncontiguous_pointer_dataEiP7PtrDataS1_P8coieventRmjS3_'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-183'/>
-          <parameter type-id='type-id-183'/>
+          <parameter type-id='type-id-178'/>
+          <parameter type-id='type-id-178'/>
           <parameter type-id='type-id-44'/>
-          <parameter type-id='type-id-253'/>
+          <parameter type-id='type-id-248'/>
           <parameter type-id='type-id-17'/>
           <parameter type-id='type-id-44'/>
           <return type-id='type-id-149'/>
@@ -3433,69 +3427,69 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='is_signaled' mangled-name='_ZN17OffloadDescriptor11is_signaledEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor11is_signaledEv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='cleanup' mangled-name='_ZN17OffloadDescriptor7cleanupEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor7cleanupEv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='offload_finish' mangled-name='_ZN17OffloadDescriptor14offload_finishEb' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor14offload_finishEb'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-149'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='offload' mangled-name='_ZN17OffloadDescriptor7offloadEPKcbP7VarDescP8VarDesc2iPPKviS8_iS7_12OffloadFlags' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor7offloadEPKcbP7VarDescP8VarDesc2iPPKviS8_iS7_12OffloadFlags'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <parameter type-id='type-id-149'/>
-          <parameter type-id='type-id-245'/>
-          <parameter type-id='type-id-254'/>
+          <parameter type-id='type-id-240'/>
+          <parameter type-id='type-id-249'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-151'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-151'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-255'/>
+          <parameter type-id='type-id-250'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='offload_wrap' mangled-name='_ZN17OffloadDescriptor12offload_wrapEPKcbP7VarDescP8VarDesc2iPPKviS8_iS7_12OffloadFlags' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor12offload_wrapEPKcbP7VarDescP8VarDesc2iPPKviS8_iS7_12OffloadFlags'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <parameter type-id='type-id-149'/>
-          <parameter type-id='type-id-245'/>
-          <parameter type-id='type-id-254'/>
+          <parameter type-id='type-id-240'/>
+          <parameter type-id='type-id-249'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-151'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-151'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-255'/>
+          <parameter type-id='type-id-250'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='wait_dependencies' mangled-name='_ZN17OffloadDescriptor17wait_dependenciesEPPKvim' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor17wait_dependenciesEPPKvim'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-151'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-220'/>
+          <parameter type-id='type-id-215'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <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-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-47'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
@@ -3503,22 +3497,22 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='setup_omp_async_info' mangled-name='_ZN17OffloadDescriptor20setup_omp_async_infoEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor20setup_omp_async_infoEv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setup_misc_data' mangled-name='_ZN17OffloadDescriptor15setup_misc_dataEPKc' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor15setup_misc_dataEPKc'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='setup_descriptors' mangled-name='_ZN17OffloadDescriptor17setup_descriptorsEP7VarDescP8VarDesc2iiPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor17setup_descriptorsEP7VarDescP8VarDesc2iiPKv'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-245'/>
-          <parameter type-id='type-id-254'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-240'/>
+          <parameter type-id='type-id-249'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-150'/>
@@ -3527,44 +3521,44 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='offload_stack_memory_manager' mangled-name='_ZN17OffloadDescriptor28offload_stack_memory_managerEPKviiiPb' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor28offload_stack_memory_managerEPKviiiPb'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-256'/>
+          <parameter type-id='type-id-251'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='nullify_target_stack' mangled-name='_ZN17OffloadDescriptor20nullify_target_stackEP9coibufferm' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor20nullify_target_stackEP9coibufferm'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-252'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-247'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init_mic_address' mangled-name='_ZN17OffloadDescriptor16init_mic_addressEP7PtrData' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor16init_mic_addressEP7PtrData'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-183'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-178'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='init_static_ptr_data' mangled-name='_ZN17OffloadDescriptor20init_static_ptr_dataEP7PtrData' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor20init_static_ptr_dataEP7PtrData'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-183'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-178'/>
           <return type-id='type-id-149'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='find_ptr_data' mangled-name='_ZN17OffloadDescriptor13find_ptr_dataERP7PtrDataPvllbb' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor13find_ptr_dataERP7PtrDataPvllbb'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-257'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-252'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-199'/>
-          <parameter type-id='type-id-199'/>
+          <parameter type-id='type-id-194'/>
+          <parameter type-id='type-id-194'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-149'/>
           <return type-id='type-id-149'/>
@@ -3572,12 +3566,12 @@
       </member-function>
       <member-function access='private'>
         <function-decl name='alloc_ptr_data' mangled-name='_ZN17OffloadDescriptor14alloc_ptr_dataERP7PtrDataPvlllibbb' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor14alloc_ptr_dataERP7PtrDataPvlllibbb'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-257'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-252'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-199'/>
-          <parameter type-id='type-id-199'/>
-          <parameter type-id='type-id-199'/>
+          <parameter type-id='type-id-194'/>
+          <parameter type-id='type-id-194'/>
+          <parameter type-id='type-id-194'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-149'/>
           <parameter type-id='type-id-149'/>
@@ -3587,36 +3581,36 @@
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='translate_coi_error' mangled-name='_ZNK17OffloadDescriptor19translate_coi_errorE9COIRESULT' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK17OffloadDescriptor19translate_coi_errorE9COIRESULT'>
-          <parameter type-id='type-id-258' is-artificial='yes'/>
+          <parameter type-id='type-id-253' is-artificial='yes'/>
           <parameter type-id='type-id-24'/>
-          <return type-id='type-id-194'/>
+          <return type-id='type-id-189'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='report_coi_error' mangled-name='_ZN17OffloadDescriptor16report_coi_errorE11error_types9COIRESULT' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor16report_coi_errorE11error_types9COIRESULT'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
-          <parameter type-id='type-id-196'/>
+          <parameter type-id='type-id-219' is-artificial='yes'/>
+          <parameter type-id='type-id-191'/>
           <parameter type-id='type-id-24'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' const='yes'>
         <function-decl name='get_timer_data' mangled-name='_ZNK17OffloadDescriptor14get_timer_dataEv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK17OffloadDescriptor14get_timer_dataEv'>
-          <parameter type-id='type-id-258' is-artificial='yes'/>
-          <return type-id='type-id-249'/>
+          <parameter type-id='type-id-253' is-artificial='yes'/>
+          <return type-id='type-id-244'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~OffloadDescriptor' mangled-name='_ZN17OffloadDescriptorD4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-224' is-artificial='yes'/>
+          <parameter type-id='type-id-219' 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='OffloadHostTimerData' size-in-bits='4160' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='51' column='1' id='type-id-259'>
+    <class-decl name='OffloadHostTimerData' size-in-bits='4160' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='51' column='1' id='type-id-254'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='57' column='1' id='type-id-160'>
+        <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='57' column='1' id='type-id-255'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='start' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='58' column='1'/>
           </data-member>
@@ -3632,7 +3626,7 @@
         <var-decl name='line' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='phases' type-id='type-id-161' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='60' column='1'/>
+        <var-decl name='phases' type-id='type-id-256' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
         <var-decl name='sent_bytes' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='62' column='1'/>
@@ -3647,21 +3641,21 @@
         <var-decl name='offload_number' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='target' type-id='type-id-260' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='68' column='1'/>
+        <var-decl name='target' type-id='type-id-257' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='next' type-id='type-id-249' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='71' column='1'/>
+        <var-decl name='next' type-id='type-id-244' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='71' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='OffloadTargetTimerData' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='43' column='1' id='type-id-260'>
+    <class-decl name='OffloadTargetTimerData' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='43' column='1' id='type-id-257'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='frequency' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='phases' type-id='type-id-163' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='48' column='1'/>
+        <var-decl name='phases' type-id='type-id-258' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='48' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='PersistData' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='302' column='1' id='type-id-261'>
+    <class-decl name='PersistData' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='302' column='1' id='type-id-259'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack_cpu_addr' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='311' column='1'/>
       </data-member>
@@ -3672,14 +3666,14 @@
         <var-decl name='thread_id' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='stack_ptr_data' type-id='type-id-183' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='318' column='1'/>
+        <var-decl name='stack_ptr_data' type-id='type-id-178' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='cpu_stack_addr' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='320' column='1'/>
+        <var-decl name='cpu_stack_addr' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='320' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='PersistData' mangled-name='_ZN11PersistDataC4EPKvmmm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-262' is-artificial='yes'/>
+          <parameter type-id='type-id-260' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -3689,7 +3683,7 @@
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='PersistData' mangled-name='_ZN11PersistDataC2EPKvmmm' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11PersistDataC2EPKvmmm'>
-          <parameter type-id='type-id-262' is-artificial='yes'/>
+          <parameter type-id='type-id-260' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-19'/>
@@ -3698,18 +3692,18 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Stream' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='326' column='1' id='type-id-263'>
+    <class-decl name='Stream' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='326' column='1' id='type-id-261'>
       <member-type access='public'>
-        <typedef-decl name='StreamMap' type-id='type-id-264' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='371' column='1' id='type-id-213'/>
+        <typedef-decl name='StreamMap' type-id='type-id-262' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='371' column='1' id='type-id-208'/>
       </member-type>
       <data-member access='public' static='yes'>
         <var-decl name='m_streams_count' type-id='type-id-19' mangled-name='_ZN6Stream15m_streams_countE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='373' column='1' elf-symbol-id='_ZN6Stream15m_streams_countE'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='all_streams' type-id='type-id-213' mangled-name='_ZN6Stream11all_streamsE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='374' column='1' elf-symbol-id='_ZN6Stream11all_streamsE'/>
+        <var-decl name='all_streams' type-id='type-id-208' mangled-name='_ZN6Stream11all_streamsE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='374' column='1' elf-symbol-id='_ZN6Stream11all_streamsE'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='m_stream_lock' type-id='type-id-180' mangled-name='_ZN6Stream13m_stream_lockE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='375' column='1' elf-symbol-id='_ZN6Stream13m_stream_lockE'/>
+        <var-decl name='m_stream_lock' type-id='type-id-175' mangled-name='_ZN6Stream13m_stream_lockE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='375' column='1' elf-symbol-id='_ZN6Stream13m_stream_lockE'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='m_device' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='377' column='1'/>
@@ -3718,17 +3712,17 @@
         <var-decl name='m_number_of_cpus' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='m_pipeline' type-id='type-id-265' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='383' column='1'/>
+        <var-decl name='m_pipeline' type-id='type-id-263' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='m_last_offload' type-id='type-id-224' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='386' column='1'/>
+        <var-decl name='m_last_offload' type-id='type-id-219' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='m_stream_cpus' type-id='type-id-214' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='389' column='1'/>
+        <var-decl name='m_stream_cpus' type-id='type-id-209' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='389' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='get_device' mangled-name='_ZN6Stream10get_deviceEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream10get_deviceEv'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
           <return type-id='type-id-30'/>
         </function-decl>
       </member-function>
@@ -3736,38 +3730,38 @@
         <function-decl name='find_stream' mangled-name='_ZN6Stream11find_streamEmb' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream11find_streamEmb'>
           <parameter type-id='type-id-19'/>
           <parameter type-id='type-id-149'/>
-          <return type-id='type-id-266'/>
+          <return type-id='type-id-264'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set_pipeline' mangled-name='_ZN6Stream12set_pipelineEP11coipipeline' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream12set_pipelineEP11coipipeline'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
-          <parameter type-id='type-id-221'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
+          <parameter type-id='type-id-216'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_cpu_number' mangled-name='_ZN6Stream14get_cpu_numberEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream14get_cpu_numberEv'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
           <return type-id='type-id-30'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_pipeline' mangled-name='_ZN6Stream12get_pipelineEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream12get_pipelineEv'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
-          <return type-id='type-id-221'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
+          <return type-id='type-id-216'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Stream' mangled-name='_ZN6StreamD4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' 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='~Stream' mangled-name='_ZN6StreamD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6StreamD2Ev'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
           <parameter type-id='type-id-30' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
@@ -3776,32 +3770,32 @@
         <function-decl name='add_stream' mangled-name='_ZN6Stream10add_streamEii' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream10add_streamEii'>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
-          <return type-id='type-id-220'/>
+          <return type-id='type-id-215'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set_last_offload' mangled-name='_ZN6Stream16set_last_offloadEP17OffloadDescriptor' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream16set_last_offloadEP17OffloadDescriptor'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
-          <parameter type-id='type-id-224'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
+          <parameter type-id='type-id-219'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_last_offload' mangled-name='_ZN6Stream16get_last_offloadEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Stream16get_last_offloadEv'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
-          <return type-id='type-id-224'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
+          <return type-id='type-id-219'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~Stream' mangled-name='_ZN6StreamD4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' 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' constructor='yes'>
         <function-decl name='Stream' mangled-name='_ZN6StreamC4Eii' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
           <return type-id='type-id-154'/>
@@ -3809,14 +3803,14 @@
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='Stream' mangled-name='_ZN6StreamC2Eii' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6StreamC2Eii'>
-          <parameter type-id='type-id-266' is-artificial='yes'/>
+          <parameter type-id='type-id-264' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
           <parameter type-id='type-id-30'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='TargetImage' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='262' column='1' id='type-id-267'>
+    <class-decl name='TargetImage' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='262' column='1' id='type-id-265'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='271' column='1'/>
       </data-member>
@@ -3834,7 +3828,7 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='TargetImage' mangled-name='_ZN11TargetImageC4EPKcPKvmS1_m' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-268' is-artificial='yes'/>
+          <parameter type-id='type-id-266' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
@@ -3845,7 +3839,7 @@
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='TargetImage' mangled-name='_ZN11TargetImageC2EPKcPKvmS1_m' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11TargetImageC2EPKcPKvmS1_m'>
-          <parameter type-id='type-id-268' is-artificial='yes'/>
+          <parameter type-id='type-id-266' is-artificial='yes'/>
           <parameter type-id='type-id-152'/>
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-19'/>
@@ -3855,21 +3849,21 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='VarDesc' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='254' column='1' id='type-id-269'>
+    <class-decl name='VarDesc' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='254' column='1' id='type-id-267'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='287' column='1' id='type-id-270'>
+        <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='287' column='1' id='type-id-268'>
           <data-member access='public'>
-            <var-decl name='count' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='291' column='1'/>
+            <var-decl name='count' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='291' column='1'/>
           </data-member>
           <data-member access='public'>
-            <var-decl name='disp' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='293' column='1'/>
+            <var-decl name='disp' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='293' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='256' column='1' id='type-id-271'>
+        <union-decl name='__anonymous_union__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='256' column='1' id='type-id-269'>
           <member-type access='public'>
-            <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='257' column='1' id='type-id-272'>
+            <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='257' column='1' id='type-id-270'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='dst' type-id='type-id-37' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='258' column='1'/>
               </data-member>
@@ -3879,7 +3873,7 @@
             </class-decl>
           </member-type>
           <data-member access='public'>
-            <var-decl name='' type-id='type-id-272' visibility='default'/>
+            <var-decl name='' type-id='type-id-270' visibility='default'/>
           </data-member>
           <data-member access='public'>
             <var-decl name='bits' type-id='type-id-37' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='261' column='1'/>
@@ -3887,9 +3881,9 @@
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__1' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='265' column='1' id='type-id-273'>
+        <union-decl name='__anonymous_union__1' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='265' column='1' id='type-id-271'>
           <member-type access='public'>
-            <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='266' column='1' id='type-id-274'>
+            <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='266' column='1' id='type-id-272'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='in' type-id='type-id-37' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='267' column='1'/>
               </data-member>
@@ -3899,7 +3893,7 @@
             </class-decl>
           </member-type>
           <data-member access='public'>
-            <var-decl name='' type-id='type-id-274' visibility='default'/>
+            <var-decl name='' type-id='type-id-272' visibility='default'/>
           </data-member>
           <data-member access='public'>
             <var-decl name='bits' type-id='type-id-37' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='270' column='1'/>
@@ -3907,20 +3901,20 @@
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__3' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='298' column='1' id='type-id-275'>
+        <union-decl name='__anonymous_union__3' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='298' column='1' id='type-id-273'>
           <data-member access='public'>
             <var-decl name='alloc' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='299' column='1'/>
           </data-member>
           <data-member access='public'>
-            <var-decl name='ptr_arr_offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='300' column='1'/>
+            <var-decl name='ptr_arr_offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='300' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-271' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='262' column='1'/>
+        <var-decl name='type' type-id='type-id-269' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='262' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='direction' type-id='type-id-273' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='271' column='1'/>
+        <var-decl name='direction' type-id='type-id-271' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='271' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='alloc_if' type-id='type-id-37' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='273' column='1'/>
@@ -3935,19 +3929,19 @@
         <var-decl name='mic_offset' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='flags' type-id='type-id-276' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='280' column='1'/>
+        <var-decl name='flags' type-id='type-id-274' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='280' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='offset' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='283' column='1'/>
+        <var-decl name='offset' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='283' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='size' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='286' column='1'/>
+        <var-decl name='size' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='' type-id='type-id-270' visibility='default'/>
+        <var-decl name='' type-id='type-id-268' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='' type-id='type-id-275' visibility='default'/>
+        <var-decl name='' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='into' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='306' column='1'/>
@@ -3956,7 +3950,7 @@
         <var-decl name='ptr' type-id='type-id-150' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='314' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='VarDesc2' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='318' column='1' id='type-id-277'>
+    <class-decl name='VarDesc2' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='318' column='1' id='type-id-275'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='sname' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='319' column='1'/>
       </data-member>
@@ -3964,34 +3958,40 @@
         <var-decl name='dname' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='320' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='_Offload_status' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-278' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='89' column='1' id='type-id-279'>
+    <class-decl name='_Offload_status' size-in-bits='192' is-struct='yes' naming-typedef-id='type-id-276' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='89' column='1' id='type-id-277'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='result' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='90' column='1'/>
+        <var-decl name='result' type-id='type-id-189' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='device_number' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data_sent' type-id='type-id-280' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='92' column='1'/>
+        <var-decl name='data_sent' type-id='type-id-278' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data_received' type-id='type-id-280' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='93' column='1'/>
+        <var-decl name='data_received' type-id='type-id-278' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='93' column='1'/>
       </data-member>
     </class-decl>
+    <array-type-def dimensions='1' type-id='type-id-255' size-in-bits='2560' id='type-id-256'>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-38' id='type-id-279'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-255' size-in-bits='1152' id='type-id-258'>
+      <subrange length='9' lower-bound='0' upper-bound='8' type-id='type-id-38' id='type-id-280'/>
+    </array-type-def>
     <typedef-decl name='AutoSet' type-id='type-id-281' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='259' column='1' id='type-id-282'/>
-    <typedef-decl name='DynLibList' type-id='type-id-283' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='299' column='1' id='type-id-215'/>
-    <typedef-decl name='OFFLOAD' type-id='type-id-224' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='500' column='1' id='type-id-284'/>
-    <typedef-decl name='PersistDataList' type-id='type-id-285' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='323' column='1' id='type-id-210'/>
-    <typedef-decl name='PtrDataList' type-id='type-id-286' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='161' column='1' id='type-id-241'/>
-    <typedef-decl name='TARGET_TYPE' type-id='type-id-193' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='65' column='1' id='type-id-287'/>
-    <typedef-decl name='TargetImageList' type-id='type-id-288' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='282' column='1' id='type-id-212'/>
-    <typedef-decl name='_Offload_result' type-id='type-id-195' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='87' column='1' id='type-id-194'/>
-    <typedef-decl name='_Offload_status' type-id='type-id-279' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='94' column='1' id='type-id-278'/>
-    <typedef-decl name='_Offload_stream' type-id='type-id-19' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='96' column='1' id='type-id-220'/>
+    <typedef-decl name='DynLibList' type-id='type-id-283' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='299' column='1' id='type-id-210'/>
+    <typedef-decl name='OFFLOAD' type-id='type-id-219' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='500' column='1' id='type-id-284'/>
+    <typedef-decl name='PersistDataList' type-id='type-id-285' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='323' column='1' id='type-id-205'/>
+    <typedef-decl name='PtrDataList' type-id='type-id-286' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='161' column='1' id='type-id-236'/>
+    <typedef-decl name='TARGET_TYPE' type-id='type-id-188' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='65' column='1' id='type-id-287'/>
+    <typedef-decl name='TargetImageList' type-id='type-id-288' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.h' line='282' column='1' id='type-id-207'/>
+    <typedef-decl name='_Offload_result' type-id='type-id-190' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='87' column='1' id='type-id-189'/>
+    <typedef-decl name='_Offload_status' type-id='type-id-277' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='94' column='1' id='type-id-276'/>
+    <typedef-decl name='_Offload_stream' type-id='type-id-19' filepath='../../../gcc/liboffloadmic/runtime/offload.h' line='96' column='1' id='type-id-215'/>
     <typedef-decl name='__pid_t' type-id='type-id-30' filepath='/usr/include/bits/types.h' line='133' column='1' id='type-id-289'/>
-    <typedef-decl name='error_types' type-id='type-id-197' filepath='../../../gcc/liboffloadmic/runtime/liboffload_error_codes.h' line='184' column='1' id='type-id-196'/>
-    <typedef-decl name='pid_t' type-id='type-id-289' filepath='/usr/include/unistd.h' line='260' column='1' id='type-id-222'/>
-    <union-decl name='OffloadFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='160' column='1' id='type-id-255'>
+    <typedef-decl name='error_types' type-id='type-id-192' filepath='../../../gcc/liboffloadmic/runtime/liboffload_error_codes.h' line='184' column='1' id='type-id-191'/>
+    <typedef-decl name='pid_t' type-id='type-id-289' filepath='/usr/include/unistd.h' line='260' column='1' id='type-id-217'/>
+    <union-decl name='OffloadFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='160' column='1' id='type-id-250'>
       <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='162' column='1' id='type-id-290'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -4009,7 +4009,7 @@
         <var-decl name='bits' type-id='type-id-290' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='165' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='varDescFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='217' column='1' id='type-id-276'>
+    <union-decl name='varDescFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='217' column='1' id='type-id-274'>
       <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='218' column='1' id='type-id-291'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -4081,37 +4081,37 @@
     <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='1024' id='type-id-302'>
       <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-38' id='type-id-295'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-201'/>
-    <reference-type-def kind='lvalue' type-id='type-id-168' size-in-bits='64' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-172'/>
-    <reference-type-def kind='lvalue' type-id='type-id-282' size-in-bits='64' id='type-id-219'/>
-    <reference-type-def kind='lvalue' type-id='type-id-44' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-232'/>
-    <reference-type-def kind='lvalue' type-id='type-id-202' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-204'/>
-    <reference-type-def kind='lvalue' type-id='type-id-206' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-249'/>
-    <reference-type-def kind='lvalue' type-id='type-id-261' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
-    <reference-type-def kind='lvalue' type-id='type-id-178' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-183'/>
-    <qualified-type-def type-id='type-id-183' const='yes' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-196'/>
+    <reference-type-def kind='lvalue' type-id='type-id-163' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-167'/>
+    <reference-type-def kind='lvalue' type-id='type-id-282' size-in-bits='64' id='type-id-214'/>
+    <reference-type-def kind='lvalue' type-id='type-id-44' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-227'/>
+    <reference-type-def kind='lvalue' type-id='type-id-197' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-199'/>
+    <reference-type-def kind='lvalue' type-id='type-id-201' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-244'/>
+    <reference-type-def kind='lvalue' type-id='type-id-259' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <reference-type-def kind='lvalue' type-id='type-id-173' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-178'/>
+    <qualified-type-def type-id='type-id-178' 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'/>
-    <reference-type-def kind='lvalue' type-id='type-id-183' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-310'/>
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-187'/>
-    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-266'/>
-    <reference-type-def kind='lvalue' type-id='type-id-267' size-in-bits='64' id='type-id-311'/>
-    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-247'/>
+    <reference-type-def kind='lvalue' type-id='type-id-178' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-264'/>
+    <reference-type-def kind='lvalue' type-id='type-id-265' size-in-bits='64' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-242'/>
     <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-313'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-315'/>
     <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-317'/>
@@ -4144,29 +4144,29 @@
     <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-371'/>
     <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-373'/>
     <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-375'/>
-    <reference-type-def kind='lvalue' type-id='type-id-149' size-in-bits='64' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-256'/>
-    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-376'/>
-    <reference-type-def kind='lvalue' type-id='type-id-376' size-in-bits='64' id='type-id-173'/>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-171'/>
-    <qualified-type-def type-id='type-id-202' const='yes' id='type-id-377'/>
+    <reference-type-def kind='lvalue' type-id='type-id-149' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-251'/>
+    <qualified-type-def type-id='type-id-163' const='yes' id='type-id-376'/>
+    <reference-type-def kind='lvalue' type-id='type-id-376' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-166'/>
+    <qualified-type-def type-id='type-id-197' 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-206' const='yes' id='type-id-380'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-226'/>
-    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-169'/>
-    <reference-type-def kind='lvalue' type-id='type-id-169' size-in-bits='64' id='type-id-176'/>
-    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-175'/>
-    <qualified-type-def type-id='type-id-230' const='yes' id='type-id-381'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-382'/>
+    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-221'/>
+    <qualified-type-def type-id='type-id-169' const='yes' id='type-id-164'/>
+    <reference-type-def kind='lvalue' type-id='type-id-164' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-170'/>
+    <qualified-type-def type-id='type-id-225' const='yes' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-253'/>
+    <qualified-type-def type-id='type-id-259' 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-178' const='yes' id='type-id-385'/>
-    <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-182'/>
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-181'/>
-    <qualified-type-def type-id='type-id-267' const='yes' id='type-id-386'/>
-    <reference-type-def kind='lvalue' type-id='type-id-386' size-in-bits='64' id='type-id-225'/>
+    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-385'/>
+    <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-177'/>
+    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-176'/>
+    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-386'/>
+    <reference-type-def kind='lvalue' type-id='type-id-386' size-in-bits='64' id='type-id-220'/>
     <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-387'/>
     <qualified-type-def type-id='type-id-312' const='yes' id='type-id-388'/>
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-389'/>
@@ -4250,7 +4250,7 @@
     <qualified-type-def type-id='type-id-374' 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'/>
-    <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-212' 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'/>
     <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-474'/>
@@ -4422,8 +4422,8 @@
     <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'/>
-    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-715'/>
-    <reference-type-def kind='lvalue' type-id='type-id-715' size-in-bits='64' id='type-id-223'/>
+    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-715'/>
+    <reference-type-def kind='lvalue' type-id='type-id-715' size-in-bits='64' id='type-id-218'/>
     <pointer-type-def type-id='type-id-715' 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'/>
@@ -4465,7 +4465,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-772' size-in-bits='64' id='type-id-773'/>
     <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-214' const='yes' id='type-id-777'/>
+    <qualified-type-def type-id='type-id-209' const='yes' id='type-id-777'/>
     <reference-type-def kind='lvalue' type-id='type-id-777' size-in-bits='64' id='type-id-778'/>
     <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-779'/>
     <qualified-type-def type-id='type-id-780' const='yes' id='type-id-781'/>
@@ -4486,12 +4486,12 @@
     <qualified-type-def type-id='type-id-801' const='yes' id='type-id-802'/>
     <reference-type-def kind='lvalue' type-id='type-id-802' size-in-bits='64' id='type-id-803'/>
     <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-804'/>
-    <qualified-type-def type-id='type-id-264' const='yes' id='type-id-805'/>
+    <qualified-type-def type-id='type-id-262' const='yes' id='type-id-805'/>
     <reference-type-def kind='lvalue' type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
     <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-807'/>
     <qualified-type-def type-id='type-id-808' const='yes' id='type-id-809'/>
     <reference-type-def kind='lvalue' type-id='type-id-809' size-in-bits='64' id='type-id-810'/>
-    <qualified-type-def type-id='type-id-209' const='yes' id='type-id-811'/>
+    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-811'/>
     <reference-type-def kind='lvalue' type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
     <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-813'/>
     <qualified-type-def type-id='type-id-814' const='yes' id='type-id-815'/>
@@ -4515,7 +4515,7 @@
     <qualified-type-def type-id='type-id-281' const='yes' id='type-id-840'/>
     <reference-type-def kind='lvalue' type-id='type-id-840' size-in-bits='64' id='type-id-841'/>
     <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-842'/>
-    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-843'/>
+    <qualified-type-def type-id='type-id-181' const='yes' id='type-id-843'/>
     <reference-type-def kind='lvalue' type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
     <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-845'/>
     <reference-type-def kind='lvalue' type-id='type-id-846' size-in-bits='64' id='type-id-847'/>
@@ -4609,8 +4609,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-288' size-in-bits='64' id='type-id-945'/>
     <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-946'/>
     <reference-type-def kind='lvalue' type-id='type-id-712' size-in-bits='64' id='type-id-947'/>
-    <reference-type-def kind='lvalue' type-id='type-id-240' size-in-bits='64' id='type-id-948'/>
-    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-949'/>
+    <reference-type-def kind='lvalue' type-id='type-id-235' size-in-bits='64' id='type-id-948'/>
+    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-949'/>
     <reference-type-def kind='lvalue' type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
     <reference-type-def kind='lvalue' type-id='type-id-720' size-in-bits='64' id='type-id-952'/>
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-953'/>
@@ -4646,17 +4646,17 @@
     <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-983'/>
     <reference-type-def kind='lvalue' type-id='type-id-774' size-in-bits='64' id='type-id-984'/>
     <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-985'/>
-    <reference-type-def kind='lvalue' type-id='type-id-214' size-in-bits='64' id='type-id-986'/>
-    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-987'/>
+    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-986'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-987'/>
     <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-988'/>
     <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-989'/>
     <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-990'/>
-    <reference-type-def kind='lvalue' type-id='type-id-264' size-in-bits='64' id='type-id-991'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-992'/>
     <reference-type-def kind='lvalue' type-id='type-id-549' size-in-bits='64' id='type-id-993'/>
     <reference-type-def kind='lvalue' type-id='type-id-808' size-in-bits='64' id='type-id-994'/>
-    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-995'/>
-    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-996'/>
+    <reference-type-def kind='lvalue' type-id='type-id-204' size-in-bits='64' id='type-id-995'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-996'/>
     <reference-type-def kind='lvalue' type-id='type-id-997' size-in-bits='64' id='type-id-998'/>
     <reference-type-def kind='lvalue' type-id='type-id-814' size-in-bits='64' id='type-id-999'/>
     <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-1000'/>
@@ -4676,11 +4676,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-1014'/>
     <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-1015'/>
     <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-1016'/>
-    <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-1017'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-1018'/>
+    <reference-type-def kind='lvalue' type-id='type-id-181' size-in-bits='64' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-1018'/>
     <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-1019'/>
-    <reference-type-def kind='lvalue' type-id='type-id-17' size-in-bits='64' id='type-id-250'/>
-    <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-253'/>
+    <reference-type-def kind='lvalue' type-id='type-id-17' size-in-bits='64' id='type-id-245'/>
+    <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-248'/>
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-1020'/>
     <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'/>
@@ -4692,14 +4692,14 @@
     <reference-type-def kind='lvalue' type-id='type-id-1027' size-in-bits='64' id='type-id-1031'/>
     <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1032'/>
     <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
-    <array-type-def dimensions='1' type-id='type-id-1034' size-in-bits='448' id='type-id-216'>
-      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-38' id='type-id-192'/>
+    <array-type-def dimensions='1' type-id='type-id-1034' size-in-bits='448' id='type-id-211'>
+      <subrange length='7' lower-bound='0' upper-bound='6' type-id='type-id-38' id='type-id-187'/>
     </array-type-def>
     <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
     <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
-    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1041'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-227'/>
+    <qualified-type-def type-id='type-id-206' const='yes' id='type-id-1041'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-222'/>
     <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1042'/>
     <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
     <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-565'/>
@@ -4796,10 +4796,10 @@
           <typedef-decl name='iterator' type-id='type-id-606' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='728' column='1' id='type-id-576'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_type' type-id='type-id-168' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-517'/>
+          <typedef-decl name='key_type' type-id='type-id-163' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-517'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-168' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-520'/>
+          <typedef-decl name='value_type' type-id='type-id-163' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-520'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_reverse_iterator' type-id='type-id-1058' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='732' column='1' id='type-id-1057'/>
@@ -4960,7 +4960,7 @@
             <parameter type-id='type-id-865' is-artificial='yes'/>
             <parameter type-id='type-id-1051'/>
             <parameter type-id='type-id-871'/>
-            <parameter type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
             <return type-id='type-id-576'/>
           </function-decl>
         </member-function>
@@ -4979,7 +4979,7 @@
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt13_Rb_tree_nodeIS0_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt13_Rb_tree_nodeIS0_E'>
             <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-173'/>
+            <return type-id='type-id-168'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -4999,7 +4999,7 @@
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE11equal_rangeERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='1688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE11equal_rangeERKS0_'>
             <parameter type-id='type-id-865' is-artificial='yes'/>
-            <parameter type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
             <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
@@ -5023,7 +5023,7 @@
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt18_Rb_tree_node_base' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='708' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt18_Rb_tree_node_base'>
             <parameter type-id='type-id-1069'/>
-            <return type-id='type-id-173'/>
+            <return type-id='type-id-168'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -5037,7 +5037,7 @@
             <parameter type-id='type-id-865' is-artificial='yes'/>
             <parameter type-id='type-id-1051'/>
             <parameter type-id='type-id-871'/>
-            <parameter type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
             <return type-id='type-id-576'/>
           </function-decl>
         </member-function>
@@ -5050,7 +5050,7 @@
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE5eraseERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='2270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE5eraseERKS0_'>
             <parameter type-id='type-id-865' is-artificial='yes'/>
-            <parameter type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
             <return type-id='type-id-950'/>
           </function-decl>
         </member-function>
@@ -5070,7 +5070,7 @@
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE4findERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='2293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE4findERKS0_'>
             <parameter type-id='type-id-865' is-artificial='yes'/>
-            <parameter type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
             <return type-id='type-id-576'/>
           </function-decl>
         </member-function>
@@ -5171,10 +5171,10 @@
           <typedef-decl name='iterator' type-id='type-id-612' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='728' column='1' id='type-id-585'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_type' type-id='type-id-178' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-533'/>
+          <typedef-decl name='key_type' type-id='type-id-173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='476' column='1' id='type-id-533'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-178' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-536'/>
+          <typedef-decl name='value_type' type-id='type-id-173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='477' column='1' id='type-id-536'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_reverse_iterator' type-id='type-id-1081' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='732' column='1' id='type-id-1080'/>
@@ -5252,7 +5252,7 @@
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt13_Rb_tree_nodeIS0_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt13_Rb_tree_nodeIS0_E'>
             <parameter type-id='type-id-1076'/>
-            <return type-id='type-id-182'/>
+            <return type-id='type-id-177'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -5287,7 +5287,7 @@
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt18_Rb_tree_node_base' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='708' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE6_S_keyEPKSt18_Rb_tree_node_base'>
             <parameter type-id='type-id-1069'/>
-            <return type-id='type-id-182'/>
+            <return type-id='type-id-177'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -5349,7 +5349,7 @@
             <parameter type-id='type-id-870' is-artificial='yes'/>
             <parameter type-id='type-id-1074'/>
             <parameter type-id='type-id-871'/>
-            <parameter type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
             <return type-id='type-id-585'/>
           </function-decl>
         </member-function>
@@ -5377,7 +5377,7 @@
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE11equal_rangeERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='1688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE11equal_rangeERKS0_'>
             <parameter type-id='type-id-870' is-artificial='yes'/>
-            <parameter type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
             <return type-id='type-id-830'/>
           </function-decl>
         </member-function>
@@ -5392,7 +5392,7 @@
             <parameter type-id='type-id-870' is-artificial='yes'/>
             <parameter type-id='type-id-1074'/>
             <parameter type-id='type-id-871'/>
-            <parameter type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
             <return type-id='type-id-585'/>
           </function-decl>
         </member-function>
@@ -5418,7 +5418,7 @@
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE5eraseERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='2270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE5eraseERKS0_'>
             <parameter type-id='type-id-870' is-artificial='yes'/>
-            <parameter type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
             <return type-id='type-id-950'/>
           </function-decl>
         </member-function>
@@ -5431,7 +5431,7 @@
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE4findERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='2293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE4findERKS0_'>
             <parameter type-id='type-id-870' is-artificial='yes'/>
-            <parameter type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
             <return type-id='type-id-585'/>
           </function-decl>
         </member-function>
@@ -6274,7 +6274,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-202' 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-685'/>
+          <typedef-decl name='value_type' type-id='type-id-197' 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-685'/>
         </member-type>
       </class-decl>
       <class-decl name='allocator&lt;PersistData&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-729'>
@@ -6287,7 +6287,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-261' 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-694'/>
+          <typedef-decl name='value_type' type-id='type-id-259' 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-694'/>
         </member-type>
       </class-decl>
       <class-decl name='allocator&lt;PtrData*&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-732'>
@@ -6300,7 +6300,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-183' 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-703'/>
+          <typedef-decl name='value_type' type-id='type-id-178' 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-703'/>
         </member-type>
       </class-decl>
       <class-decl name='allocator&lt;PtrData&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-735'>
@@ -6323,7 +6323,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-267' 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-712'/>
+          <typedef-decl name='value_type' type-id='type-id-265' 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-712'/>
         </member-type>
       </class-decl>
       <class-decl name='allocator&lt;coibuffer*&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-741'>
@@ -6691,7 +6691,7 @@
           </class-decl>
         </member-type>
       </class-decl>
-      <class-decl name='bitset&lt;1024ul&gt;' size-in-bits='1024' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='749' column='1' id='type-id-214'>
+      <class-decl name='bitset&lt;1024ul&gt;' size-in-bits='1024' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='749' column='1' id='type-id-209'>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-471'/>
         <member-type access='private'>
           <class-decl name='reference' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='800' column='1' id='type-id-1174'>
@@ -6699,13 +6699,13 @@
               <var-decl name='_M_wp' type-id='type-id-1175' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='804' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='_M_bpos' type-id='type-id-280' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='805' column='1'/>
+              <var-decl name='_M_bpos' type-id='type-id-278' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='805' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='reference' mangled-name='_ZNSt6bitsetILm1024EE9referenceC4ERS0_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1176' is-artificial='yes'/>
                 <parameter type-id='type-id-986'/>
-                <parameter type-id='type-id-280'/>
+                <parameter type-id='type-id-278'/>
                 <return type-id='type-id-154'/>
               </function-decl>
             </member-function>
@@ -6713,7 +6713,7 @@
               <function-decl name='reference' mangled-name='_ZNSt6bitsetILm1024EE9referenceC2ERS0_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm1024EE9referenceC2ERS0_m'>
                 <parameter type-id='type-id-1176' is-artificial='yes'/>
                 <parameter type-id='type-id-986'/>
-                <parameter type-id='type-id-280'/>
+                <parameter type-id='type-id-278'/>
                 <return type-id='type-id-154'/>
               </function-decl>
             </member-function>
@@ -6742,7 +6742,7 @@
         <member-function access='private'>
           <function-decl name='_Unchecked_set' mangled-name='_ZNSt6bitsetILm1024EE14_Unchecked_setEmi' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm1024EE14_Unchecked_setEmi'>
             <parameter type-id='type-id-987' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-986'/>
           </function-decl>
@@ -6750,7 +6750,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_check' mangled-name='_ZNKSt6bitsetILm1024EE8_M_checkEmPKc' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6bitsetILm1024EE8_M_checkEmPKc'>
             <parameter type-id='type-id-779' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <parameter type-id='type-id-152'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -6758,28 +6758,28 @@
         <member-function access='private' const='yes'>
           <function-decl name='test' mangled-name='_ZNKSt6bitsetILm1024EE4testEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6bitsetILm1024EE4testEm'>
             <parameter type-id='type-id-779' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_Unchecked_test' mangled-name='_ZNKSt6bitsetILm1024EE15_Unchecked_testEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1059' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6bitsetILm1024EE15_Unchecked_testEm'>
             <parameter type-id='type-id-779' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt6bitsetILm1024EEixEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm1024EEixEm'>
             <parameter type-id='type-id-987' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-1174'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' mangled-name='_ZNSt6bitsetILm1024EE3setEmb' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm1024EE3setEmb'>
             <parameter type-id='type-id-987' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-986'/>
           </function-decl>
@@ -6805,10 +6805,10 @@
       </class-decl>
       <class-decl name='initializer_list&lt;AutoData&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-780'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-171' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1178'/>
+          <typedef-decl name='const_iterator' type-id='type-id-166' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1178'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-171' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1179'/>
+          <typedef-decl name='iterator' type-id='type-id-166' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1179'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-1179' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='58' column='1'/>
@@ -6819,10 +6819,10 @@
       </class-decl>
       <class-decl name='initializer_list&lt;PtrData&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-783'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-181' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1180'/>
+          <typedef-decl name='const_iterator' type-id='type-id-176' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-1180'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-181' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1181'/>
+          <typedef-decl name='iterator' type-id='type-id-176' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-1181'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-1181' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='58' column='1'/>
@@ -6845,7 +6845,7 @@
           <var-decl name='_M_len' type-id='type-id-950' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='map&lt;long unsigned int, Stream*, std::less&lt;long unsigned int&gt;, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='96' column='1' id='type-id-264'>
+      <class-decl name='map&lt;long unsigned int, Stream*, std::less&lt;long unsigned int&gt;, std::allocator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='96' column='1' id='type-id-262'>
         <member-type access='private'>
           <typedef-decl name='_Rep_type' type-id='type-id-539' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='135' column='1' id='type-id-1184'/>
         </member-type>
@@ -6859,7 +6859,7 @@
           <typedef-decl name='key_compare' type-id='type-id-797' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='102' column='1' id='type-id-1187'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='mapped_type' type-id='type-id-266' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='100' column='1' id='type-id-808'/>
+          <typedef-decl name='mapped_type' type-id='type-id-264' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='100' column='1' id='type-id-808'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-1188'/>
@@ -6988,7 +6988,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;void const*, OffloadDescriptor*, std::less&lt;void const*&gt;, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='96' column='1' id='type-id-209'>
+      <class-decl name='map&lt;void const*, OffloadDescriptor*, std::less&lt;void const*&gt;, std::allocator&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='96' column='1' id='type-id-204'>
         <member-type access='private'>
           <typedef-decl name='_Rep_type' type-id='type-id-555' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='135' column='1' id='type-id-1203'/>
         </member-type>
@@ -7002,7 +7002,7 @@
           <typedef-decl name='key_compare' type-id='type-id-801' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='102' column='1' id='type-id-1206'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='mapped_type' type-id='type-id-224' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='100' column='1' id='type-id-814'/>
+          <typedef-decl name='mapped_type' type-id='type-id-219' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_map.h' line='100' column='1' id='type-id-814'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-1207'/>
@@ -7145,7 +7145,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='set&lt;PtrData, std::less&lt;PtrData&gt;, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='90' column='1' id='type-id-186'>
+      <class-decl name='set&lt;PtrData, std::less&lt;PtrData&gt;, std::allocator&lt;PtrData&gt; &gt;' size-in-bits='384' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='90' column='1' id='type-id-181'>
         <member-type access='private'>
           <typedef-decl name='_Rep_type' type-id='type-id-523' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_set.h' line='115' column='1' id='type-id-1223'/>
         </member-type>
@@ -7231,7 +7231,7 @@
         <member-function access='public'>
           <function-decl name='_M_getword' mangled-name='_ZNSt12_Base_bitsetILm16EE10_M_getwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE10_M_getwordEm'>
             <parameter type-id='type-id-849' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-850'/>
           </function-decl>
         </member-function>
@@ -7244,26 +7244,26 @@
         <member-function access='public' const='yes'>
           <function-decl name='_M_getword' mangled-name='_ZNKSt12_Base_bitsetILm16EE10_M_getwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Base_bitsetILm16EE10_M_getwordEm'>
             <parameter type-id='type-id-474' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-475'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_whichword' mangled-name='_ZNSt12_Base_bitsetILm16EE12_S_whichwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE12_S_whichwordEm'>
-            <parameter type-id='type-id-280'/>
-            <return type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_maskbit' mangled-name='_ZNSt12_Base_bitsetILm16EE10_S_maskbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE10_S_maskbitEm'>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-475'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_whichbit' mangled-name='_ZNSt12_Base_bitsetILm16EE11_S_whichbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm16EE11_S_whichbitEm'>
-            <parameter type-id='type-id-280'/>
-            <return type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7345,7 +7345,7 @@
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt10_List_nodeI6DynLibE9_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_nodeI6DynLibE9_M_valptrEv'>
             <parameter type-id='type-id-854' is-artificial='yes'/>
-            <return type-id='type-id-204'/>
+            <return type-id='type-id-199'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7357,7 +7357,7 @@
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt10_List_nodeI11PersistDataE9_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_nodeI11PersistDataE9_M_valptrEv'>
             <parameter type-id='type-id-856' is-artificial='yes'/>
-            <return type-id='type-id-262'/>
+            <return type-id='type-id-260'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7381,7 +7381,7 @@
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt10_List_nodeI11TargetImageE9_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_nodeI11TargetImageE9_M_valptrEv'>
             <parameter type-id='type-id-860' is-artificial='yes'/>
-            <return type-id='type-id-268'/>
+            <return type-id='type-id-266'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7429,10 +7429,10 @@
           <typedef-decl name='_Self' type-id='type-id-570' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='255' column='1' id='type-id-573'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-171' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1237'/>
+          <typedef-decl name='pointer' type-id='type-id-166' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1237'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1238'/>
+          <typedef-decl name='reference' type-id='type-id-168' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1238'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-1239' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='319' column='1'/>
@@ -7516,10 +7516,10 @@
           <typedef-decl name='_Self' type-id='type-id-579' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='255' column='1' id='type-id-582'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-181' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1241'/>
+          <typedef-decl name='pointer' type-id='type-id-176' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='248' column='1' id='type-id-1241'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-182' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1242'/>
+          <typedef-decl name='reference' type-id='type-id-177' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='247' column='1' id='type-id-1242'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-1239' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='319' column='1'/>
@@ -7896,13 +7896,13 @@
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt13_Rb_tree_nodeI8AutoDataE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13_Rb_tree_nodeI8AutoDataE9_M_valptrEv'>
             <parameter type-id='type-id-903' is-artificial='yes'/>
-            <return type-id='type-id-172'/>
+            <return type-id='type-id-167'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_valptr' mangled-name='_ZNKSt13_Rb_tree_nodeI8AutoDataE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13_Rb_tree_nodeI8AutoDataE9_M_valptrEv'>
             <parameter type-id='type-id-633' is-artificial='yes'/>
-            <return type-id='type-id-171'/>
+            <return type-id='type-id-166'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7914,13 +7914,13 @@
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt13_Rb_tree_nodeI7PtrDataE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13_Rb_tree_nodeI7PtrDataE9_M_valptrEv'>
             <parameter type-id='type-id-905' is-artificial='yes'/>
-            <return type-id='type-id-183'/>
+            <return type-id='type-id-178'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_valptr' mangled-name='_ZNKSt13_Rb_tree_nodeI7PtrDataE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13_Rb_tree_nodeI7PtrDataE9_M_valptrEv'>
             <parameter type-id='type-id-637' is-artificial='yes'/>
-            <return type-id='type-id-181'/>
+            <return type-id='type-id-176'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8453,7 +8453,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;DynLib, DynLib&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI6DynLibEEE12_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_nodeI6DynLibEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_'>
             <parameter type-id='type-id-968'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-199'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8468,7 +8468,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;DynLib, DynLib&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI6DynLibEEE9constructIS1_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_nodeI6DynLibEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_'>
             <parameter type-id='type-id-968'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-199'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8484,7 +8484,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_List_node&lt;DynLib&gt; &gt;, DynLib&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI6DynLibEEE10_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_nodeI6DynLibEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
             <parameter type-id='type-id-968'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-199'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8492,7 +8492,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;DynLib&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI6DynLibEEE7destroyIS1_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_nodeI6DynLibEEE7destroyIS1_EEvRS3_PT_'>
             <parameter type-id='type-id-968'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-199'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8514,7 +8514,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;PersistData, const PersistData&amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11PersistDataEEE12_S_constructIS1_JRKS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PSB_DpOSC_' 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_nodeI11PersistDataEEE12_S_constructIS1_JRKS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PSB_DpOSC_'>
             <parameter type-id='type-id-970'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-383'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8529,7 +8529,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;PersistData, const PersistData&amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11PersistDataEEE9constructIS1_JRKS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS8_' 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_nodeI11PersistDataEEE9constructIS1_JRKS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS8_'>
             <parameter type-id='type-id-970'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-383'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8545,7 +8545,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_List_node&lt;PersistData&gt; &gt;, PersistData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11PersistDataEEE10_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_nodeI11PersistDataEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
             <parameter type-id='type-id-970'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8553,7 +8553,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;PersistData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11PersistDataEEE7destroyIS1_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_nodeI11PersistDataEEE7destroyIS1_EEvRS3_PT_'>
             <parameter type-id='type-id-970'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8647,7 +8647,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_List_node&lt;TargetImage&gt; &gt;, TargetImage&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11TargetImageEEE10_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_nodeI11TargetImageEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
             <parameter type-id='type-id-974'/>
-            <parameter type-id='type-id-268'/>
+            <parameter type-id='type-id-266'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8655,14 +8655,14 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;TargetImage&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11TargetImageEEE7destroyIS1_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_nodeI11TargetImageEEE7destroyIS1_EEvRS3_PT_'>
             <parameter type-id='type-id-974'/>
-            <parameter type-id='type-id-268'/>
+            <parameter type-id='type-id-266'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;TargetImage, TargetImage&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11TargetImageEEE12_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_nodeI11TargetImageEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_'>
             <parameter type-id='type-id-974'/>
-            <parameter type-id='type-id-268'/>
+            <parameter type-id='type-id-266'/>
             <parameter type-id='type-id-311'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8670,8 +8670,8 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;TargetImage, const TargetImage&amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11TargetImageEEE12_S_constructIS1_JRKS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PSB_DpOSC_' 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_nodeI11TargetImageEEE12_S_constructIS1_JRKS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PSB_DpOSC_'>
             <parameter type-id='type-id-974'/>
-            <parameter type-id='type-id-268'/>
-            <parameter type-id='type-id-225'/>
+            <parameter type-id='type-id-266'/>
+            <parameter type-id='type-id-220'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8685,7 +8685,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;TargetImage, TargetImage&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11TargetImageEEE9constructIS1_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_nodeI11TargetImageEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_'>
             <parameter type-id='type-id-974'/>
-            <parameter type-id='type-id-268'/>
+            <parameter type-id='type-id-266'/>
             <parameter type-id='type-id-311'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -8693,8 +8693,8 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;TargetImage, const TargetImage&amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI11TargetImageEEE9constructIS1_JRKS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS8_' 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_nodeI11TargetImageEEE9constructIS1_JRKS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS8_'>
             <parameter type-id='type-id-974'/>
-            <parameter type-id='type-id-268'/>
-            <parameter type-id='type-id-225'/>
+            <parameter type-id='type-id-266'/>
+            <parameter type-id='type-id-220'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8811,8 +8811,8 @@
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt4lessI8AutoDataEclERKS0_S3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4lessI8AutoDataEclERKS0_S3_'>
             <parameter type-id='type-id-792' is-artificial='yes'/>
-            <parameter type-id='type-id-173'/>
-            <parameter type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
+            <parameter type-id='type-id-168'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
@@ -8822,8 +8822,8 @@
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt4lessI7PtrDataEclERKS0_S3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4lessI7PtrDataEclERKS0_S3_'>
             <parameter type-id='type-id-796' is-artificial='yes'/>
-            <parameter type-id='type-id-182'/>
-            <parameter type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
+            <parameter type-id='type-id-177'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
@@ -8858,7 +8858,7 @@
           <var-decl name='first' type-id='type-id-846' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='133' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-266' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
+          <var-decl name='second' type-id='type-id-264' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='pair&lt;long unsigned int const&amp;, 0ul&gt;' mangled-name='_ZNSt4pairIKmP6StreamEC4IJRS0_EJLm0EEJEJEEERSt5tupleIJDpT_EERS6_IJDpT1_EESt12_Index_tupleIJXspT0_EEESF_IJXspT2_EEE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1551' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8910,7 +8910,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;&amp;, bool&amp;, 1u&gt;' mangled-name='_ZNSt4pairISt23_Rb_tree_const_iteratorI8AutoDataEbEC4IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1003' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8918,7 +8918,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;&amp;, bool&amp;, 1u&gt;' mangled-name='_ZNSt4pairISt23_Rb_tree_const_iteratorI8AutoDataEbEC2IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt23_Rb_tree_const_iteratorI8AutoDataEbEC2IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_'>
             <parameter type-id='type-id-1003' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8934,7 +8934,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;&amp;, bool&amp;, 1u&gt;' mangled-name='_ZNSt4pairISt23_Rb_tree_const_iteratorI7PtrDataEbEC4IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1005' is-artificial='yes'/>
             <parameter type-id='type-id-1559'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8942,7 +8942,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;&amp;, bool&amp;, 1u&gt;' mangled-name='_ZNSt4pairISt23_Rb_tree_const_iteratorI7PtrDataEbEC2IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt23_Rb_tree_const_iteratorI7PtrDataEbEC2IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_'>
             <parameter type-id='type-id-1005' is-artificial='yes'/>
             <parameter type-id='type-id-1559'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -8950,7 +8950,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;&amp;, bool&amp;, 1u&gt;' mangled-name='_ZNSt4pairISt23_Rb_tree_const_iteratorI7PtrDataEbEC4IRSt17_Rb_tree_iteratorIS1_ERbLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1005' is-artificial='yes'/>
             <parameter type-id='type-id-1559'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -9150,7 +9150,7 @@
           <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='133' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-224' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
+          <var-decl name='second' type-id='type-id-219' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='pair&lt;void const* const&amp;, 0ul&gt;' mangled-name='_ZNSt4pairIKPKvP17OffloadDescriptorEC4IJRS2_EJLm0EEJEJEEERSt5tupleIJDpT_EERS8_IJDpT1_EESt12_Index_tupleIJXspT0_EEESH_IJXspT2_EEE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1551' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9628,8 +9628,8 @@
       <typedef-decl name='__detected_or_t' type-id='type-id-1366' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1482'/>
       <typedef-decl name='__detected_or_t' type-id='type-id-1340' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1399'/>
       <typedef-decl name='__detected_or_t_' type-id='type-id-1686' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2453' column='1' id='type-id-1675'/>
-      <typedef-decl name='size_t' type-id='type-id-40' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='196' column='1' id='type-id-280'/>
-      <typedef-decl name='ptrdiff_t' type-id='type-id-170' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-1687'/>
+      <typedef-decl name='size_t' type-id='type-id-40' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='196' column='1' id='type-id-278'/>
+      <typedef-decl name='ptrdiff_t' type-id='type-id-165' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-1687'/>
       <namespace-decl name='__cxx11'>
         <class-decl name='_List_base&lt;DynLib, std::allocator&lt;DynLib&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-649'>
           <member-type access='protected'>
@@ -9667,14 +9667,14 @@
           <member-function access='protected'>
             <function-decl name='_M_dec_size' mangled-name='_ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE11_M_dec_sizeEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE11_M_dec_sizeEm'>
               <parameter type-id='type-id-912' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseI6DynLibSaIS1_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_baseI6DynLibSaIS1_EE11_M_inc_sizeEm'>
               <parameter type-id='type-id-912' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -9694,7 +9694,7 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseI6DynLibSaIS1_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_baseI6DynLibSaIS1_EE11_M_set_sizeEm'>
               <parameter type-id='type-id-912' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -9773,21 +9773,21 @@
           <member-function access='protected'>
             <function-decl name='_M_dec_size' mangled-name='_ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE11_M_dec_sizeEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE11_M_dec_sizeEm'>
               <parameter type-id='type-id-917' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <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_baseI11PersistDataSaIS1_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_baseI11PersistDataSaIS1_EE11_M_set_sizeEm'>
               <parameter type-id='type-id-917' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_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_baseI11PersistDataSaIS1_EE11_M_inc_sizeEm'>
               <parameter type-id='type-id-917' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -9873,7 +9873,7 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_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_baseIP7PtrDataSaIS2_EE11_M_set_sizeEm'>
               <parameter type-id='type-id-922' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -9937,14 +9937,14 @@
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_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_baseIP7PtrDataSaIS2_EE11_M_inc_sizeEm'>
               <parameter type-id='type-id-922' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected' const='yes'>
             <function-decl name='_M_node_count' mangled-name='_ZNKSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE13_M_node_countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE13_M_node_countEv'>
               <parameter type-id='type-id-663' is-artificial='yes'/>
-              <return type-id='type-id-280'/>
+              <return type-id='type-id-278'/>
             </function-decl>
           </member-function>
           <member-function access='private' destructor='yes'>
@@ -9985,7 +9985,7 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_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_baseI11TargetImageSaIS1_EE11_M_set_sizeEm'>
               <parameter type-id='type-id-927' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -10023,7 +10023,7 @@
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_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_baseI11TargetImageSaIS1_EE11_M_inc_sizeEm'>
               <parameter type-id='type-id-927' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -10084,7 +10084,7 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_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_baseIP9coibufferSaIS2_EE11_M_set_sizeEm'>
               <parameter type-id='type-id-932' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -10142,7 +10142,7 @@
           <member-function access='protected' const='yes'>
             <function-decl name='_M_node_count' mangled-name='_ZNKSt7__cxx1110_List_baseIP9coibufferSaIS2_EE13_M_node_countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7__cxx1110_List_baseIP9coibufferSaIS2_EE13_M_node_countEv'>
               <parameter type-id='type-id-675' is-artificial='yes'/>
-              <return type-id='type-id-280'/>
+              <return type-id='type-id-278'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
@@ -10154,7 +10154,7 @@
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_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_baseIP9coibufferSaIS2_EE11_M_inc_sizeEm'>
               <parameter type-id='type-id-932' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -10535,7 +10535,7 @@
           <member-function access='protected'>
             <function-decl name='_M_create_node&lt;const TargetImage&amp;&gt;' mangled-name='_ZNSt7__cxx114listI11TargetImageSaIS1_EE14_M_create_nodeIJRKS1_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__cxx114listI11TargetImageSaIS1_EE14_M_create_nodeIJRKS1_EEEPSt10_List_nodeIS1_EDpOT_'>
               <parameter type-id='type-id-946' is-artificial='yes'/>
-              <parameter type-id='type-id-225'/>
+              <parameter type-id='type-id-220'/>
               <return type-id='type-id-1764'/>
             </function-decl>
           </member-function>
@@ -10551,7 +10551,7 @@
             <function-decl name='_M_insert&lt;const TargetImage&amp;&gt;' mangled-name='_ZNSt7__cxx114listI11TargetImageSaIS1_EE9_M_insertIJRKS1_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__cxx114listI11TargetImageSaIS1_EE9_M_insertIJRKS1_EEEvSt14_List_iteratorIS1_EDpOT_'>
               <parameter type-id='type-id-946' is-artificial='yes'/>
               <parameter type-id='type-id-1746'/>
-              <parameter type-id='type-id-225'/>
+              <parameter type-id='type-id-220'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -10582,7 +10582,7 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='list&lt;coibuffer*, std::allocator&lt;coibuffer*&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-240'>
+        <class-decl name='list&lt;coibuffer*, std::allocator&lt;coibuffer*&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-235'>
           <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-673'/>
           <member-type access='protected'>
             <typedef-decl name='_Node' type-id='type-id-500' 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-1765'/>
@@ -10715,15 +10715,15 @@
     <class-decl name='coipipeline' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1037'/>
     <class-decl name='coiprocess' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1039'/>
     <qualified-type-def type-id='type-id-150' const='yes' id='type-id-1021'/>
-    <typedef-decl name='COIPROCESS' type-id='type-id-1040' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='65' column='1' id='type-id-211'/>
-    <typedef-decl name='COIPIPELINE' type-id='type-id-1038' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='66' column='1' id='type-id-265'/>
-    <typedef-decl name='COIBUFFER' type-id='type-id-1027' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='70' column='1' id='type-id-179'/>
-    <typedef-decl name='COILIBRARY' type-id='type-id-1036' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='71' column='1' id='type-id-203'/>
+    <typedef-decl name='COIPROCESS' type-id='type-id-1040' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='65' column='1' id='type-id-206'/>
+    <typedef-decl name='COIPIPELINE' type-id='type-id-1038' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='66' column='1' id='type-id-263'/>
+    <typedef-decl name='COIBUFFER' type-id='type-id-1027' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='70' column='1' id='type-id-174'/>
+    <typedef-decl name='COILIBRARY' type-id='type-id-1036' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='71' column='1' id='type-id-198'/>
     <function-decl name='__offload_target_acquire' mangled-name='__offload_target_acquire' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__offload_target_acquire'>
       <parameter type-id='type-id-287' name='target_type' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='46' column='1'/>
       <parameter type-id='type-id-30' name='target_number' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='47' column='1'/>
       <parameter type-id='type-id-30' name='is_optional' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='48' column='1'/>
-      <parameter type-id='type-id-247' name='status' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='49' column='1'/>
+      <parameter type-id='type-id-242' name='status' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='49' column='1'/>
       <parameter type-id='type-id-152' name='file' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='50' column='1'/>
       <parameter type-id='type-id-19' name='line' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='51' column='1'/>
       <return type-id='type-id-284'/>
@@ -10738,7 +10738,7 @@
       <parameter type-id='type-id-287' name='target_type' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='245' column='1'/>
       <parameter type-id='type-id-30' name='target_number' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='246' column='1'/>
       <parameter type-id='type-id-30' name='is_optional' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='247' column='1'/>
-      <parameter type-id='type-id-247' name='status' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='248' column='1'/>
+      <parameter type-id='type-id-242' name='status' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='248' column='1'/>
       <parameter type-id='type-id-152' name='file' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='249' column='1'/>
       <parameter type-id='type-id-19' name='line' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='250' column='1'/>
       <parameter type-id='type-id-151' name='stream' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='251' column='1'/>
@@ -10749,8 +10749,8 @@
       <parameter type-id='type-id-152' name='name' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='392' column='1'/>
       <parameter type-id='type-id-30' name='is_empty' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='393' column='1'/>
       <parameter type-id='type-id-30' name='num_vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='394' column='1'/>
-      <parameter type-id='type-id-245' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='395' column='1'/>
-      <parameter type-id='type-id-254' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='396' column='1'/>
+      <parameter type-id='type-id-240' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='395' column='1'/>
+      <parameter type-id='type-id-249' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='396' column='1'/>
       <parameter type-id='type-id-30' name='num_waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='397' column='1'/>
       <parameter type-id='type-id-151' name='waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='398' column='1'/>
       <parameter type-id='type-id-151' name='signal' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='399' column='1'/>
@@ -10761,8 +10761,8 @@
       <parameter type-id='type-id-152' name='name' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='410' column='1'/>
       <parameter type-id='type-id-30' name='is_empty' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='411' column='1'/>
       <parameter type-id='type-id-30' name='num_vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='412' column='1'/>
-      <parameter type-id='type-id-245' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='413' column='1'/>
-      <parameter type-id='type-id-254' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='414' column='1'/>
+      <parameter type-id='type-id-240' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='413' column='1'/>
+      <parameter type-id='type-id-249' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='414' column='1'/>
       <parameter type-id='type-id-30' name='num_waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='415' column='1'/>
       <parameter type-id='type-id-151' name='waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='416' column='1'/>
       <parameter type-id='type-id-151' name='signal' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='417' column='1'/>
@@ -10775,14 +10775,14 @@
       <parameter type-id='type-id-152' name='name' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='430' column='1'/>
       <parameter type-id='type-id-30' name='is_empty' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='431' column='1'/>
       <parameter type-id='type-id-30' name='num_vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='432' column='1'/>
-      <parameter type-id='type-id-245' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='433' column='1'/>
-      <parameter type-id='type-id-254' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='434' column='1'/>
+      <parameter type-id='type-id-240' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='433' column='1'/>
+      <parameter type-id='type-id-249' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='434' column='1'/>
       <parameter type-id='type-id-30' name='num_waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='435' column='1'/>
       <parameter type-id='type-id-151' name='waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='436' column='1'/>
       <parameter type-id='type-id-151' name='signal' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='437' column='1'/>
       <parameter type-id='type-id-30' name='entry_id' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='438' column='1'/>
       <parameter type-id='type-id-150' name='stack_addr' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='439' column='1'/>
-      <parameter type-id='type-id-255' name='offload_flags' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='440' column='1'/>
+      <parameter type-id='type-id-250' name='offload_flags' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='440' column='1'/>
       <parameter type-id='type-id-151' name='stream' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='441' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
@@ -10791,8 +10791,8 @@
       <parameter type-id='type-id-152' name='name' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='458' column='1'/>
       <parameter type-id='type-id-30' name='is_empty' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='459' column='1'/>
       <parameter type-id='type-id-30' name='num_vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='460' column='1'/>
-      <parameter type-id='type-id-245' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='461' column='1'/>
-      <parameter type-id='type-id-254' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='462' column='1'/>
+      <parameter type-id='type-id-240' name='vars' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='461' column='1'/>
+      <parameter type-id='type-id-249' name='vars2' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='462' column='1'/>
       <parameter type-id='type-id-30' name='num_waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='463' column='1'/>
       <parameter type-id='type-id-151' name='waits' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='464' column='1'/>
       <parameter type-id='type-id-150' name='signal' filepath='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' line='465' column='1'/>
@@ -10804,19 +10804,19 @@
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='gets' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/cstdio' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-233'/>
-      <return type-id='type-id-233'/>
+      <parameter type-id='type-id-228'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;AutoData&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-340'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-171' 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-1794'/>
+          <typedef-decl name='const_pointer' type-id='type-id-166' 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-1794'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-173' 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-1795'/>
+          <typedef-decl name='const_reference' type-id='type-id-168' 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-1795'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-172' 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-1796'/>
+          <typedef-decl name='pointer' type-id='type-id-167' 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-1796'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-303' 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-1797'/>
@@ -10830,7 +10830,7 @@
           <typedef-decl name='const_reference' type-id='type-id-378' 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-1799'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-204' 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-1644'/>
+          <typedef-decl name='pointer' type-id='type-id-199' 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-1644'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-304' 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-1800'/>
@@ -10844,7 +10844,7 @@
           <typedef-decl name='const_reference' type-id='type-id-383' 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-1802'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-262' 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-1651'/>
+          <typedef-decl name='pointer' type-id='type-id-260' 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-1651'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-305' 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-1652'/>
@@ -10861,18 +10861,18 @@
           <typedef-decl name='pointer' type-id='type-id-310' 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-1805'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-257' 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-1658'/>
+          <typedef-decl name='reference' type-id='type-id-252' 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-1658'/>
         </member-type>
       </class-decl>
       <class-decl name='new_allocator&lt;PtrData&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-348'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-181' 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-1806'/>
+          <typedef-decl name='const_pointer' type-id='type-id-176' 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-1806'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-182' 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-1807'/>
+          <typedef-decl name='const_reference' type-id='type-id-177' 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-1807'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-183' 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-1808'/>
+          <typedef-decl name='pointer' type-id='type-id-178' 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-1808'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-306' 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-1809'/>
@@ -10883,10 +10883,10 @@
           <typedef-decl name='const_pointer' type-id='type-id-387' 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-1810'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-225' 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-1811'/>
+          <typedef-decl name='const_reference' type-id='type-id-220' 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-1811'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-268' 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-1233'/>
+          <typedef-decl name='pointer' type-id='type-id-266' 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-1233'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-311' 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-1234'/>
@@ -10928,7 +10928,7 @@
         <member-function access='private'>
           <function-decl name='construct&lt;DynLib, DynLib&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI6DynLibEE9constructIS2_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_nodeI6DynLibEE9constructIS2_JS2_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-355' is-artificial='yes'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-199'/>
             <parameter type-id='type-id-304'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -10952,7 +10952,7 @@
         <member-function access='private'>
           <function-decl name='destroy&lt;DynLib&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI6DynLibEE7destroyIS2_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_nodeI6DynLibEE7destroyIS2_EEvPT_'>
             <parameter type-id='type-id-355' is-artificial='yes'/>
-            <parameter type-id='type-id-204'/>
+            <parameter type-id='type-id-199'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -11005,7 +11005,7 @@
         <member-function access='private'>
           <function-decl name='construct&lt;PersistData, const PersistData&amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI11PersistDataEE9constructIS2_JRKS2_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_nodeI11PersistDataEE9constructIS2_JRKS2_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-357' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <parameter type-id='type-id-383'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11029,7 +11029,7 @@
         <member-function access='private'>
           <function-decl name='destroy&lt;PersistData&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI11PersistDataEE7destroyIS2_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_nodeI11PersistDataEE7destroyIS2_EEvPT_'>
             <parameter type-id='type-id-357' is-artificial='yes'/>
-            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-260'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -11168,7 +11168,7 @@
         <member-function access='private'>
           <function-decl name='destroy&lt;TargetImage&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI11TargetImageEE7destroyIS2_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_nodeI11TargetImageEE7destroyIS2_EEvPT_'>
             <parameter type-id='type-id-361' is-artificial='yes'/>
-            <parameter type-id='type-id-268'/>
+            <parameter type-id='type-id-266'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -11181,7 +11181,7 @@
         <member-function access='private'>
           <function-decl name='construct&lt;TargetImage, TargetImage&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI11TargetImageEE9constructIS2_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_nodeI11TargetImageEE9constructIS2_JS2_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-361' is-artificial='yes'/>
-            <parameter type-id='type-id-268'/>
+            <parameter type-id='type-id-266'/>
             <parameter type-id='type-id-311'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11189,8 +11189,8 @@
         <member-function access='private'>
           <function-decl name='construct&lt;TargetImage, const TargetImage&amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI11TargetImageEE9constructIS2_JRKS2_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_nodeI11TargetImageEE9constructIS2_JRKS2_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-361' is-artificial='yes'/>
-            <parameter type-id='type-id-268'/>
-            <parameter type-id='type-id-225'/>
+            <parameter type-id='type-id-266'/>
+            <parameter type-id='type-id-220'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -11329,7 +11329,7 @@
         <member-function access='private'>
           <function-decl name='destroy&lt;AutoData&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeI8AutoDataEE7destroyIS2_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_allocatorISt13_Rb_tree_nodeI8AutoDataEE7destroyIS2_EEvPT_'>
             <parameter type-id='type-id-365' is-artificial='yes'/>
-            <parameter type-id='type-id-172'/>
+            <parameter type-id='type-id-167'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -11370,7 +11370,7 @@
         <member-function access='private'>
           <function-decl name='construct&lt;AutoData, AutoData&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeI8AutoDataEE9constructIS2_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_allocatorISt13_Rb_tree_nodeI8AutoDataEE9constructIS2_JS2_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-365' is-artificial='yes'/>
-            <parameter type-id='type-id-172'/>
+            <parameter type-id='type-id-167'/>
             <parameter type-id='type-id-303'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11406,7 +11406,7 @@
         <member-function access='private'>
           <function-decl name='construct&lt;PtrData, PtrData&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeI7PtrDataEE9constructIS2_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_allocatorISt13_Rb_tree_nodeI7PtrDataEE9constructIS2_JS2_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-367' is-artificial='yes'/>
-            <parameter type-id='type-id-183'/>
+            <parameter type-id='type-id-178'/>
             <parameter type-id='type-id-306'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11436,7 +11436,7 @@
         <member-function access='private'>
           <function-decl name='destroy&lt;PtrData&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeI7PtrDataEE7destroyIS2_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_allocatorISt13_Rb_tree_nodeI7PtrDataEE7destroyIS2_EEvPT_'>
             <parameter type-id='type-id-367' is-artificial='yes'/>
-            <parameter type-id='type-id-183'/>
+            <parameter type-id='type-id-178'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -11701,7 +11701,7 @@
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI8AutoDataE6_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_membufI8AutoDataE6_M_ptrEv'>
             <parameter type-id='type-id-313' is-artificial='yes'/>
-            <return type-id='type-id-172'/>
+            <return type-id='type-id-167'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11725,7 +11725,7 @@
         <member-function access='public' const='yes'>
           <function-decl name='_M_ptr' mangled-name='_ZNK9__gnu_cxx16__aligned_membufI8AutoDataE6_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_membufI8AutoDataE6_M_ptrEv'>
             <parameter type-id='type-id-389' is-artificial='yes'/>
-            <return type-id='type-id-171'/>
+            <return type-id='type-id-166'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11742,7 +11742,7 @@
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI6DynLibE6_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_membufI6DynLibE6_M_ptrEv'>
             <parameter type-id='type-id-315' is-artificial='yes'/>
-            <return type-id='type-id-204'/>
+            <return type-id='type-id-199'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11759,7 +11759,7 @@
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI11PersistDataE6_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_membufI11PersistDataE6_M_ptrEv'>
             <parameter type-id='type-id-317' is-artificial='yes'/>
-            <return type-id='type-id-262'/>
+            <return type-id='type-id-260'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11793,7 +11793,7 @@
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI7PtrDataE6_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_membufI7PtrDataE6_M_ptrEv'>
             <parameter type-id='type-id-321' is-artificial='yes'/>
-            <return type-id='type-id-183'/>
+            <return type-id='type-id-178'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11817,7 +11817,7 @@
         <member-function access='public' const='yes'>
           <function-decl name='_M_ptr' mangled-name='_ZNK9__gnu_cxx16__aligned_membufI7PtrDataE6_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_membufI7PtrDataE6_M_ptrEv'>
             <parameter type-id='type-id-397' is-artificial='yes'/>
-            <return type-id='type-id-181'/>
+            <return type-id='type-id-176'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11840,7 +11840,7 @@
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI11TargetImageE6_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_membufI11TargetImageE6_M_ptrEv'>
             <parameter type-id='type-id-323' is-artificial='yes'/>
-            <return type-id='type-id-268'/>
+            <return type-id='type-id-266'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12171,7 +12171,7 @@
     <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-30'/>
       <parameter type-id='type-id-152'/>
-      <return type-id='type-id-233'/>
+      <return type-id='type-id-228'/>
     </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-1881'/>
@@ -12189,8 +12189,8 @@
       <return type-id='type-id-1882'/>
     </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-233'/>
-      <return type-id='type-id-233'/>
+      <parameter type-id='type-id-228'/>
+      <return type-id='type-id-228'/>
     </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-1882'/>
@@ -12213,14 +12213,14 @@
     </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-1882'/>
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-228'/>
       <return type-id='type-id-154'/>
     </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-1882'/>
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='fgetc' filepath='/usr/include/stdio.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12235,10 +12235,10 @@
       <return type-id='type-id-30'/>
     </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-233'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-30'/>
       <parameter type-id='type-id-1882'/>
-      <return type-id='type-id-233'/>
+      <return type-id='type-id-228'/>
     </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-30'/>
@@ -12247,20 +12247,20 @@
     </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-150'/>
-      <parameter type-id='type-id-280'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1882'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-1882'/>
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-165'/>
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-30'/>
     </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-1882'/>
-      <return type-id='type-id-170'/>
+      <return type-id='type-id-165'/>
     </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-1882'/>
@@ -12302,11 +12302,11 @@
     </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-152'/>
-      <return type-id='type-id-170'/>
+      <return type-id='type-id-165'/>
     </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-152'/>
-      <return type-id='type-id-229'/>
+      <return type-id='type-id-224'/>
     </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-152'/>
@@ -12327,7 +12327,7 @@
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-1886'/>
       <parameter type-id='type-id-30'/>
-      <return type-id='type-id-170'/>
+      <return type-id='type-id-165'/>
     </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-152'/>
@@ -12339,7 +12339,7 @@
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-1886'/>
       <parameter type-id='type-id-30'/>
-      <return type-id='type-id-229'/>
+      <return type-id='type-id-224'/>
     </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-152'/>
@@ -12364,7 +12364,7 @@
     </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-152'/>
-      <return type-id='type-id-233'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <function-decl name='system' filepath='/usr/include/stdlib.h' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-152'/>
@@ -12373,15 +12373,15 @@
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
-      <parameter type-id='type-id-280'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1891'/>
       <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='qsort' filepath='/usr/include/stdlib.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-150'/>
-      <parameter type-id='type-id-280'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1891'/>
       <return type-id='type-id-154'/>
     </function-decl>
@@ -12391,42 +12391,42 @@
       <return type-id='type-id-1892'/>
     </function-decl>
     <function-decl name='ldiv' filepath='/usr/include/stdlib.h' line='791' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-170'/>
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-165'/>
+      <parameter type-id='type-id-165'/>
       <return type-id='type-id-1893'/>
     </function-decl>
     <function-decl name='lldiv' filepath='/usr/include/stdlib.h' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-229'/>
-      <parameter type-id='type-id-229'/>
+      <parameter type-id='type-id-224'/>
+      <parameter type-id='type-id-224'/>
       <return type-id='type-id-1894'/>
     </function-decl>
     <function-decl name='mblen' filepath='/usr/include/stdlib.h' line='863' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-152'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='mbtowc' filepath='/usr/include/stdlib.h' line='866' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1895'/>
       <parameter type-id='type-id-152'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='wctomb' filepath='/usr/include/stdlib.h' line='870' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1895'/>
       <parameter type-id='type-id-152'/>
-      <parameter type-id='type-id-280'/>
-      <return type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='877' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
-      <return type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
+      <return type-id='type-id-278'/>
     </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-1895'/>
@@ -12436,7 +12436,7 @@
     <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-1895'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-1895'/>
     </function-decl>
     <function-decl name='wcscat' filepath='/usr/include/wchar.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12447,7 +12447,7 @@
     <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-1895'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-1895'/>
     </function-decl>
     <function-decl name='wcscmp' filepath='/usr/include/wchar.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12458,7 +12458,7 @@
     <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-1896'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='wcscoll' filepath='/usr/include/wchar.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12469,18 +12469,18 @@
     <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-1895'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
-      <return type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
+      <return type-id='type-id-278'/>
     </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-1896'/>
       <parameter type-id='type-id-1896'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-1896'/>
       <parameter type-id='type-id-1896'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-1895'/>
@@ -12490,30 +12490,30 @@
     </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-1896'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-1896'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-30'/>
     </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-1895'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-1895'/>
     </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-1895'/>
       <parameter type-id='type-id-1896'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-1895'/>
     </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-1895'/>
       <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-1895'/>
     </function-decl>
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12531,35 +12531,35 @@
     <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-1895'/>
       <parameter type-id='type-id-152'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1900'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-233'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-1900'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-152'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1900'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-1895'/>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1900'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-233'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-1901'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1900'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-1896'/>
@@ -12580,7 +12580,7 @@
       <parameter type-id='type-id-1896'/>
       <parameter type-id='type-id-1897'/>
       <parameter type-id='type-id-30'/>
-      <return type-id='type-id-170'/>
+      <return type-id='type-id-165'/>
     </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-1896'/>
@@ -12592,7 +12592,7 @@
       <parameter type-id='type-id-1896'/>
       <parameter type-id='type-id-1897'/>
       <parameter type-id='type-id-30'/>
-      <return type-id='type-id-229'/>
+      <return type-id='type-id-224'/>
     </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-1896'/>
@@ -12618,7 +12618,7 @@
     </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-1895'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1896'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-30'/>
@@ -12636,7 +12636,7 @@
     </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-1895'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1896'/>
       <parameter type-id='type-id-1903'/>
       <return type-id='type-id-30'/>
@@ -12718,28 +12718,28 @@
     </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-1895'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-1896'/>
       <parameter type-id='type-id-1904'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_common.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-    <type-decl name='char' size-in-bits='8' id='type-id-165'/>
-    <class-decl name='Marshaller' size-in-bits='256' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='388' column='1' id='type-id-244'>
+    <type-decl name='char' size-in-bits='8' id='type-id-160'/>
+    <class-decl name='Marshaller' size-in-bits='256' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='388' column='1' id='type-id-239'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='buffer_start' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='392' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='392' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='buffer_ptr' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='395' column='1'/>
+        <var-decl name='buffer_ptr' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='395' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='buffer_size' type-id='type-id-229' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='398' column='1'/>
+        <var-decl name='buffer_size' type-id='type-id-224' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='398' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <var-decl name='tfr_size' type-id='type-id-229' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='401' column='1'/>
+        <var-decl name='tfr_size' type-id='type-id-224' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='401' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='receive_func_ptr' mangled-name='_ZN10Marshaller16receive_func_ptrEPPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10Marshaller16receive_func_ptrEPPKv'>
@@ -12759,7 +12759,7 @@
         <function-decl name='receive_data' mangled-name='_ZN10Marshaller12receive_dataEPvl' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10Marshaller12receive_dataEPvl'>
           <parameter type-id='type-id-1905' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-199'/>
+          <parameter type-id='type-id-194'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -12767,7 +12767,7 @@
         <function-decl name='send_data' mangled-name='_ZN10Marshaller9send_dataEPKvl' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10Marshaller9send_dataEPKvl'>
           <parameter type-id='type-id-1905' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-199'/>
+          <parameter type-id='type-id-194'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -12786,31 +12786,31 @@
       <member-function access='private'>
         <function-decl name='init_buffer' mangled-name='_ZN10Marshaller11init_bufferEPcx' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10Marshaller11init_bufferEPcx'>
           <parameter type-id='type-id-1905' is-artificial='yes'/>
-          <parameter type-id='type-id-233'/>
-          <parameter type-id='type-id-229'/>
+          <parameter type-id='type-id-228'/>
+          <parameter type-id='type-id-224'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='private' const='yes'>
         <function-decl name='get_tfr_size' mangled-name='_ZNK10Marshaller12get_tfr_sizeEv' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10Marshaller12get_tfr_sizeEv'>
           <parameter type-id='type-id-1906' is-artificial='yes'/>
-          <return type-id='type-id-229'/>
+          <return type-id='type-id-224'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <type-decl name='long int' size-in-bits='64' id='type-id-170'/>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-229'/>
-    <typedef-decl name='int64_t' type-id='type-id-170' filepath='/usr/include/sys/types.h' line='197' column='1' id='type-id-199'/>
-    <typedef-decl name='size_t' type-id='type-id-40' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-280'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-165'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-224'/>
+    <typedef-decl name='int64_t' type-id='type-id-165' filepath='/usr/include/sys/types.h' line='197' column='1' id='type-id-194'/>
+    <typedef-decl name='size_t' type-id='type-id-40' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-278'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-40'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-1905'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-233'/>
-    <qualified-type-def type-id='type-id-244' const='yes' id='type-id-1907'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-1905'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-228'/>
+    <qualified-type-def type-id='type-id-239' const='yes' id='type-id-1907'/>
     <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1906'/>
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
     <function-decl name='__offload_malloc' mangled-name='_Z16__offload_mallocmm' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16__offload_mallocmm'>
-      <parameter type-id='type-id-280' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='168' column='1'/>
-      <parameter type-id='type-id-280' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='169' column='1'/>
+      <parameter type-id='type-id-278' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='168' column='1'/>
+      <parameter type-id='type-id-278' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='169' column='1'/>
       <return type-id='type-id-150'/>
     </function-decl>
     <type-decl name='void' id='type-id-154'/>
@@ -12891,14 +12891,14 @@
       <member-function access='public'>
         <function-decl name='get_auto_vars' mangled-name='_ZN6Thread13get_auto_varsEv' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Thread13get_auto_varsEv'>
           <parameter type-id='type-id-1919' is-artificial='yes'/>
-          <return type-id='type-id-219'/>
+          <return type-id='type-id-214'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set_pipeline' mangled-name='_ZN6Thread12set_pipelineEiP11coipipeline' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN6Thread12set_pipelineEiP11coipipeline'>
           <parameter type-id='type-id-1919' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-221'/>
+          <parameter type-id='type-id-216'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -12906,7 +12906,7 @@
         <function-decl name='get_pipeline' mangled-name='_ZNK6Thread12get_pipelineEi' filepath='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK6Thread12get_pipelineEi'>
           <parameter type-id='type-id-1920' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <return type-id='type-id-221'/>
+          <return type-id='type-id-216'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
@@ -13080,16 +13080,16 @@
     <pointer-type-def type-id='type-id-2020' size-in-bits='64' id='type-id-2022'/>
     <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-2023'/>
     <reference-type-def kind='lvalue' type-id='type-id-2023' size-in-bits='64' id='type-id-2024'/>
-    <qualified-type-def type-id='type-id-280' const='yes' id='type-id-2025'/>
+    <qualified-type-def type-id='type-id-278' const='yes' id='type-id-2025'/>
     <qualified-type-def type-id='type-id-2026' const='yes' id='type-id-2027'/>
     <reference-type-def kind='lvalue' type-id='type-id-2027' size-in-bits='64' id='type-id-2028'/>
     <pointer-type-def type-id='type-id-2027' size-in-bits='64' id='type-id-2029'/>
     <qualified-type-def type-id='type-id-950' const='yes' id='type-id-2030'/>
     <qualified-type-def type-id='type-id-2031' const='yes' id='type-id-2032'/>
     <reference-type-def kind='lvalue' type-id='type-id-2032' size-in-bits='64' id='type-id-2033'/>
-    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-1917'/>
+    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-1917'/>
     <pointer-type-def type-id='type-id-1921' size-in-bits='64' id='type-id-1923'/>
-    <reference-type-def kind='lvalue' type-id='type-id-180' size-in-bits='64' id='type-id-1922'/>
+    <reference-type-def kind='lvalue' type-id='type-id-175' size-in-bits='64' id='type-id-1922'/>
     <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1616'/>
     <reference-type-def kind='lvalue' type-id='type-id-1611' size-in-bits='64' id='type-id-2034'/>
     <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1636'/>
@@ -13268,7 +13268,7 @@
           <var-decl name='_M_x' type-id='type-id-1924' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/random.h' line='621' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='39936'>
-          <var-decl name='_M_p' type-id='type-id-280' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/random.h' line='622' column='1'/>
+          <var-decl name='_M_p' type-id='type-id-278' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/random.h' line='622' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='move_iterator&lt;const VarTable::Entry**&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='998' column='1' id='type-id-2019'>
@@ -13448,8 +13448,8 @@
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt9_IdentityI7PtrDataEclERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_IdentityI7PtrDataEclERKS0_'>
             <parameter type-id='type-id-1982' is-artificial='yes'/>
-            <parameter type-id='type-id-182'/>
-            <return type-id='type-id-182'/>
+            <parameter type-id='type-id-177'/>
+            <return type-id='type-id-177'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
@@ -13698,7 +13698,7 @@
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE11_M_allocateEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE11_M_allocateEm'>
             <parameter type-id='type-id-2040' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-2108'/>
           </function-decl>
         </member-function>
@@ -13706,7 +13706,7 @@
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE13_M_deallocateEPS3_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE13_M_deallocateEPS3_m'>
             <parameter type-id='type-id-2040' is-artificial='yes'/>
             <parameter type-id='type-id-2108'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -13978,7 +13978,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_Rb_tree_node&lt;AutoData&gt; &gt;, AutoData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE10_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_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
             <parameter type-id='type-id-2052'/>
-            <parameter type-id='type-id-172'/>
+            <parameter type-id='type-id-167'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -13994,14 +13994,14 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;AutoData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE7destroyIS1_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_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE7destroyIS1_EEvRS3_PT_'>
             <parameter type-id='type-id-2052'/>
-            <parameter type-id='type-id-172'/>
+            <parameter type-id='type-id-167'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;AutoData, AutoData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE12_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_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_'>
             <parameter type-id='type-id-2052'/>
-            <parameter type-id='type-id-172'/>
+            <parameter type-id='type-id-167'/>
             <parameter type-id='type-id-303'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -14009,7 +14009,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;AutoData, AutoData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE9constructIS1_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_traitsISaISt13_Rb_tree_nodeI8AutoDataEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_'>
             <parameter type-id='type-id-2052'/>
-            <parameter type-id='type-id-172'/>
+            <parameter type-id='type-id-167'/>
             <parameter type-id='type-id-303'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -14036,7 +14036,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;PtrData, PtrData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE12_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_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_'>
             <parameter type-id='type-id-2053'/>
-            <parameter type-id='type-id-183'/>
+            <parameter type-id='type-id-178'/>
             <parameter type-id='type-id-306'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -14044,7 +14044,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;PtrData, PtrData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE9constructIS1_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_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_'>
             <parameter type-id='type-id-2053'/>
-            <parameter type-id='type-id-183'/>
+            <parameter type-id='type-id-178'/>
             <parameter type-id='type-id-306'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -14067,7 +14067,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_Rb_tree_node&lt;PtrData&gt; &gt;, PtrData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE10_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_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
             <parameter type-id='type-id-2053'/>
-            <parameter type-id='type-id-183'/>
+            <parameter type-id='type-id-178'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -14075,7 +14075,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;PtrData&gt;' mangled-name='_ZNSt16allocator_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE7destroyIS1_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_traitsISaISt13_Rb_tree_nodeI7PtrDataEEE7destroyIS1_EEvRS3_PT_'>
             <parameter type-id='type-id-2053'/>
-            <parameter type-id='type-id-183'/>
+            <parameter type-id='type-id-178'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -14208,7 +14208,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC4IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2063' is-artificial='yes'/>
             <parameter type-id='type-id-1559'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -14216,7 +14216,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
             <parameter type-id='type-id-2063' is-artificial='yes'/>
             <parameter type-id='type-id-1559'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -14224,7 +14224,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC4IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2063' is-artificial='yes'/>
             <parameter type-id='type-id-1559'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -14233,14 +14233,14 @@
       </class-decl>
       <class-decl name='remove_reference&lt;DynLib&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-2191'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-202' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2064'/>
+          <typedef-decl name='type' type-id='type-id-197' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2064'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;PtrData&amp;&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='1585' column='1' id='type-id-2192'>
       </class-decl>
       <class-decl name='remove_reference&lt;PtrData&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-2193'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-178' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2066'/>
+          <typedef-decl name='type' type-id='type-id-173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2066'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;VarList::BufEntry&amp;&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='1585' column='1' id='type-id-2194'>
@@ -14327,11 +14327,11 @@
       </function-decl>
       <function-decl name='forward&lt;bool&amp;&gt;' mangled-name='_ZSt7forwardIRbEOT_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='_ZSt7forwardIRbEOT_RNSt16remove_referenceIS1_E4typeE'>
         <parameter type-id='type-id-2071' 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-188'/>
+        <return type-id='type-id-183'/>
       </function-decl>
       <function-decl name='forward&lt;bool&gt;' mangled-name='_ZSt7forwardIbEOT_RNSt16remove_referenceIS0_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='_ZSt7forwardIbEOT_RNSt16remove_referenceIS0_E4typeE'>
         <parameter type-id='type-id-2071' 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-188'/>
+        <return type-id='type-id-183'/>
       </function-decl>
       <function-decl name='forward&lt;const VarTable::Entry*&gt;' mangled-name='_ZSt7forwardIPKN8VarTable5EntryEEOT_RNSt16remove_referenceIS4_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='_ZSt7forwardIPKN8VarTable5EntryEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2073' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
@@ -14435,7 +14435,7 @@
       <function-decl name='__introsort_loop&lt;__gnu_cxx::__normal_iterator&lt;const VarTable::Entry**, std::vector&lt;const VarTable::Entry*&gt; &gt;, long int, __gnu_cxx::__ops::_Iter_comp_iter&lt;bool (*)(const VarTable::Entry*, const VarTable::Entry*)&gt; &gt;' mangled-name='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEElNS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_SG_T0_T1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEElNS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_SG_T0_T1_'>
         <parameter type-id='type-id-1934' name='__first' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1935' column='1'/>
         <parameter type-id='type-id-1934' name='__last' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1936' column='1'/>
-        <parameter type-id='type-id-170' name='__depth_limit' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1937' column='1'/>
+        <parameter type-id='type-id-165' name='__depth_limit' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1937' column='1'/>
         <parameter type-id='type-id-1939' name='__comp' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1937' column='1'/>
         <return type-id='type-id-154'/>
       </function-decl>
@@ -14514,8 +14514,8 @@
         <return type-id='type-id-1934'/>
       </function-decl>
       <function-decl name='__lg' mangled-name='_ZSt4__lgl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='1010' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4__lgl'>
-        <parameter type-id='type-id-170' name='__n' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='1010' column='1'/>
-        <return type-id='type-id-170'/>
+        <parameter type-id='type-id-165' name='__n' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='1010' column='1'/>
+        <return type-id='type-id-165'/>
       </function-decl>
       <function-decl name='_Destroy&lt;const VarTable::Entry**&gt;' mangled-name='_ZSt8_DestroyIPPKN8VarTable5EntryEEvT_S5_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPPKN8VarTable5EntryEEvT_S5_'>
         <parameter type-id='type-id-1966' name='__first' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_construct.h' line='122' column='1'/>
@@ -14530,16 +14530,16 @@
       </function-decl>
       <function-decl name='__push_heap&lt;__gnu_cxx::__normal_iterator&lt;const VarTable::Entry**, std::vector&lt;const VarTable::Entry*&gt; &gt;, long int, const VarTable::Entry*, __gnu_cxx::__ops::_Iter_comp_val&lt;bool (*)(const VarTable::Entry*, const VarTable::Entry*)&gt; &gt;' mangled-name='_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops14_Iter_comp_valIPFbS5_S5_EEEEvT_T0_SH_T1_T2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops14_Iter_comp_valIPFbS5_S5_EEEEvT_T0_SH_T1_T2_'>
         <parameter type-id='type-id-1934' name='__first' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='124' column='1'/>
-        <parameter type-id='type-id-170' name='__holeIndex' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='125' column='1'/>
-        <parameter type-id='type-id-170' name='__topIndex' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='125' column='1'/>
+        <parameter type-id='type-id-165' name='__holeIndex' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='125' column='1'/>
+        <parameter type-id='type-id-165' name='__topIndex' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='125' column='1'/>
         <parameter type-id='type-id-1911' name='__value' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='125' column='1'/>
         <parameter type-id='type-id-1943' name='__comp' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='126' column='1'/>
         <return type-id='type-id-154'/>
       </function-decl>
       <function-decl name='__adjust_heap&lt;__gnu_cxx::__normal_iterator&lt;const VarTable::Entry**, std::vector&lt;const VarTable::Entry*&gt; &gt;, long int, const VarTable::Entry*, __gnu_cxx::__ops::_Iter_comp_iter&lt;bool (*)(const VarTable::Entry*, const VarTable::Entry*)&gt; &gt;' mangled-name='_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_T0_SH_T1_T2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_T0_SH_T1_T2_'>
         <parameter type-id='type-id-1934' name='__first' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='207' column='1'/>
-        <parameter type-id='type-id-170' name='__holeIndex' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='207' column='1'/>
-        <parameter type-id='type-id-170' name='__len' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='208' column='1'/>
+        <parameter type-id='type-id-165' name='__holeIndex' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='207' column='1'/>
+        <parameter type-id='type-id-165' name='__len' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='208' column='1'/>
         <parameter type-id='type-id-1911' name='__value' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='208' column='1'/>
         <parameter type-id='type-id-1939' name='__comp' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_heap.h' line='208' column='1'/>
         <return type-id='type-id-154'/>
@@ -14570,7 +14570,7 @@
       <function-decl name='operator-&lt;const VarTable::Entry**&gt;' mangled-name='_ZStmiIPPKN8VarTable5EntryEEDTmicldtfp_4baseEcldtfp0_4baseEERKSt13move_iteratorIT_ESA_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStmiIPPKN8VarTable5EntryEEDTmicldtfp_4baseEcldtfp0_4baseEERKSt13move_iteratorIT_ESA_'>
         <parameter type-id='type-id-2021' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1184' column='1'/>
         <parameter type-id='type-id-2021' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1185' column='1'/>
-        <return type-id='type-id-170'/>
+        <return type-id='type-id-165'/>
       </function-decl>
       <function-decl name='__make_move_if_noexcept_iterator&lt;const VarTable::Entry*, std::move_iterator&lt;const VarTable::Entry**&gt; &gt;' mangled-name='_ZSt32__make_move_if_noexcept_iteratorIPKN8VarTable5EntryESt13move_iteratorIPS3_EET0_PT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__make_move_if_noexcept_iteratorIPKN8VarTable5EntryESt13move_iteratorIPS3_EET0_PT_'>
         <parameter type-id='type-id-1966' name='__i' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='1214' column='1'/>
@@ -14617,11 +14617,11 @@
     <class-decl name='coipipeline' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2087'/>
     <class-decl name='coiprocess' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2090'/>
     <typedef-decl name='COIPROCESS' type-id='type-id-2091' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='65' column='1' id='type-id-2092'/>
-    <typedef-decl name='COIPIPELINE' type-id='type-id-2088' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='66' column='1' id='type-id-221'/>
+    <typedef-decl name='COIPIPELINE' type-id='type-id-2088' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='66' column='1' id='type-id-216'/>
     <typedef-decl name='COIBUFFER' type-id='type-id-1162' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='70' column='1' id='type-id-2217'/>
-    <typedef-decl name='COILIBRARY' type-id='type-id-2086' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='71' column='1' id='type-id-205'/>
+    <typedef-decl name='COILIBRARY' type-id='type-id-2086' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='71' column='1' id='type-id-200'/>
     <function-decl name='operator new' mangled-name='_ZnwmPv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmPv'>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-150' name='__p' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='129' column='1'/>
       <return type-id='type-id-150'/>
     </function-decl>
@@ -15108,7 +15108,7 @@
           <member-function access='public'>
             <function-decl name='find_var' mangled-name='_ZN9MicEnvVar11CardEnvVars8find_varEPci' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-2234' is-artificial='yes'/>
-              <parameter type-id='type-id-233'/>
+              <parameter type-id='type-id-228'/>
               <parameter type-id='type-id-30'/>
               <return type-id='type-id-2235'/>
             </function-decl>
@@ -15158,13 +15158,13 @@
       <member-type access='public'>
         <class-decl name='VarValue' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='72' column='1' id='type-id-2236'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='env_var' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='74' column='1'/>
+            <var-decl name='env_var' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='74' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='length' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='75' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='env_var_value' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='76' column='1'/>
+            <var-decl name='env_var_value' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='76' column='1'/>
           </data-member>
           <member-function access='public' destructor='yes'>
             <function-decl name='~VarValue' mangled-name='_ZN9MicEnvVar8VarValueD4Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15183,25 +15183,25 @@
           <member-function access='public' constructor='yes'>
             <function-decl name='VarValue' mangled-name='_ZN9MicEnvVar8VarValueC4EPciS1_' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-2235' is-artificial='yes'/>
-              <parameter type-id='type-id-233'/>
+              <parameter type-id='type-id-228'/>
               <parameter type-id='type-id-30'/>
-              <parameter type-id='type-id-233'/>
+              <parameter type-id='type-id-228'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='VarValue' mangled-name='_ZN9MicEnvVar8VarValueC2EPciS1_' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-2235' is-artificial='yes'/>
-              <parameter type-id='type-id-233'/>
+              <parameter type-id='type-id-228'/>
               <parameter type-id='type-id-30'/>
-              <parameter type-id='type-id-233'/>
+              <parameter type-id='type-id-228'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
         </class-decl>
       </member-type>
       <data-member access='public' static='yes'>
-        <var-decl name='any_card' type-id='type-id-217' mangled-name='_ZN9MicEnvVar8any_cardE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='101' column='1'/>
+        <var-decl name='any_card' type-id='type-id-212' mangled-name='_ZN9MicEnvVar8any_cardE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='101' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='prefix' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='107' column='1'/>
@@ -15223,14 +15223,14 @@
         <function-decl name='mic_parse_env_var_list' mangled-name='_ZN9MicEnvVar22mic_parse_env_var_listEiPc' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-2238' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-233'/>
+          <parameter type-id='type-id-228'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_env_var_kind' mangled-name='_ZN9MicEnvVar16get_env_var_kindEPcPiPS0_S1_S2_' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-2238' is-artificial='yes'/>
-          <parameter type-id='type-id-233'/>
+          <parameter type-id='type-id-228'/>
           <parameter type-id='type-id-2239'/>
           <parameter type-id='type-id-1886'/>
           <parameter type-id='type-id-2239'/>
@@ -15242,16 +15242,16 @@
         <function-decl name='add_env_var' mangled-name='_ZN9MicEnvVar11add_env_varEiPciS0_' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-2238' is-artificial='yes'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-233'/>
+          <parameter type-id='type-id-228'/>
           <parameter type-id='type-id-30'/>
-          <parameter type-id='type-id-233'/>
+          <parameter type-id='type-id-228'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='analyze_env_var' mangled-name='_ZN9MicEnvVar15analyze_env_varEPc' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-2238' is-artificial='yes'/>
-          <parameter type-id='type-id-233'/>
+          <parameter type-id='type-id-228'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -15322,7 +15322,7 @@
     <pointer-type-def type-id='type-id-2270' size-in-bits='64' id='type-id-2271'/>
     <pointer-type-def type-id='type-id-2272' size-in-bits='64' id='type-id-2273'/>
     <pointer-type-def type-id='type-id-2274' size-in-bits='64' id='type-id-2275'/>
-    <reference-type-def kind='lvalue' type-id='type-id-233' size-in-bits='64' id='type-id-2276'/>
+    <reference-type-def kind='lvalue' type-id='type-id-228' size-in-bits='64' id='type-id-2276'/>
     <qualified-type-def type-id='type-id-2250' const='yes' id='type-id-2277'/>
     <pointer-type-def type-id='type-id-2277' size-in-bits='64' id='type-id-2278'/>
     <qualified-type-def type-id='type-id-2252' const='yes' id='type-id-2279'/>
@@ -15533,7 +15533,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-233' 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-2398'/>
+          <typedef-decl name='value_type' type-id='type-id-228' 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-2398'/>
         </member-type>
       </class-decl>
       <class-decl name='allocator&lt;std::_List_node&lt;MicEnvVar::CardEnvVars*&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-2410'>
@@ -16478,7 +16478,7 @@
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseIPN9MicEnvVar11CardEnvVarsESaIS3_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'>
               <parameter type-id='type-id-2451' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -16518,7 +16518,7 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseIPN9MicEnvVar11CardEnvVarsESaIS3_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'>
               <parameter type-id='type-id-2451' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -16583,14 +16583,14 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseIPN9MicEnvVar8VarValueESaIS3_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'>
               <parameter type-id='type-id-2456' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseIPN9MicEnvVar8VarValueESaIS3_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'>
               <parameter type-id='type-id-2456' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -16688,14 +16688,14 @@
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseIPcSaIS1_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_baseIPcSaIS1_EE11_M_set_sizeEm'>
               <parameter type-id='type-id-2461' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseIPcSaIS1_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_baseIPcSaIS1_EE11_M_inc_sizeEm'>
               <parameter type-id='type-id-2461' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -16721,7 +16721,7 @@
           <member-function access='protected' const='yes'>
             <function-decl name='_M_node_count' mangled-name='_ZNKSt7__cxx1110_List_baseIPcSaIS1_EE13_M_node_countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7__cxx1110_List_baseIPcSaIS1_EE13_M_node_countEv'>
               <parameter type-id='type-id-2369' is-artificial='yes'/>
-              <return type-id='type-id-280'/>
+              <return type-id='type-id-278'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
@@ -17420,7 +17420,7 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='4096' id='type-id-2696'>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='4096' id='type-id-2696'>
       <subrange length='512' lower-bound='0' upper-bound='511' type-id='type-id-38' id='type-id-2697'/>
     </array-type-def>
     <enum-decl name='OffloadHostPhase' filepath='../../../gcc/liboffloadmic/runtime/liboffload_error_codes.h' line='186' column='1' id='type-id-2698'>
@@ -17455,7 +17455,7 @@
     </enum-decl>
     <class-decl name='OffloadTimer' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='139' column='1' id='type-id-2700'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='m_data' type-id='type-id-249' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='153' column='1'/>
+        <var-decl name='m_data' type-id='type-id-244' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='153' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='m_phase' type-id='type-id-2698' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='154' column='1'/>
@@ -17477,7 +17477,7 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='OffloadTimer' mangled-name='_ZN12OffloadTimerC4EP20OffloadHostTimerData16OffloadHostPhase' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-2701' is-artificial='yes'/>
-          <parameter type-id='type-id-249'/>
+          <parameter type-id='type-id-244'/>
           <parameter type-id='type-id-2698'/>
           <return type-id='type-id-154'/>
         </function-decl>
@@ -17485,15 +17485,15 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='OffloadTimer' mangled-name='_ZN12OffloadTimerC2EP20OffloadHostTimerData16OffloadHostPhase' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12OffloadTimerC2EP20OffloadHostTimerData16OffloadHostPhase'>
           <parameter type-id='type-id-2701' is-artificial='yes'/>
-          <parameter type-id='type-id-249'/>
+          <parameter type-id='type-id-244'/>
           <parameter type-id='type-id-2698'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
     </class-decl>
     <typedef-decl name='pthread_key_t' type-id='type-id-35' filepath='/usr/include/bits/pthreadtypes.h' line='163' column='1' id='type-id-2702'/>
-    <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-234'/>
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-231'/>
     <pointer-type-def type-id='type-id-2700' size-in-bits='64' id='type-id-2701'/>
     <qualified-type-def type-id='type-id-24' const='yes' id='type-id-2703'/>
     <qualified-type-def type-id='type-id-2704' const='yes' id='type-id-2705'/>
@@ -17634,13 +17634,13 @@
               <var-decl name='_M_wp' type-id='type-id-1175' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='804' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='_M_bpos' type-id='type-id-280' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='805' column='1'/>
+              <var-decl name='_M_bpos' type-id='type-id-278' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='805' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='reference' mangled-name='_ZNSt6bitsetILm128EE9referenceC4ERS0_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-2787' is-artificial='yes'/>
                 <parameter type-id='type-id-2784'/>
-                <parameter type-id='type-id-280'/>
+                <parameter type-id='type-id-278'/>
                 <return type-id='type-id-154'/>
               </function-decl>
             </member-function>
@@ -17648,7 +17648,7 @@
               <function-decl name='reference' mangled-name='_ZNSt6bitsetILm128EE9referenceC2ERS0_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm128EE9referenceC2ERS0_m'>
                 <parameter type-id='type-id-2787' is-artificial='yes'/>
                 <parameter type-id='type-id-2784'/>
-                <parameter type-id='type-id-280'/>
+                <parameter type-id='type-id-278'/>
                 <return type-id='type-id-154'/>
               </function-decl>
             </member-function>
@@ -17677,7 +17677,7 @@
         <member-function access='private'>
           <function-decl name='_Unchecked_set' mangled-name='_ZNSt6bitsetILm128EE14_Unchecked_setEmi' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm128EE14_Unchecked_setEmi'>
             <parameter type-id='type-id-2785' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-2784'/>
           </function-decl>
@@ -17685,7 +17685,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='_M_check' mangled-name='_ZNKSt6bitsetILm128EE8_M_checkEmPKc' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6bitsetILm128EE8_M_checkEmPKc'>
             <parameter type-id='type-id-2738' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <parameter type-id='type-id-152'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -17693,20 +17693,20 @@
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt6bitsetILm128EEixEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm128EEixEm'>
             <parameter type-id='type-id-2785' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-2739'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='count' mangled-name='_ZNKSt6bitsetILm128EE5countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6bitsetILm128EE5countEv'>
             <parameter type-id='type-id-2738' is-artificial='yes'/>
-            <return type-id='type-id-280'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' mangled-name='_ZNSt6bitsetILm128EE3setEmb' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6bitsetILm128EE3setEmb'>
             <parameter type-id='type-id-2785' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <parameter type-id='type-id-149'/>
             <return type-id='type-id-2784'/>
           </function-decl>
@@ -17788,20 +17788,20 @@
         <member-function access='public'>
           <function-decl name='_M_getword' mangled-name='_ZNSt12_Base_bitsetILm2EE10_M_getwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE10_M_getwordEm'>
             <parameter type-id='type-id-2750' is-artificial='yes'/>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-850'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_whichword' mangled-name='_ZNSt12_Base_bitsetILm2EE12_S_whichwordEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE12_S_whichwordEm'>
-            <parameter type-id='type-id-280'/>
-            <return type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_do_count' mangled-name='_ZNKSt12_Base_bitsetILm2EE11_M_do_countEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Base_bitsetILm2EE11_M_do_countEv'>
             <parameter type-id='type-id-2707' is-artificial='yes'/>
-            <return type-id='type-id-280'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17812,14 +17812,14 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_maskbit' mangled-name='_ZNSt12_Base_bitsetILm2EE10_S_maskbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE10_S_maskbitEm'>
-            <parameter type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
             <return type-id='type-id-475'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_whichbit' mangled-name='_ZNSt12_Base_bitsetILm2EE11_S_whichbitEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bitset' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Base_bitsetILm2EE11_S_whichbitEm'>
-            <parameter type-id='type-id-280'/>
-            <return type-id='type-id-280'/>
+            <parameter type-id='type-id-278'/>
+            <return type-id='type-id-278'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17878,8 +17878,8 @@
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt9_IdentityI8AutoDataEclERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_IdentityI8AutoDataEclERKS0_'>
             <parameter type-id='type-id-2716' is-artificial='yes'/>
-            <parameter type-id='type-id-173'/>
-            <return type-id='type-id-173'/>
+            <parameter type-id='type-id-168'/>
+            <return type-id='type-id-168'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
@@ -18406,7 +18406,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC4IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2789' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -18414,7 +18414,7 @@
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_'>
             <parameter type-id='type-id-2789' is-artificial='yes'/>
             <parameter type-id='type-id-1558'/>
-            <parameter type-id='type-id-188'/>
+            <parameter type-id='type-id-183'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
@@ -18424,7 +18424,7 @@
       </class-decl>
       <class-decl name='remove_reference&lt;AutoData&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-2857'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-168' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2791'/>
+          <typedef-decl name='type' type-id='type-id-163' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2791'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;PtrData* const&amp;&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='1585' column='1' id='type-id-2858'>
@@ -18436,7 +18436,7 @@
       </class-decl>
       <class-decl name='remove_reference&lt;TargetImage&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-2860'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-267' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2795'/>
+          <typedef-decl name='type' type-id='type-id-265' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-2795'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;coibuffer* const&amp;&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='1585' column='1' id='type-id-2861'>
@@ -18599,7 +18599,7 @@
       </function-decl>
       <function-decl name='forward&lt;const TargetImage&amp;&gt;' mangled-name='_ZSt7forwardIRK11TargetImageEOT_RNSt16remove_referenceIS3_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='_ZSt7forwardIRK11TargetImageEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-2800' 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-225'/>
+        <return type-id='type-id-220'/>
       </function-decl>
       <function-decl name='forward&lt;const std::pair&lt;long unsigned int const, Stream*&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRKSt4pairIKmP6StreamEEOT_RNSt16remove_referenceIS7_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='_ZSt7forwardIRKSt4pairIKmP6StreamEEOT_RNSt16remove_referenceIS7_E4typeE'>
         <parameter type-id='type-id-2802' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
@@ -18706,13 +18706,13 @@
     <class-decl name='coiprocess' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2832'/>
     <qualified-type-def type-id='type-id-150' const='yes' id='type-id-1568'/>
     <typedef-decl name='COIPROCESS' type-id='type-id-2833' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='65' column='1' id='type-id-2834'/>
-    <typedef-decl name='COIBUFFER' type-id='type-id-1164' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='70' column='1' id='type-id-252'/>
+    <typedef-decl name='COIBUFFER' type-id='type-id-1164' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='70' column='1' id='type-id-247'/>
     <typedef-decl name='COILIBRARY' type-id='type-id-2831' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='71' column='1' id='type-id-2899'/>
     <var-decl name='console_enabled' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='64' column='1'/>
     <var-decl name='prefix' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='68' column='1'/>
     <var-decl name='offload_number' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='69' column='1'/>
     <function-decl name='for__continue_traceback' mangled-name='for__continue_traceback' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='for__continue_traceback'>
-      <parameter type-id='type-id-194' name='coi_offload_result' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='110' column='1'/>
+      <parameter type-id='type-id-189' name='coi_offload_result' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='110' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='offload_proxy_task_completed_ooo' mangled-name='offload_proxy_task_completed_ooo' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='2507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='offload_proxy_task_completed_ooo'>
@@ -18768,16 +18768,16 @@
     <function-decl name='_Offload_stream_create' mangled-name='_Offload_stream_create' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_stream_create'>
       <parameter type-id='type-id-30' name='device' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5768' column='1'/>
       <parameter type-id='type-id-30' name='number_of_cpus' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5769' column='1'/>
-      <return type-id='type-id-220'/>
+      <return type-id='type-id-215'/>
     </function-decl>
     <function-decl name='_Offload_stream_destroy' mangled-name='_Offload_stream_destroy' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_stream_destroy'>
       <parameter type-id='type-id-30' name='device' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5795' column='1'/>
-      <parameter type-id='type-id-220' name='handle' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5796' column='1'/>
+      <parameter type-id='type-id-215' name='handle' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5796' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='_Offload_stream_completed' mangled-name='_Offload_stream_completed' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5813' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_stream_completed'>
       <parameter type-id='type-id-30' name='device' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5813' column='1'/>
-      <parameter type-id='type-id-220' name='handler' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5813' column='1'/>
+      <parameter type-id='type-id-215' name='handler' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5813' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='__dbg_target_so_loaded' mangled-name='__dbg_target_so_loaded' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5877' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dbg_target_so_loaded'>
@@ -18786,30 +18786,30 @@
     <function-decl name='__dbg_target_so_unloaded' mangled-name='__dbg_target_so_unloaded' filepath='../../../gcc/liboffloadmic/runtime/offload_host.cpp' line='5880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dbg_target_so_unloaded'>
       <return type-id='type-id-154'/>
     </function-decl>
-    <var-decl name='mic_engines' type-id='type-id-218' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='49' column='1'/>
+    <var-decl name='mic_engines' type-id='type-id-213' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='49' column='1'/>
     <var-decl name='mic_engines_total' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='50' column='1'/>
     <var-decl name='mic_dma_channel_count' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='54' column='1'/>
     <var-decl name='mic_thread_key' type-id='type-id-2702' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='383' column='1'/>
-    <var-decl name='mic_device_main' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='388' column='1'/>
+    <var-decl name='mic_device_main' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='388' column='1'/>
     <var-decl name='mic_env_vars' type-id='type-id-2231' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='391' column='1'/>
     <var-decl name='cpu_frequency' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='394' column='1'/>
-    <var-decl name='mic_library_path' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='397' column='1'/>
+    <var-decl name='mic_library_path' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='397' column='1'/>
     <var-decl name='mic_stack_size' type-id='type-id-17' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='400' column='1'/>
     <var-decl name='mic_buffer_size' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='403' column='1'/>
     <var-decl name='mic_4k_buffer_size' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='406' column='1'/>
     <var-decl name='mic_2m_buffer_size' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='409' column='1'/>
     <var-decl name='mic_proxy_io' type-id='type-id-149' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='412' column='1'/>
-    <var-decl name='mic_proxy_fs_root' type-id='type-id-233' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='413' column='1'/>
+    <var-decl name='mic_proxy_fs_root' type-id='type-id-228' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='413' column='1'/>
     <var-decl name='__offload_use_2mb_buffers' type-id='type-id-19' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='416' column='1'/>
     <var-decl name='__offload_init_type' type-id='type-id-2699' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='419' column='1'/>
     <var-decl name='__omp_device_num' type-id='type-id-30' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='422' column='1'/>
-    <var-decl name='__target_exe' type-id='type-id-268' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='425' column='1'/>
+    <var-decl name='__target_exe' type-id='type-id-266' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='425' column='1'/>
     <var-decl name='__dbg_target_exe_name' type-id='type-id-2696' mangled-name='__dbg_target_exe_name' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='440' column='1' elf-symbol-id='__dbg_target_exe_name'/>
-    <var-decl name='__dbg_target_so_pid' type-id='type-id-222' mangled-name='__dbg_target_so_pid' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='443' column='1' elf-symbol-id='__dbg_target_so_pid'/>
+    <var-decl name='__dbg_target_so_pid' type-id='type-id-217' mangled-name='__dbg_target_so_pid' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='443' column='1' elf-symbol-id='__dbg_target_so_pid'/>
     <var-decl name='__dbg_target_id' type-id='type-id-30' mangled-name='__dbg_target_id' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='446' column='1' elf-symbol-id='__dbg_target_id'/>
     <var-decl name='__dbg_is_attached' type-id='type-id-30' mangled-name='__dbg_is_attached' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='450' column='1' elf-symbol-id='__dbg_is_attached'/>
-    <var-decl name='__dbg_api_major_version' type-id='type-id-217' mangled-name='__dbg_api_major_version' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='453' column='1' elf-symbol-id='__dbg_api_major_version'/>
-    <var-decl name='__dbg_api_minor_version' type-id='type-id-217' mangled-name='__dbg_api_minor_version' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='456' column='1' elf-symbol-id='__dbg_api_minor_version'/>
+    <var-decl name='__dbg_api_major_version' type-id='type-id-212' mangled-name='__dbg_api_major_version' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='453' column='1' elf-symbol-id='__dbg_api_major_version'/>
+    <var-decl name='__dbg_api_minor_version' type-id='type-id-212' mangled-name='__dbg_api_minor_version' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='456' column='1' elf-symbol-id='__dbg_api_minor_version'/>
     <function-decl name='operator delete' mangled-name='_ZdlPvS_' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/new' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdlPvS_'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
@@ -18944,8 +18944,8 @@
         <function-decl name='SharedAlignedArenaMalloc' mangled-name='_ZNK10MyoWrapper24SharedAlignedArenaMallocEjmm' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper24SharedAlignedArenaMallocEjmm'>
           <parameter type-id='type-id-2919' is-artificial='yes'/>
           <parameter type-id='type-id-2902'/>
-          <parameter type-id='type-id-280'/>
-          <parameter type-id='type-id-280'/>
+          <parameter type-id='type-id-278'/>
+          <parameter type-id='type-id-278'/>
           <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
@@ -19034,8 +19034,8 @@
       <member-function access='private' const='yes'>
         <function-decl name='SharedAlignedMalloc' mangled-name='_ZNK10MyoWrapper19SharedAlignedMallocEmm' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper19SharedAlignedMallocEmm'>
           <parameter type-id='type-id-2919' is-artificial='yes'/>
-          <parameter type-id='type-id-280'/>
-          <parameter type-id='type-id-280'/>
+          <parameter type-id='type-id-278'/>
+          <parameter type-id='type-id-278'/>
           <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
@@ -19049,7 +19049,7 @@
       <member-function access='private' const='yes'>
         <function-decl name='SharedMalloc' mangled-name='_ZNK10MyoWrapper12SharedMallocEm' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='84' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10MyoWrapper12SharedMallocEm'>
           <parameter type-id='type-id-2919' is-artificial='yes'/>
-          <parameter type-id='type-id-280'/>
+          <parameter type-id='type-id-278'/>
           <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
@@ -19587,14 +19587,14 @@
           <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-280'/>
+              <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-280'/>
+              <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -19757,7 +19757,7 @@
       <return type-id='type-id-154'/>
     </function-decl>
     <function-decl name='_Offload_shared_malloc' mangled-name='_Offload_shared_malloc' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_shared_malloc'>
-      <parameter type-id='type-id-280' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1083' column='1'/>
+      <parameter type-id='type-id-278' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1083' column='1'/>
       <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='_Offload_shared_free' mangled-name='_Offload_shared_free' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_shared_free'>
@@ -19765,8 +19765,8 @@
       <return type-id='type-id-154'/>
     </function-decl>
     <function-decl name='_Offload_shared_aligned_malloc' mangled-name='_Offload_shared_aligned_malloc' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_shared_aligned_malloc'>
-      <parameter type-id='type-id-280' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1107' column='1'/>
-      <parameter type-id='type-id-280' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1107' column='1'/>
+      <parameter type-id='type-id-278' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1107' column='1'/>
+      <parameter type-id='type-id-278' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1107' column='1'/>
       <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='_Offload_shared_aligned_free' mangled-name='_Offload_shared_aligned_free' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_shared_aligned_free'>
@@ -19781,8 +19781,8 @@
     </function-decl>
     <function-decl name='_Offload_shared_aligned_arena_malloc' mangled-name='_Offload_shared_aligned_arena_malloc' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_shared_aligned_arena_malloc'>
       <parameter type-id='type-id-2902' name='arena' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1149' column='1'/>
-      <parameter type-id='type-id-280' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1150' column='1'/>
-      <parameter type-id='type-id-280' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1151' column='1'/>
+      <parameter type-id='type-id-278' name='size' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1150' column='1'/>
+      <parameter type-id='type-id-278' name='align' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1151' column='1'/>
       <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='_Offload_shared_aligned_arena_free' mangled-name='_Offload_shared_aligned_arena_free' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='1171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Offload_shared_aligned_arena_free'>
@@ -20015,13 +20015,13 @@
       <return type-id='type-id-2923'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3040'>
-      <parameter type-id='type-id-280' name='size'/>
+      <parameter type-id='type-id-278' name='size'/>
       <return type-id='type-id-150'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3038'>
       <parameter type-id='type-id-2902' name='arena'/>
-      <parameter type-id='type-id-280' name='size'/>
-      <parameter type-id='type-id-280' name='align'/>
+      <parameter type-id='type-id-278' name='size'/>
+      <parameter type-id='type-id-278' name='align'/>
       <return type-id='type-id-150'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3039'>
@@ -20043,8 +20043,8 @@
       <return type-id='type-id-154'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3041'>
-      <parameter type-id='type-id-280' name='size'/>
-      <parameter type-id='type-id-280' name='align'/>
+      <parameter type-id='type-id-278' name='size'/>
+      <parameter type-id='type-id-278' name='align'/>
       <return type-id='type-id-150'/>
     </function-type>
   </abi-instr>
@@ -20222,13 +20222,13 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_table.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <type-decl name='bool' size-in-bits='8' id='type-id-149'/>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='320' id='type-id-3129'>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='320' id='type-id-3129'>
       <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-38' id='type-id-299'/>
     </array-type-def>
     <class-decl name='FuncList' size-in-bits='448' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='106' column='1' id='type-id-3130'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3131'/>
       <data-member access='private' layout-offset-in-bits='384'>
-        <var-decl name='m_max_name_len' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='135' column='1'/>
+        <var-decl name='m_max_name_len' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='135' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='dump' mangled-name='_ZN8FuncList4dumpEv' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20239,7 +20239,7 @@
       <member-function access='private'>
         <function-decl name='max_name_length' mangled-name='_ZN8FuncList15max_name_lengthEv' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-3132' is-artificial='yes'/>
-          <return type-id='type-id-199'/>
+          <return type-id='type-id-194'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -20425,7 +20425,7 @@
         <var-decl name='m_head' type-id='type-id-3133' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='80' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='m_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='remove_table' mangled-name='_ZN9TableListI9FuncTableE12remove_tableEPNS1_4NodeE' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9TableListI9FuncTableE12remove_tableEPNS1_4NodeE'>
@@ -20477,7 +20477,7 @@
         <var-decl name='m_head' type-id='type-id-3098' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='80' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='m_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='remove_table' mangled-name='_ZN9TableListI12MYOFuncTableE12remove_tableEPNS1_4NodeE' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9TableListI12MYOFuncTableE12remove_tableEPNS1_4NodeE'>
@@ -20529,7 +20529,7 @@
         <var-decl name='m_head' type-id='type-id-3096' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='80' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='m_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='remove_table' mangled-name='_ZN9TableListI12MYOInitTableE12remove_tableEPNS1_4NodeE' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9TableListI12MYOInitTableE12remove_tableEPNS1_4NodeE'>
@@ -20581,7 +20581,7 @@
         <var-decl name='m_head' type-id='type-id-3097' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='80' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='m_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='remove_table' mangled-name='_ZN9TableListI11MYOVarTableE12remove_tableEPNS1_4NodeE' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9TableListI11MYOVarTableE12remove_tableEPNS1_4NodeE'>
@@ -20633,7 +20633,7 @@
         <var-decl name='m_head' type-id='type-id-1910' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='80' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='m_lock' type-id='type-id-180' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-175' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='81' column='1'/>
       </data-member>
       <member-function access='private'>
         <function-decl name='remove_table' mangled-name='_ZN9TableListI8VarTableE12remove_tableEPNS1_4NodeE' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9TableListI8VarTableE12remove_tableEPNS1_4NodeE'>
@@ -20679,7 +20679,7 @@
       <member-function access='private' static='yes'>
         <function-decl name='table_patch_names' mangled-name='_ZN7VarList17table_patch_namesEPvl' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-199'/>
+          <parameter type-id='type-id-194'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -20687,7 +20687,7 @@
         <function-decl name='table_copy' mangled-name='_ZN7VarList10table_copyEPvl' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-3166' is-artificial='yes'/>
           <parameter type-id='type-id-150'/>
-          <parameter type-id='type-id-199'/>
+          <parameter type-id='type-id-194'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -20695,7 +20695,7 @@
         <function-decl name='table_size' mangled-name='_ZN7VarList10table_sizeERl' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-3166' is-artificial='yes'/>
           <parameter type-id='type-id-3167'/>
-          <return type-id='type-id-199'/>
+          <return type-id='type-id-194'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
@@ -20752,7 +20752,7 @@
         <var-decl name='entries' type-id='type-id-3171' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='max_name_len' type-id='type-id-199' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='102' column='1'/>
+        <var-decl name='max_name_len' type-id='type-id-194' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='102' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='InitTableEntry' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-2931' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='289' column='1' id='type-id-3172'>
@@ -20818,7 +20818,7 @@
         <var-decl name='__next' type-id='type-id-3184' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='78' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='mutex_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='82' column='1' id='type-id-180'>
+    <class-decl name='mutex_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='82' column='1' id='type-id-175'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='m_lock' type-id='type-id-3185' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='119' column='1'/>
       </data-member>
@@ -20880,7 +20880,7 @@
     <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='__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-170' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-3165'/>
+    <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'/>
     <typedef-decl name='uint64_t' type-id='type-id-40' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-19'/>
     <union-decl name='pthread_mutex_t' size-in-bits='320' naming-typedef-id='type-id-3185' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='91' column='1' id='type-id-3188'>
@@ -20919,7 +20919,7 @@
         <var-decl name='__size' type-id='type-id-3129' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='125' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='__align' type-id='type-id-170' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='126' column='1'/>
+        <var-decl name='__align' type-id='type-id-165' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='126' column='1'/>
       </data-member>
     </union-decl>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-35'/>
@@ -20949,10 +20949,10 @@
     <pointer-type-def type-id='type-id-3193' size-in-bits='64' id='type-id-3179'/>
     <qualified-type-def type-id='type-id-3182' const='yes' id='type-id-3194'/>
     <pointer-type-def type-id='type-id-3194' size-in-bits='64' id='type-id-1911'/>
-    <qualified-type-def type-id='type-id-165' const='yes' id='type-id-3195'/>
+    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-3195'/>
     <pointer-type-def type-id='type-id-3195' size-in-bits='64' id='type-id-152'/>
-    <reference-type-def kind='lvalue' type-id='type-id-199' size-in-bits='64' id='type-id-3167'/>
-    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-3186'/>
+    <reference-type-def kind='lvalue' type-id='type-id-194' size-in-bits='64' id='type-id-3167'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-3186'/>
     <pointer-type-def type-id='type-id-3110' size-in-bits='64' id='type-id-3173'/>
     <function-decl name='__offload_register_tables' mangled-name='__offload_register_tables' filepath='../../../gcc/liboffloadmic/runtime/offload_table.cpp' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__offload_register_tables'>
       <parameter type-id='type-id-3133' name='entry_table' filepath='../../../gcc/liboffloadmic/runtime/offload_table.cpp' line='301' column='1'/>
@@ -20989,8 +20989,8 @@
     <var-decl name='__offload_myo_init_tables' type-id='type-id-3137' mangled-name='__offload_myo_init_tables' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='439' column='1' elf-symbol-id='__offload_myo_init_tables'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_timer_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-    <typedef-decl name='__clock_t' type-id='type-id-170' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-3196'/>
-    <typedef-decl name='__time_t' type-id='type-id-170' filepath='/usr/include/bits/types.h' line='139' column='1' id='type-id-3197'/>
+    <typedef-decl name='__clock_t' type-id='type-id-165' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-3196'/>
+    <typedef-decl name='__time_t' type-id='type-id-165' filepath='/usr/include/bits/types.h' line='139' column='1' id='type-id-3197'/>
     <typedef-decl name='clock_t' type-id='type-id-3196' filepath='/usr/include/time.h' line='59' column='1' id='type-id-3198'/>
     <typedef-decl name='time_t' type-id='type-id-3197' filepath='/usr/include/time.h' line='75' column='1' id='type-id-3199'/>
     <qualified-type-def type-id='type-id-3199' const='yes' id='type-id-3200'/>
@@ -21078,11 +21078,11 @@
       <return type-id='type-id-3199'/>
     </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-233'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-1904'/>
-      <return type-id='type-id-280'/>
+      <return type-id='type-id-278'/>
     </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-3201'/>
@@ -21094,24 +21094,24 @@
     </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-1904'/>
-      <return type-id='type-id-233'/>
+      <return type-id='type-id-228'/>
     </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-3201'/>
-      <return type-id='type-id-233'/>
+      <return type-id='type-id-228'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_trace.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='128' id='type-id-3216'>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='128' id='type-id-3216'>
       <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-38' id='type-id-295'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='8' id='type-id-3217'>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='8' id='type-id-3217'>
       <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-38' id='type-id-157'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='160' id='type-id-3218'>
-      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-38' id='type-id-162'/>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='160' id='type-id-3218'>
+      <subrange length='20' lower-bound='0' upper-bound='19' type-id='type-id-38' id='type-id-279'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-165' size-in-bits='32' id='type-id-3219'>
+    <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='32' id='type-id-3219'>
       <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-38' id='type-id-3122'/>
     </array-type-def>
     <type-decl name='double' size-in-bits='64' id='type-id-1885'/>
@@ -21131,37 +21131,37 @@
         <var-decl name='_flags' type-id='type-id-30' visibility='default' filepath='/usr/include/libio.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='251' column='1'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='251' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='252' column='1'/>
+        <var-decl name='_IO_read_end' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='252' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='253' column='1'/>
+        <var-decl name='_IO_read_base' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='253' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='254' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='254' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='255' column='1'/>
+        <var-decl name='_IO_write_ptr' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='255' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='256' column='1'/>
+        <var-decl name='_IO_write_end' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='256' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='257' column='1'/>
+        <var-decl name='_IO_buf_base' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='257' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='258' column='1'/>
+        <var-decl name='_IO_buf_end' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='258' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='260' column='1'/>
+        <var-decl name='_IO_save_base' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='260' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='261' column='1'/>
+        <var-decl name='_IO_backup_base' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='261' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-233' visibility='default' filepath='/usr/include/libio.h' line='262' column='1'/>
+        <var-decl name='_IO_save_end' type-id='type-id-228' visibility='default' filepath='/usr/include/libio.h' line='262' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='_markers' type-id='type-id-3225' visibility='default' filepath='/usr/include/libio.h' line='264' column='1'/>
@@ -21206,7 +21206,7 @@
         <var-decl name='__pad4' type-id='type-id-150' visibility='default' filepath='/usr/include/libio.h' line='305' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-280' visibility='default' filepath='/usr/include/libio.h' line='306' column='1'/>
+        <var-decl name='__pad5' type-id='type-id-278' visibility='default' filepath='/usr/include/libio.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <var-decl name='_mode' type-id='type-id-30' visibility='default' filepath='/usr/include/libio.h' line='308' column='1'/>
@@ -21254,92 +21254,92 @@
     </class-decl>
     <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/include/locale.h' line='53' column='1' id='type-id-3233'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='decimal_point' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='57' column='1'/>
+        <var-decl name='decimal_point' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='thousands_sep' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
+        <var-decl name='thousands_sep' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='grouping' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='64' column='1'/>
+        <var-decl name='grouping' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='int_curr_symbol' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='70' column='1'/>
+        <var-decl name='int_curr_symbol' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='currency_symbol' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='71' column='1'/>
+        <var-decl name='currency_symbol' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='mon_decimal_point' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='72' column='1'/>
+        <var-decl name='mon_decimal_point' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='mon_thousands_sep' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='73' column='1'/>
+        <var-decl name='mon_thousands_sep' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='mon_grouping' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='74' column='1'/>
+        <var-decl name='mon_grouping' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='positive_sign' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='75' column='1'/>
+        <var-decl name='positive_sign' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='negative_sign' type-id='type-id-233' visibility='default' filepath='/usr/include/locale.h' line='76' column='1'/>
+        <var-decl name='negative_sign' type-id='type-id-228' visibility='default' filepath='/usr/include/locale.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='int_frac_digits' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='77' column='1'/>
+        <var-decl name='int_frac_digits' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='648'>
-        <var-decl name='frac_digits' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='78' column='1'/>
+        <var-decl name='frac_digits' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='656'>
-        <var-decl name='p_cs_precedes' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='80' column='1'/>
+        <var-decl name='p_cs_precedes' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='664'>
-        <var-decl name='p_sep_by_space' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='82' column='1'/>
+        <var-decl name='p_sep_by_space' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='n_cs_precedes' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='84' column='1'/>
+        <var-decl name='n_cs_precedes' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='680'>
-        <var-decl name='n_sep_by_space' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='86' column='1'/>
+        <var-decl name='n_sep_by_space' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='688'>
-        <var-decl name='p_sign_posn' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='93' column='1'/>
+        <var-decl name='p_sign_posn' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='696'>
-        <var-decl name='n_sign_posn' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='94' column='1'/>
+        <var-decl name='n_sign_posn' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='int_p_cs_precedes' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='97' column='1'/>
+        <var-decl name='int_p_cs_precedes' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='712'>
-        <var-decl name='int_p_sep_by_space' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='99' column='1'/>
+        <var-decl name='int_p_sep_by_space' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='720'>
-        <var-decl name='int_n_cs_precedes' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='101' column='1'/>
+        <var-decl name='int_n_cs_precedes' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='728'>
-        <var-decl name='int_n_sep_by_space' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='103' column='1'/>
+        <var-decl name='int_n_sep_by_space' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='int_p_sign_posn' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='110' column='1'/>
+        <var-decl name='int_p_sign_posn' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='744'>
-        <var-decl name='int_n_sign_posn' type-id='type-id-165' visibility='default' filepath='/usr/include/locale.h' line='111' column='1'/>
+        <var-decl name='int_n_sign_posn' type-id='type-id-160' visibility='default' filepath='/usr/include/locale.h' line='111' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-1893' visibility='default' filepath='/usr/include/stdlib.h' line='106' column='1' id='type-id-3234'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-170' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1'/>
+        <var-decl name='quot' type-id='type-id-165' 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-170' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
+        <var-decl name='rem' type-id='type-id-165' 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-1894' visibility='default' filepath='/usr/include/stdlib.h' line='118' column='1' id='type-id-3235'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-229' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1'/>
+        <var-decl name='quot' type-id='type-id-224' 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-229' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
+        <var-decl name='rem' type-id='type-id-224' 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-3203'>
@@ -21371,7 +21371,7 @@
         <var-decl name='tm_isdst' type-id='type-id-30' 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-170' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
+        <var-decl name='tm_gmtoff' type-id='type-id-165' 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-152' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
@@ -21398,8 +21398,8 @@
     <typedef-decl name='__compar_fn_t' type-id='type-id-3240' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-1891'/>
     <typedef-decl name='__int32_t' type-id='type-id-30' filepath='/usr/include/bits/types.h' line='40' column='1' id='type-id-3241'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-3230' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-3223'/>
-    <typedef-decl name='__off64_t' type-id='type-id-170' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-3228'/>
-    <typedef-decl name='__off_t' type-id='type-id-170' filepath='/usr/include/bits/types.h' line='131' column='1' id='type-id-3222'/>
+    <typedef-decl name='__off64_t' type-id='type-id-165' filepath='/usr/include/bits/types.h' line='132' column='1' id='type-id-3228'/>
+    <typedef-decl name='__off_t' type-id='type-id-165' filepath='/usr/include/bits/types.h' line='131' column='1' id='type-id-3222'/>
     <typedef-decl name='div_t' type-id='type-id-3232' filepath='/usr/include/stdlib.h' line='101' column='1' id='type-id-1892'/>
     <typedef-decl name='fpos_t' type-id='type-id-3220' filepath='/usr/include/stdio.h' line='110' column='1' id='type-id-3242'/>
     <typedef-decl name='ldiv_t' type-id='type-id-3234' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-1893'/>
@@ -21422,10 +21422,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-3250' size-in-bits='64' id='type-id-3251'/>
     <pointer-type-def type-id='type-id-3250' size-in-bits='64' id='type-id-3252'/>
     <pointer-type-def type-id='type-id-3253' size-in-bits='64' id='type-id-3254'/>
-    <reference-type-def kind='lvalue' type-id='type-id-165' size-in-bits='64' id='type-id-3255'/>
-    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-2274'/>
+    <reference-type-def kind='lvalue' type-id='type-id-160' size-in-bits='64' id='type-id-3255'/>
+    <qualified-type-def type-id='type-id-228' const='yes' id='type-id-2274'/>
     <reference-type-def kind='lvalue' type-id='type-id-2274' size-in-bits='64' id='type-id-2613'/>
-    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-1886'/>
+    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-1886'/>
     <qualified-type-def type-id='type-id-3245' const='yes' id='type-id-3256'/>
     <reference-type-def kind='lvalue' type-id='type-id-3256' size-in-bits='64' id='type-id-3257'/>
     <qualified-type-def type-id='type-id-3247' const='yes' id='type-id-3258'/>
@@ -21437,15 +21437,15 @@
     <pointer-type-def type-id='type-id-3262' size-in-bits='64' id='type-id-3264'/>
     <qualified-type-def type-id='type-id-3241' const='yes' id='type-id-3265'/>
     <pointer-type-def type-id='type-id-3265' size-in-bits='64' id='type-id-3244'/>
-    <qualified-type-def type-id='type-id-149' const='yes' id='type-id-243'/>
+    <qualified-type-def type-id='type-id-149' const='yes' id='type-id-238'/>
     <reference-type-def kind='lvalue' type-id='type-id-3195' size-in-bits='64' id='type-id-3266'/>
     <qualified-type-def type-id='type-id-152' const='yes' id='type-id-3267'/>
     <reference-type-def kind='lvalue' type-id='type-id-3267' size-in-bits='64' id='type-id-3268'/>
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
     <qualified-type-def type-id='type-id-3242' const='yes' id='type-id-3269'/>
     <pointer-type-def type-id='type-id-3269' size-in-bits='64' id='type-id-1884'/>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-217'/>
-    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-3270'/>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-212'/>
+    <qualified-type-def type-id='type-id-165' const='yes' id='type-id-3270'/>
     <qualified-type-def type-id='type-id-3243' const='yes' id='type-id-3271'/>
     <pointer-type-def type-id='type-id-3271' size-in-bits='64' id='type-id-1899'/>
     <qualified-type-def type-id='type-id-3168' const='yes' id='type-id-3272'/>
@@ -21500,7 +21500,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-165' 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-3310'/>
+          <typedef-decl name='value_type' type-id='type-id-160' 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-3310'/>
         </member-type>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaIcED4Ev' 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'>
@@ -21803,7 +21803,7 @@
       </class-decl>
       <class-decl name='integral_constant&lt;bool, false&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='69' column='1' id='type-id-1588'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-243' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-238' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1590'>
@@ -21811,7 +21811,7 @@
           <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3336'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-243' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-238' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='iterator_traits&lt;char const*&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/stl_iterator_base_types.h' line='189' column='1' id='type-id-3337'>
@@ -21833,7 +21833,7 @@
       <typedef-decl name='__detected_or_t' type-id='type-id-1677' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1678'/>
       <typedef-decl name='__detected_or_t' type-id='type-id-1685' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1686'/>
       <typedef-decl name='__detected_or_t_' type-id='type-id-1686' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2453' column='1' id='type-id-1675'/>
-      <typedef-decl name='ptrdiff_t' type-id='type-id-170' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-1687'/>
+      <typedef-decl name='ptrdiff_t' type-id='type-id-165' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-1687'/>
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-3342'>
         <member-type access='private'>
           <typedef-decl name='fmtflags' type-id='type-id-3211' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='317' column='1' id='type-id-3208'/>
@@ -22070,7 +22070,7 @@
           <typedef-decl name='reference' type-id='type-id-3375' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3374'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-233' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='751' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-228' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='751' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='new_allocator&lt;char&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-3253'>
@@ -22081,13 +22081,13 @@
           <typedef-decl name='const_reference' type-id='type-id-3266' 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-3376'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-233' 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-3316'/>
+          <typedef-decl name='pointer' type-id='type-id-228' 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-3316'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-3255' 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-3375'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-280' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-950'/>
+          <typedef-decl name='size_type' type-id='type-id-278' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-950'/>
         </member-type>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIcED4Ev' 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'>
@@ -22159,44 +22159,44 @@
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;double&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/numeric_traits.h' line='100' column='1' id='type-id-3379'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-217' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-212' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3380'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-217' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-212' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3381'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-217' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-212' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3382'>
@@ -22207,24 +22207,24 @@
           <var-decl name='__max' type-id='type-id-3195' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIcE5__maxE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3383'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-217' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-212' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-217' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__maxE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-212' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__maxE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3384'>
@@ -22235,10 +22235,10 @@
           <var-decl name='__max' type-id='type-id-3270' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__maxE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3385'>
@@ -22249,10 +22249,10 @@
           <var-decl name='__max' type-id='type-id-846' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-217' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-212' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3386'>
@@ -22263,10 +22263,10 @@
           <var-decl name='__max' type-id='type-id-3272' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__maxE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/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-243' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-238' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-212' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
@@ -22311,7 +22311,7 @@
     <typedef-decl name='BusySetType' type-id='type-id-3390' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='49' column='1' id='type-id-3393'/>
     <typedef-decl name='ORSLBusySet' type-id='type-id-3392' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='62' column='1' id='type-id-3396'/>
     <typedef-decl name='ORSLPartialGranularity' type-id='type-id-3391' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='151' column='1' id='type-id-3397'/>
-    <typedef-decl name='ORSLTag' type-id='type-id-233' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='65' column='1' id='type-id-3398'/>
+    <typedef-decl name='ORSLTag' type-id='type-id-228' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='65' column='1' id='type-id-3398'/>
     <typedef-decl name='__cpu_mask' type-id='type-id-40' filepath='/usr/include/bits/sched.h' line='118' column='1' id='type-id-3388'/>
     <typedef-decl name='cpu_set_t' type-id='type-id-3395' filepath='/usr/include/bits/sched.h' line='128' column='1' id='type-id-3394'/>
     <pointer-type-def type-id='type-id-3396' size-in-bits='64' id='type-id-3399'/>
@@ -22320,14 +22320,14 @@
     <qualified-type-def type-id='type-id-3397' const='yes' id='type-id-3402'/>
     <qualified-type-def type-id='type-id-3398' const='yes' id='type-id-3403'/>
     <function-decl name='ORSLReserve' mangled-name='ORSLReserve' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLReserve'>
-      <parameter type-id='type-id-217' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1'/>
+      <parameter type-id='type-id-212' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1'/>
       <parameter type-id='type-id-470' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1'/>
       <parameter type-id='type-id-3401' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='231' column='1'/>
       <parameter type-id='type-id-3403' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='232' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='ORSLTryReserve' mangled-name='ORSLTryReserve' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLTryReserve'>
-      <parameter type-id='type-id-217' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1'/>
+      <parameter type-id='type-id-212' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1'/>
       <parameter type-id='type-id-470' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1'/>
       <parameter type-id='type-id-3401' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='263' column='1'/>
       <parameter type-id='type-id-3403' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='264' column='1'/>
@@ -22335,14 +22335,14 @@
     </function-decl>
     <function-decl name='ORSLReservePartial' mangled-name='ORSLReservePartial' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLReservePartial'>
       <parameter type-id='type-id-3402' name='gran' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1'/>
-      <parameter type-id='type-id-217' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1'/>
+      <parameter type-id='type-id-212' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1'/>
       <parameter type-id='type-id-470' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='291' column='1'/>
       <parameter type-id='type-id-3399' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='291' column='1'/>
       <parameter type-id='type-id-3403' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='292' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='ORSLRelease' mangled-name='ORSLRelease' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLRelease'>
-      <parameter type-id='type-id-217' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1'/>
+      <parameter type-id='type-id-212' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1'/>
       <parameter type-id='type-id-470' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1'/>
       <parameter type-id='type-id-3401' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='328' column='1'/>
       <parameter type-id='type-id-3403' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='329' column='1'/>
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 4b385657..698dcce2 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
@@ -12933,16 +12933,7 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-686'>
-          <underlying-type type-id='type-id-127'/>
-          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
-          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
-          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
-          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-687'>
+        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-686'>
           <underlying-type type-id='type-id-127'/>
           <enumerator name='COMPOSITE_INPLACE' value='0'/>
           <enumerator name='COMPOSITE_INPLACE_DISJOINT' value='1'/>
@@ -12950,6 +12941,15 @@
           <enumerator name='COMPOSITE_AUTO' value='3'/>
         </enum-decl>
       </member-type>
+      <member-type access='private'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-687'>
+          <underlying-type type-id='type-id-127'/>
+          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
+          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
+          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
+          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
+        </enum-decl>
+      </member-type>
       <data-member access='protected' layout-offset-in-bits='1088'>
         <var-decl name='NumberOfSteps' type-id='type-id-13' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='487' column='1'/>
       </data-member>
@@ -14796,16 +14796,7 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-686'>
-          <underlying-type type-id='type-id-127'/>
-          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
-          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
-          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
-          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
-        </enum-decl>
-      </member-type>
-      <member-type access='private'>
-        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-687'>
+        <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-686'>
           <underlying-type type-id='type-id-127'/>
           <enumerator name='COMPOSITE_INPLACE' value='0'/>
           <enumerator name='COMPOSITE_INPLACE_DISJOINT' value='1'/>
@@ -14813,6 +14804,15 @@
           <enumerator name='COMPOSITE_AUTO' value='3'/>
         </enum-decl>
       </member-type>
+      <member-type access='private'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-687'>
+          <underlying-type type-id='type-id-127'/>
+          <enumerator name='ENHANCE_CONTRAST_OFF' value='0'/>
+          <enumerator name='ENHANCE_CONTRAST_LIC' value='1'/>
+          <enumerator name='ENHANCE_CONTRAST_COLOR' value='3'/>
+          <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
+        </enum-decl>
+      </member-type>
       <data-member access='protected' layout-offset-in-bits='1088'>
         <var-decl name='NumberOfSteps' type-id='type-id-13' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='487' column='1'/>
       </data-member>
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 e46bbec1..2ade2cff 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
@@ -22274,20 +22274,20 @@
             </member-function>
           </class-decl>
         </member-type>
-        <member-type access='protected'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='513' column='1' id='type-id-1006'>
-            <underlying-type type-id='type-id-35'/>
-            <enumerator name='_S_local_word_size' value='8'/>
-          </enum-decl>
-        </member-type>
         <member-type access='private'>
-          <enum-decl name='event' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='421' column='1' id='type-id-1007'>
+          <enum-decl name='event' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='421' column='1' id='type-id-1006'>
             <underlying-type type-id='type-id-35'/>
             <enumerator name='erase_event' value='0'/>
             <enumerator name='imbue_event' value='1'/>
             <enumerator name='copyfmt_event' value='2'/>
           </enum-decl>
         </member-type>
+        <member-type access='protected'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='513' column='1' id='type-id-1007'>
+            <underlying-type type-id='type-id-35'/>
+            <enumerator name='_S_local_word_size' value='8'/>
+          </enum-decl>
+        </member-type>
         <member-type access='protected'>
           <class-decl name='_Callback_list' size-in-bits='192' 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/bits/ios_base.h' line='462' column='1' id='type-id-1008'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -22540,7 +22540,7 @@
         <member-function access='protected'>
           <function-decl name='_M_call_callbacks' mangled-name='_ZNSt8ios_base17_M_call_callbacksENS_5eventE' filepath='../../../.././libstdc++-v3/src/c++98/ios.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8ios_base17_M_call_callbacksENS_5eventE@@GLIBCXX_3.4.6'>
             <parameter type-id='type-id-1023' is-artificial='yes'/>
-            <parameter type-id='type-id-1007'/>
+            <parameter type-id='type-id-1006'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -41532,7 +41532,7 @@
       </function-decl>
     </namespace-decl>
     <function-type size-in-bits='64' id='type-id-2269'>
-      <parameter type-id='type-id-1007'/>
+      <parameter type-id='type-id-1006'/>
       <parameter type-id='type-id-2258'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
@@ -41641,20 +41641,20 @@
             </member-function>
           </class-decl>
         </member-type>
-        <member-type access='protected'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='513' column='1' id='type-id-1006'>
-            <underlying-type type-id='type-id-35'/>
-            <enumerator name='_S_local_word_size' value='8'/>
-          </enum-decl>
-        </member-type>
         <member-type access='private'>
-          <enum-decl name='event' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='421' column='1' id='type-id-1007'>
+          <enum-decl name='event' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='421' column='1' id='type-id-1006'>
             <underlying-type type-id='type-id-35'/>
             <enumerator name='erase_event' value='0'/>
             <enumerator name='imbue_event' value='1'/>
             <enumerator name='copyfmt_event' value='2'/>
           </enum-decl>
         </member-type>
+        <member-type access='protected'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='513' column='1' id='type-id-1007'>
+            <underlying-type type-id='type-id-35'/>
+            <enumerator name='_S_local_word_size' value='8'/>
+          </enum-decl>
+        </member-type>
         <member-type access='protected'>
           <class-decl name='_Callback_list' size-in-bits='192' 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/bits/ios_base.h' line='462' column='1' id='type-id-1008'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -41907,7 +41907,7 @@
         <member-function access='protected'>
           <function-decl name='_M_call_callbacks' mangled-name='_ZNSt8ios_base17_M_call_callbacksENS_5eventE' filepath='../../../.././libstdc++-v3/src/c++98/ios.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8ios_base17_M_call_callbacksENS_5eventE@@GLIBCXX_3.4.6'>
             <parameter type-id='type-id-1023' is-artificial='yes'/>
-            <parameter type-id='type-id-1007'/>
+            <parameter type-id='type-id-1006'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -48396,15 +48396,7 @@
     <namespace-decl name='std'>
       <class-decl name='money_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='840' column='1' id='type-id-2453'>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-2502'>
-            <underlying-type type-id='type-id-35'/>
-            <enumerator name='_S_minus' value='0'/>
-            <enumerator name='_S_zero' value='1'/>
-            <enumerator name='_S_end' value='11'/>
-          </enum-decl>
-        </member-type>
-        <member-type access='private'>
-          <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-2503'>
+          <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-2502'>
             <underlying-type type-id='type-id-35'/>
             <enumerator name='none' value='0'/>
             <enumerator name='space' value='1'/>
@@ -48413,6 +48405,14 @@
             <enumerator name='value' value='4'/>
           </enum-decl>
         </member-type>
+        <member-type access='private'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-2503'>
+            <underlying-type type-id='type-id-35'/>
+            <enumerator name='_S_minus' value='0'/>
+            <enumerator name='_S_zero' value='1'/>
+            <enumerator name='_S_end' value='11'/>
+          </enum-decl>
+        </member-type>
         <member-type access='private'>
           <class-decl name='pattern' size-in-bits='32' 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/bits/locale_facets_nonio.h' line='844' column='1' id='type-id-2456'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -52359,15 +52359,15 @@
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-          <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='82' column='1' id='type-id-2613'>
+          <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='83' column='1' id='type-id-2613'>
             <underlying-type type-id='type-id-35'/>
-            <enumerator name='_S_max_bytes' value='128'/>
+            <enumerator name='_S_free_list_size' value='16'/>
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-          <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='83' column='1' id='type-id-2614'>
+          <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='82' column='1' id='type-id-2614'>
             <underlying-type type-id='type-id-35'/>
-            <enumerator name='_S_free_list_size' value='16'/>
+            <enumerator name='_S_max_bytes' value='128'/>
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-- 
2.39.3



-- 
		Dodji


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

* [PATCH 4/7, applied] ir,comparison: Represent changed anonymous enums
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
                   ` (2 preceding siblings ...)
  2023-10-20  9:59 ` [PATCH 3/7, applied] ir,comparison,corpus: Better support anonymous enums comparison Dodji Seketeli
@ 2023-10-20 10:00 ` Dodji Seketeli
  2023-10-20 10:01 ` [PATCH 5/7, applied] comparison: Represent changed unreachable anonymous unions, structs & enums Dodji Seketeli
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20 10:00 UTC (permalink / raw)
  To: Dodji Seketeli
  Cc: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail

Hello,

Now that added/removed non-reachable anonymous enums is supported, we
want to represent changing an anonymous enum.

Strictly speaking, adding or removing an enumerator from an anonymous
enum is represented as deleting of the anonymous enum in the old
state and the addition of an anonymous enum in the new state.

This patch analyses the added/removed anonymous enums and if the old
enum has enumerators contained in the new one, then it assumes we are
looking at anonymous enum change.

	* include/abg-ir.h (is_enumerator_present_in_enum): Declare new
	public function.
	* src/abg-ir.cc (is_enumerator_present_in_enum): Turn this
	static function into a public one.
	* src/abg-comparison.cc
	(corpus_diff::priv::ensure_lookup_tables_populated): Detect that
	an removed/added anonymous enum is actually a changed anonymous
	enum and represent it as such.
	* tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v{0,1}.txt:
	New reference test output files.
	* tests/data/test-abidiff-exit/test-anonymous-enums-change-v{0,1}.c:
	Source code for the some input test binary.
	* tests/data/test-abidiff-exit/test-anonymous-enums-change-v{0,1}.o:
	New test input binaries.
	* tests/data/Makefile.am: Add the new test materials above to
	source distribution.
	* tests/test-abidiff-exit.cc (in_out_specs): Add the new test
	input to the harness.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 include/abg-ir.h                              |   4 +
 src/abg-comparison.cc                         |  76 ++++++++++++++++++
 src/abg-ir.cc                                 |   2 +-
 tests/data/Makefile.am                        |   6 ++
 .../test-anonymous-enums-change-report-v0.txt |  16 ++++
 .../test-anonymous-enums-change-report-v1.txt |  21 +++++
 .../test-anonymous-enums-change-v0.c          |  36 +++++++++
 .../test-anonymous-enums-change-v0.o          | Bin 0 -> 3296 bytes
 .../test-anonymous-enums-change-v1.c          |  41 ++++++++++
 .../test-anonymous-enums-change-v1.o          | Bin 0 -> 3336 bytes
 tests/test-abidiff-exit.cc                    |  32 ++++++++
 11 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.o

diff --git a/include/abg-ir.h b/include/abg-ir.h
index 3729e84a..b599ef3e 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -2813,6 +2813,10 @@ public:
   set_enum_type(enum_type_decl*);
 }; // end class enum_type_def::enumerator
 
+bool
+is_enumerator_present_in_enum(const enum_type_decl::enumerator &enr,
+			      const enum_type_decl &enom);
+
 bool
 equals(const typedef_decl&, const typedef_decl&, change_kind*);
 
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index 61fe89e0..1126ed58 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -14,6 +14,7 @@
 #include <libgen.h>
 #include <algorithm>
 #include <sstream>
+#include <set>
 
 #include "abg-comparison-priv.h"
 #include "abg-reporter-priv.h"
@@ -9619,6 +9620,81 @@ corpus_diff::priv::ensure_lookup_tables_populated()
 	      added_unreachable_types_[repr] = t;
 	  }
       }
+
+    // Handle anonymous enums that got changed.  An anonymous enum is
+    // designated by its flat textual representation. So a change to
+    // any of its enumerators results in a different enum.  That is
+    // represented by a deletion of the previous anonymous enum, and
+    // the addition of a new one.  For the user however, it's the same
+    // enum that changed.  Let's massage this "added/removed" pattern
+    // to show what the user expects, namely, a changed anonymous
+    // enum.
+    {
+      std::set<enum_type_decl_sptr> deleted_anon_enums;
+      std::set<enum_type_decl_sptr> added_anon_enums;
+
+      for (auto entry : deleted_unreachable_types_)
+	if (is_enum_type(entry.second)
+	    && is_enum_type(entry.second)->get_is_anonymous())
+	  deleted_anon_enums.insert(is_enum_type(entry.second));
+
+      for (auto entry : added_unreachable_types_)
+	if (is_enum_type(entry.second)
+	    && is_enum_type(entry.second)->get_is_anonymous())
+	  added_anon_enums.insert(is_enum_type(entry.second));
+
+      string_type_base_sptr_map added_anon_enum_to_erase;
+      string_type_base_sptr_map removed_anon_enum_to_erase;
+
+      // Look for deleted anonymous enums which have enumerators
+      // present in an added anonymous enums ...
+      for (auto deleted_enum : deleted_anon_enums)
+	{
+	  // Look for any enumerator of 'deleted_enum' that is also
+	  // present in an added anonymous enum.
+	  for (auto enr : deleted_enum->get_enumerators())
+	    {
+	      bool this_enum_got_changed = false;
+	      for (auto added_enum : added_anon_enums)
+		{
+		  if (is_enumerator_present_in_enum(enr, *added_enum))
+		    {
+		      // So the enumerator 'enr' from the
+		      // 'deleted_enum' enum is also present in the
+		      // 'added_enum' enum so we assume that
+		      // 'deleted_enum' and 'added_enum' are the same
+		      // enum that got changed.  Let's represent it
+		      // using a diff node.
+		      diff_sptr d = compute_diff(deleted_enum,
+						 added_enum, ctxt);
+		      ABG_ASSERT(d->has_changes());
+		      string repr =
+			abigail::ir::get_pretty_representation(is_type(deleted_enum),
+							       /*internal=*/false);
+		      changed_unreachable_types_[repr]= d;
+		      this_enum_got_changed = true;
+		      string r1 = abigail::ir::get_pretty_representation(is_type(deleted_enum));
+		      string r2 = abigail::ir::get_pretty_representation(is_type(added_enum));
+		      removed_anon_enum_to_erase[r1] = deleted_enum;
+		      added_anon_enum_to_erase[r2] = added_enum;
+		      break;
+		    }
+		}
+	      if (this_enum_got_changed)
+		break;
+	    }
+	}
+
+      // Now remove the added/removed anonymous enums from their maps,
+      // as they are now represented as a changed enum, not an added
+      // and removed enum.
+
+      for (auto entry : added_anon_enum_to_erase)
+	added_unreachable_types_.erase(entry.first);
+
+      for (auto entry : removed_anon_enum_to_erase)
+	deleted_unreachable_types_.erase(entry.first);
+    }
   }
 }
 
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 06dfbe20..171267f8 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -18997,7 +18997,7 @@ enum_has_non_name_change(const enum_type_decl& l,
 ///
 /// @return true iff the enumerator @p enr is present in the enum @p
 /// enom.
-static bool
+bool
 is_enumerator_present_in_enum(const enum_type_decl::enumerator &enr,
 			      const enum_type_decl &enom)
 {
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 1aa37b16..adb6d8bd 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -356,6 +356,12 @@ test-abidiff-exit/test-enumerator-changes1-v0.c \
 test-abidiff-exit/test-enumerator-changes1-v0.o \
 test-abidiff-exit/test-enumerator-changes1-v1.c \
 test-abidiff-exit/test-enumerator-changes1-v1.o \
+test-abidiff-exit/test-anonymous-enums-change-report-v0.txt \
+test-abidiff-exit/test-anonymous-enums-change-report-v1.txt \
+test-abidiff-exit/test-anonymous-enums-change-v0.c \
+test-abidiff-exit/test-anonymous-enums-change-v0.o \
+test-abidiff-exit/test-anonymous-enums-change-v1.c \
+test-abidiff-exit/test-anonymous-enums-change-v1.o \
 \
 test-diff-dwarf/test0-v0.cc		\
 test-diff-dwarf/test0-v0.o			\
diff --git a/tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt b/tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt
new file mode 100644
index 00000000..2a408ea0
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt
@@ -0,0 +1,16 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+Unreachable types summary: 0 removed, 1 changed (1 filtered out), 1 added types
+
+1 changed type unreachable from any public interface:
+
+  [C] 'enum {E4_0=0, E4_1=1, E4_2=2, E4_LAST_ELEMENT=3, }' changed:
+    type size hasn't changed
+    2 enumerator deletions:
+      'E4_2' value '2'
+      'E4_LAST_ELEMENT' value '3'
+
+1 added type unreachable from any public interface:
+
+  [A] 'enum {E5_0=0, E5_1=1, }' at test-anonymous-enums-change-v1.c:26:1
+
diff --git a/tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt b/tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt
new file mode 100644
index 00000000..8639fa44
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt
@@ -0,0 +1,21 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+Unreachable types summary: 0 removed, 2 changed, 1 added types
+
+2 changed types unreachable from any public interface:
+
+  [C] 'enum {E4_0=0, E4_1=1, E4_2=2, E4_LAST_ELEMENT=3, }' changed:
+    type size hasn't changed
+    2 enumerator deletions:
+      'E4_2' value '2'
+      'E4_LAST_ELEMENT' value '3'
+
+  [C] 'enum {E3_0=0, E3_1=1, }' changed:
+    type size hasn't changed
+    1 enumerator insertion:
+      'E3_2' value '2'
+
+1 added type unreachable from any public interface:
+
+  [A] 'enum {E5_0=0, E5_1=1, }' at test-anonymous-enums-change-v1.c:26:1
+
diff --git a/tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.c b/tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.c
new file mode 100644
index 00000000..443eb971
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.c
@@ -0,0 +1,36 @@
+/*
+ *  Compile this with:
+ *    gcc -c -g -fno-eliminate-unused-debug-types test-anonymous-enums-change-v0.c 
+ */
+
+enum
+  {
+    E1_0,
+    E1_1,
+  } v1;
+
+enum
+  {
+    E3_0,
+    E3_1,
+  };
+
+enum
+  {
+    E4_0,
+    E4_1,
+    E4_2,
+    E4_LAST_ELEMENT
+  };
+
+enum
+  {
+    E0_0,
+    E0_1,
+  } v0;
+
+enum
+  {
+    E2_0,
+    E2_1,
+  } v2;
diff --git a/tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.o b/tests/data/test-abidiff-exit/test-anonymous-enums-change-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..26c6df80f0d5203c520890f433cd5bba20b0bc4f
GIT binary patch
literal 3296
zcmb_e&2Jl35P$2nNn4Y&sU^Nrl6BRJ1laZ3aYJd9U=*3O5Gn*kLR_4+{p>8*>)>6R
zL<kj$3kZo5Cr%u=At5A$ggC$@C+=|I!2i$_NE~41?ToW|-Y5t$(!QDb&DYzv^Txhc
z-+m!u7=p<V8{$Y~REV83M{-SxHE~hQi{C)b2}4=4h(E53v}CS<FoR2+Q>})`WoOXA
z9GAtpMG(%Ks3NI=*$zm@0u)^MSc8>IMy+NXx$uSN0ySK*h=E#-;?L8b6>;U;W1hlT
z7UtZgJnSoLY!qkm#q90EjiPZg|7_7T3h)M1VV)r%cf0W1qnSs9$j%#A=L&gqX<_NY
z!*DuRL_WWfH|HSrC3rIM2$48WrN>JJSPpDY0yhlfuen)d_=fO+utcxClsO-#QDLJX
z^t*v<TYeCUdb#1^QWkX=B^RY?WBd8n?l$V%^_S~+?xGHsYHX>9`YNicpl;oH-P$Za
zW0lKJ)hSyQx3cQ4x!0`aS0Vc?FCv3oS+VSXGz#Q;R|azEw?OrVt=;wg>udH})gD(Y
zyKC8<U|`Fh-}eJAlJ+PVg|cn8WpmWEqk}yeih2brSD<nv!^rl6L2%F?j6z!mqkd?&
zcD<l0?Xl~$L}_=>m!<Zg{gz+q`cbLpH@&9c_55C`DWgaZRdgI!!fauw?M0pvZSZXS
zosKQ{{pf$pbn2#0br4&dn>VawIQNx*ap>x6r!UwTS#kgGG^?3<qoI4L7xfquENNsy
zg)}n718Fd1QP+IRW{R^@7y_n%o0dYRcrXP;f4o!EWQy4-@G>CtiTC0+xk@<e%$Eu0
zd&>CfjS52zX3iL|G7!g~137t0yhFtCG+u-U>0-<T;`lH<L;~YQ(jQCUTnnL<1djQ+
zUP;5b-gONpRcw)f{lz&DdXsS659Y6tzC)bxI_d9dc$xHfHGGZq_ci<`=^tu1pTlPw
z4ue<G=NgU^80o8+shg4Pq8|z8{r^Dvp@#oN`Y*)se9n`MjK4MJ$t7^?LnOrUc^eg=
zr(-t3zayQ`iT!^iTsYxDKk}NuqhZW<S&HO-BpjT6!fA$~aE7wyIcn}U{Gc-c8_wW{
z*K7{u_?X!n;>0~3((?n!Ay9%vgd0k44f=fvKRr$`h@=Cv%nl>3#c#$N{%?E%!tiYQ
zJUL5^1&yO`lCVDz(<fRj>6DQ5_$R=I_v)m0eKJkv1m(o<r{_dd4Hux_V>VfJU+fFa
zS(|vo!VWdnpA>+-hkiT*;D3msby)SBXjmlh73Fob=)P#zG4u`yv`|Tq?)wth()Rxb
z{WS1CasLSE`)>oL=LAT6N+8b*#E^8~24HFR_o)6Y6&2rIoMU?ZJ<92lAG1R$bjSd4
zuFw2Ez){xYKgz@be^4AVj${4_7}DbJQA6@PKPevPBIjZs<X`IzO-9`pb=oR<#Oxc2
p|9}E60F1v6`uX9Rrj>H3f1ireO;)}B{0Z^j)A##w5*Z76{6Aj89Torp

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.c b/tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.c
new file mode 100644
index 00000000..886dbd2b
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.c
@@ -0,0 +1,41 @@
+/* 
+ * Compile this with:
+ *    gcc -c -g -fno-eliminate-unused-debug-types test-anonymous-enums-change-v1.c 
+ */
+
+enum
+  {
+    E1_0,
+    E1_1,
+  } v1;
+
+enum
+  {
+    E3_0,
+    E3_1,
+    E3_2
+  };
+
+enum
+  {
+    E4_0,
+    E4_1,
+  };
+
+enum
+  {
+    E5_0,
+    E5_1,
+  };
+
+enum
+  {
+    E0_0,
+    E0_1,
+  } v0;
+
+enum
+  {
+    E2_0,
+    E2_1,
+  } v2;
diff --git a/tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.o b/tests/data/test-abidiff-exit/test-anonymous-enums-change-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..7d0f71b47a47d0a7eb893ddd41c4515cfb4b28fa
GIT binary patch
literal 3336
zcmb_eO>7%g5T5ngq^(JsG>D(JkTtX=q3o``aY6}7YAFqA1*#Ad7cORPKRXNdI`Xbf
zB7|Cr3j&D?91s^SaN>jnhe`->=$%u!aOsH)2gHd32bg&~FWEeAFhY#9Z)U#vdprBy
z*tfP`elcelpvZs?IMfsh@cxNIxhBOLoPjy`73BgL(wZmyacSfww}QeHElEzf8c@hj
zk%Kv^z^NxtIBAkfBm<_qD5V3WoJ))ky{8!y`0Qtyu=TYLo1-#3Mb28$OFxf$da!i&
zh$k3}V9uN`;zskvMro>8%HNn@D;X~opD&rlJibyD%o7Y0Zp>eOEcYlte$Kc!GhZ|p
z&MnM7g6+Bh#o|WMoWa!R@yX!>km|40lf^?;K-)9O4a4|zW||oF10NI?lGYdtxzkA+
z88!@~pc9Ig6@)QtRqAD0DzH^1X(d^tic6K$Dp{9FT23Snwr{>>ZC0MMDix>dR4lLT
zEtglzE7szxnD@FLv%&V3EV~yEL$Tfwp%?^BRQ*A7XMOL=s=ZpZN1kPOEV~`{ZP5*S
zLFmWA9)`n6wCt8>3_Etbzbhix@~FIr<zo@WwjcJx{a$|<*&-bFBD=ZchaF*$DozvJ
zoqkWat$ypx!0iOF+YK6iBk1@+*KLS676Tcb1iF+ha$A1vOVLKpR?u$SVlRmQ$4nD9
zJ<$QSH#gU;MeO_1zi7Jr&i}B`xyZxse`UFtnKv8{FCRrc#zadNnOGr<On4v*#w_yM
zkJ(H(IffBn0$#KXGU34tl>F&Rjgtw}W8jmB%%$E-y~#z!m9F?A<La6!eDZ0<A%`Pp
zL^l~p#h*es-6gd{!l@hA@F6;rFd&>BMGv!}@Dl51Q@E-{&{7Jg{HmU-;i}#h4QCa$
zS)lW!auD=7<7)pj^NHS&YqEE$yT*E3!>_XbwuWD3{ap<&v;L8W(?BKqBw?~=R9E%q
zOAW_)Ea@u^zr^}?%;|m8r|U<}{~OltY4{!1e_>8}PP0r*odN1wA%)ZVBvRk^twe=q
znJfHT)+-wR6YJna`@Pt2Add$L-%(O5_F`~oG=kHJB5($x>pOBN*MqR#M;i_3y5DFF
z#OR3GAJ8~H8qy6yp+c~P5(%zLz1i>e1pXp9VLuiQ4mvxE{ib>|wc-E9&tVw#R`pY5
zsVPC@<eR1vDun5iu9kL6$$I?LXrudfT)aN94(12vr0=KaBvXwRq~8*Du<E{aE+}X1
zz#|cM`B2T~5}nQ-`Kj4}e@`T><ErN*gUjG6((7>1eaWt4<b8`li<A`UzAvFIYyY?T
zCqwO%_D_(${}y6;PK4ld23JW*k?vbZTUPx~x&C#IrTR2a^!mGqQBF0NP?U6!3w^Hu
z=BmEp?;xHP|1p2JKPJR~cuf2Ud?4Kk@iZ^hUed02^aIUC-IsLUYC0T#;P~4dFpF0D
f-O&3-J<Tdr<MVs@NY?Sa&K(nfpTFN16XO2{KK~tO

literal 0
HcmV?d00001

diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index fb3d6fff..4c1eaea5 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1032,6 +1032,38 @@ InOutSpec in_out_specs[] =
     "data/test-abidiff-exit/test-enumerator-changes1-report-1.txt",
     "output/test-abidiff-exit/test-enumerator-changes1-report-1.txt"
   },
+  {
+    "data/test-abidiff-exit/test-anonymous-enums-change-v0.o",
+    "data/test-abidiff-exit/test-anonymous-enums-change-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression --non-reachable-types",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE
+    | abigail::tools_utils::ABIDIFF_ABI_INCOMPATIBLE_CHANGE,
+    "data/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt",
+    "output/test-abidiff-exit/test-anonymous-enums-change-report-v0.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-anonymous-enums-change-v0.o",
+    "data/test-abidiff-exit/test-anonymous-enums-change-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression --harmless --non-reachable-types",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE
+    | abigail::tools_utils::ABIDIFF_ABI_INCOMPATIBLE_CHANGE,
+    "data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt",
+    "output/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt"
+  },
 #ifdef WITH_BTF
   {
     "data/test-abidiff-exit/btf/test0-v0.o",
-- 
2.39.3



-- 
		Dodji


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

* [PATCH 5/7, applied] comparison: Represent changed unreachable anonymous unions, structs & enums
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
                   ` (3 preceding siblings ...)
  2023-10-20 10:00 ` [PATCH 4/7, applied] ir,comparison: Represent changed anonymous enums Dodji Seketeli
@ 2023-10-20 10:01 ` Dodji Seketeli
  2023-10-20 10:03 ` [PATCH 6/7, applied] Support suppressing data member insertion before a flexible array member Dodji Seketeli
  2023-10-20 10:04 ` [PATCH 7/7, applied] suppression: Make the "end" data member offset selector be named boundary Dodji Seketeli
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20 10:01 UTC (permalink / raw)
  To: Dodji Seketeli
  Cc: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail

Hello,

Following the changes to represent changed anonymous unreachable enums,
this patch does the same for anonymous unreachable unions, classes and
structs.

Basically, without this patch, this change:

    union
    {
      int a;
      int b;
    };

    ------

    union
    {
      int a;
      int b;
      int c;
    };

yields:

    1 removed type unreachable from any public interface:

      [D] 'union {int a; int b;}' at test_1.c:1:1

    1 added type unreachable from any public interface:

      [A] 'union {int a; int b; int c;}' at test_2.c:1:1

But with the patch, it does yield:

    1 changed type unreachable from any public interface:

      [C] 'union {int a; int b;}' changed:
	type size hasn't changed
	1 data member insertion:
	  'int c' at test-anon-union-v1.c:5:1
	type changed from:
	  union {int a; int b;}
	to:
	  union {int a; int b; int c;}

	* include/abg-fwd.h (class_or_union_types_of_same_kind)
	(is_data_member_of_anonymous_class_or_union): Declare new
	functions.
	* include/abg-ir.h (lookup_data_member): Likewise, declare a new overload.
	* src/abg-ir.cc (class_or_union_types_of_same_kind)
	(lookup_data_member, is_data_member_of_anonymous_class_or_union):
	Define news functions & overloads.
	* src/abg-reporter-priv.cc (represent): When representing a change
	in the name of a data member, if the context is an anonymous type,
	use the non-qualified name of the data member, not its qualified
	name.
	* src/abg-comparison.cc
	(corpus_diff::priv::ensure_lookup_tables_populated): Handle
	deleted/added anonymous enums, unions, classes and structs
	similarly.  That is, if an anonymous type was removed and another
	one got added, if they both have data members (or enumerators) in
	common, then we are probably looking at an anonymous type that was
	changed.  This is because these anonymous types are named using
	their flat representation.
	* tests/data/test-abidiff-exit/test-anon-types-report-1.txt: New
	reference test comparison output.
	* tests/data/test-abidiff-exit/test-anon-types-v{0,1}.o: New
	binary tests input files.
	* tests/data/test-abidiff-exit/test-anon-types-v{0,1}.c: Source
	code of new binary test input.
	* tests/data/Makefile.am: Add the new test material above to
	source distribution.
	* tests/test-abidiff-exit.cc (in_out_specs): Add the test inputs
	above to this test harness.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 include/abg-fwd.h                             |  17 ++
 include/abg-ir.h                              |   4 +
 src/abg-comparison.cc                         | 162 ++++++++++++------
 src/abg-ir.cc                                 |  92 ++++++++++
 src/abg-reporter-priv.cc                      |   8 +-
 tests/data/Makefile.am                        |   5 +
 .../test-anon-types-report-1.txt              |  31 ++++
 .../test-abidiff-exit/test-anon-types-v0.c    |  42 +++++
 .../test-abidiff-exit/test-anon-types-v0.o    | Bin 0 -> 3240 bytes
 .../test-abidiff-exit/test-anon-types-v1.c    |  33 ++++
 .../test-abidiff-exit/test-anon-types-v1.o    | Bin 0 -> 3168 bytes
 tests/test-abidiff-exit.cc                    |  16 ++
 12 files changed, 360 insertions(+), 50 deletions(-)
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-report-1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-anon-types-v1.o

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index e494de07..0edc9927 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -495,6 +495,14 @@ is_class_or_union_type(const type_or_decl_base*);
 class_or_union_sptr
 is_class_or_union_type(const type_or_decl_base_sptr&);
 
+bool
+class_or_union_types_of_same_kind(const class_or_union *,
+				  const class_or_union*);
+
+bool
+class_or_union_types_of_same_kind(const class_or_union_sptr&,
+				  const class_or_union_sptr&);
+
 bool
 is_union_type(const type_or_decl_base&);
 
@@ -731,6 +739,15 @@ is_anonymous_data_member(const var_decl*);
 bool
 is_anonymous_data_member(const var_decl&);
 
+bool
+is_data_member_of_anonymous_class_or_union(const var_decl&);
+
+bool
+is_data_member_of_anonymous_class_or_union(const var_decl*);
+
+bool
+is_data_member_of_anonymous_class_or_union(const var_decl_sptr&);
+
 const var_decl_sptr
 get_first_non_anonymous_data_member(const var_decl_sptr);
 
diff --git a/include/abg-ir.h b/include/abg-ir.h
index b599ef3e..0cb378ad 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -4626,6 +4626,10 @@ const var_decl*
 lookup_data_member(const type_base* type,
 		   const char* dm_name);
 
+const var_decl_sptr
+lookup_data_member(const type_base_sptr& type,
+		   const var_decl_sptr&  dm);
+
 const function_decl::parameter*
 get_function_parameter(const decl_base* fun,
 		       unsigned parm_num);
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index 1126ed58..8a705c54 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -9630,69 +9630,135 @@ corpus_diff::priv::ensure_lookup_tables_populated()
     // to show what the user expects, namely, a changed anonymous
     // enum.
     {
-      std::set<enum_type_decl_sptr> deleted_anon_enums;
-      std::set<enum_type_decl_sptr> added_anon_enums;
+      std::set<type_base_sptr> deleted_anon_types;
+      std::set<type_base_sptr> added_anon_types;
 
       for (auto entry : deleted_unreachable_types_)
-	if (is_enum_type(entry.second)
-	    && is_enum_type(entry.second)->get_is_anonymous())
-	  deleted_anon_enums.insert(is_enum_type(entry.second));
-
-      for (auto entry : added_unreachable_types_)
-	if (is_enum_type(entry.second)
-	    && is_enum_type(entry.second)->get_is_anonymous())
-	  added_anon_enums.insert(is_enum_type(entry.second));
+	{
+	  if ((is_enum_type(entry.second)
+	       && is_enum_type(entry.second)->get_is_anonymous())
+	      || (is_class_or_union_type(entry.second)
+		  && is_class_or_union_type(entry.second)->get_is_anonymous()))
+	  deleted_anon_types.insert(entry.second);
+	}
 
-      string_type_base_sptr_map added_anon_enum_to_erase;
-      string_type_base_sptr_map removed_anon_enum_to_erase;
 
-      // Look for deleted anonymous enums which have enumerators
-      // present in an added anonymous enums ...
-      for (auto deleted_enum : deleted_anon_enums)
+      for (auto entry : added_unreachable_types_)
+	if ((is_enum_type(entry.second)
+	     && is_enum_type(entry.second)->get_is_anonymous())
+	    || (is_class_or_union_type(entry.second)
+		&& is_class_or_union_type(entry.second)->get_is_anonymous()))
+	  added_anon_types.insert(entry.second);
+
+      string_type_base_sptr_map added_anon_types_to_erase;
+      string_type_base_sptr_map removed_anon_types_to_erase;
+      enum_type_decl_sptr deleted_enum;
+      class_or_union_sptr deleted_class;
+
+      // Look for deleted anonymous types (enums, unions, structs &
+      // classes) which have enumerators or data members present in an
+      // added anonymous type ...
+      for (auto deleted: deleted_anon_types)
 	{
-	  // Look for any enumerator of 'deleted_enum' that is also
-	  // present in an added anonymous enum.
-	  for (auto enr : deleted_enum->get_enumerators())
+	  deleted_enum = is_enum_type(deleted);
+	  deleted_class = is_class_or_union_type(deleted);
+
+	  // For enums, look for any enumerator of 'deleted_enum' that
+	  // is also present in an added anonymous enum.
+	  if (deleted_enum)
 	    {
-	      bool this_enum_got_changed = false;
-	      for (auto added_enum : added_anon_enums)
+	      for (auto enr : deleted_enum->get_enumerators())
 		{
-		  if (is_enumerator_present_in_enum(enr, *added_enum))
+		  bool this_enum_got_changed = false;
+		  for (auto t : added_anon_types)
 		    {
-		      // So the enumerator 'enr' from the
-		      // 'deleted_enum' enum is also present in the
-		      // 'added_enum' enum so we assume that
-		      // 'deleted_enum' and 'added_enum' are the same
-		      // enum that got changed.  Let's represent it
-		      // using a diff node.
-		      diff_sptr d = compute_diff(deleted_enum,
-						 added_enum, ctxt);
-		      ABG_ASSERT(d->has_changes());
-		      string repr =
-			abigail::ir::get_pretty_representation(is_type(deleted_enum),
-							       /*internal=*/false);
-		      changed_unreachable_types_[repr]= d;
-		      this_enum_got_changed = true;
-		      string r1 = abigail::ir::get_pretty_representation(is_type(deleted_enum));
-		      string r2 = abigail::ir::get_pretty_representation(is_type(added_enum));
-		      removed_anon_enum_to_erase[r1] = deleted_enum;
-		      added_anon_enum_to_erase[r2] = added_enum;
-		      break;
+		      if (enum_type_decl_sptr added_enum = is_enum_type(t))
+			if (is_enumerator_present_in_enum(enr, *added_enum))
+			  {
+			    // So the enumerator 'enr' from the
+			    // 'deleted_enum' enum is also present in the
+			    // 'added_enum' enum so we assume that
+			    // 'deleted_enum' and 'added_enum' are the same
+			    // enum that got changed.  Let's represent it
+			    // using a diff node.
+			    diff_sptr d = compute_diff(deleted_enum,
+						       added_enum, ctxt);
+			    ABG_ASSERT(d->has_changes());
+			    string repr =
+			      abigail::ir::get_pretty_representation(is_type(deleted_enum),
+								     /*internal=*/false);
+			    changed_unreachable_types_[repr]= d;
+			    this_enum_got_changed = true;
+			    string r1 =
+			      abigail::ir::get_pretty_representation(is_type(deleted_enum),
+								     /*internal=*/false);
+			    string r2 =
+			      abigail::ir::get_pretty_representation(is_type(added_enum),
+								     /*internal=*/false);
+			    removed_anon_types_to_erase[r1] = deleted_enum;
+			    added_anon_types_to_erase[r2] = added_enum;
+			    break;
+			  }
 		    }
+		  if (this_enum_got_changed)
+		    break;
+		}
+	    }
+	  else if (deleted_class)
+	    {
+	      // For unions, structs & classes, look for any data
+	      // member of 'deleted_class' that is also present in an
+	      // added anonymous class.
+	      for (auto dm : deleted_class->get_data_members())
+		{
+		  bool this_class_got_changed = false;
+		  for (auto klass : added_anon_types)
+		    {
+		      if (class_or_union_sptr added_class =
+			  is_class_or_union_type(klass))
+			if (class_or_union_types_of_same_kind(deleted_class,
+							      added_class)
+			    && lookup_data_member(added_class, dm))
+			  {
+			    // So the data member 'dm' from the
+			    // 'deleted_class' class is also present in
+			    // the 'added_class' class so we assume that
+			    // 'deleted_class' and 'added_class' are the
+			    // same anonymous class that got changed.
+			    // Let's represent it using a diff node.
+			    diff_sptr d = compute_diff(is_type(deleted_class),
+						       is_type(added_class),
+						       ctxt);
+			    ABG_ASSERT(d->has_changes());
+			    string repr =
+			      abigail::ir::get_pretty_representation(is_type(deleted_class),
+								     /*internal=*/false);
+			    changed_unreachable_types_[repr]= d;
+			    this_class_got_changed = true;
+			    string r1 =
+			      abigail::ir::get_pretty_representation(is_type(deleted_class),
+								     /*internal=*/false);
+			    string r2 =
+			      abigail::ir::get_pretty_representation(is_type(added_class),
+								     /*internal=*/false);
+			    removed_anon_types_to_erase[r1] = deleted_class;
+			    added_anon_types_to_erase[r2] = added_class;
+			    break;
+			  }
+		    }
+		  if (this_class_got_changed)
+		    break;
 		}
-	      if (this_enum_got_changed)
-		break;
 	    }
 	}
 
-      // Now remove the added/removed anonymous enums from their maps,
-      // as they are now represented as a changed enum, not an added
-      // and removed enum.
-
-      for (auto entry : added_anon_enum_to_erase)
+      // Now remove the added/removed anonymous types from their maps,
+      // as they are now represented as a changed type, not an added
+      // and removed anonymous type.
+      for (auto entry : added_anon_types_to_erase)
 	added_unreachable_types_.erase(entry.first);
 
-      for (auto entry : removed_anon_enum_to_erase)
+      for (auto entry : removed_anon_types_to_erase)
 	deleted_unreachable_types_.erase(entry.first);
     }
   }
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 171267f8..bb9483c9 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -6061,6 +6061,47 @@ is_anonymous_data_member(const var_decl& d)
 	  && is_class_or_union_type(d.get_type()));
 }
 
+/// Test if a @ref var_decl is a data member belonging to an anonymous
+/// type.
+///
+/// @param d the @ref var_decl to consider.
+///
+/// @return true iff @p d is a data member belonging to an anonymous
+/// type.
+bool
+is_data_member_of_anonymous_class_or_union(const var_decl& d)
+{
+  if (is_data_member(d))
+    {
+      scope_decl* scope = d.get_scope();
+      if (scope && scope->get_is_anonymous())
+	return true;
+    }
+  return false;
+}
+
+/// Test if a @ref var_decl is a data member belonging to an anonymous
+/// type.
+///
+/// @param d the @ref var_decl to consider.
+///
+/// @return true iff @p d is a data member belonging to an anonymous
+/// type.
+bool
+is_data_member_of_anonymous_class_or_union(const var_decl* d)
+{return is_data_member_of_anonymous_class_or_union(*d);}
+
+/// Test if a @ref var_decl is a data member belonging to an anonymous
+/// type.
+///
+/// @param d the @ref var_decl to consider.
+///
+/// @return true iff @p d is a data member belonging to an anonymous
+/// type.
+bool
+is_data_member_of_anonymous_class_or_union(const var_decl_sptr& d)
+{return is_data_member_of_anonymous_class_or_union(d.get());}
+
 /// Get the @ref class_or_union type of a given anonymous data member.
 ///
 /// @param d the anonymous data member to consider.
@@ -10791,6 +10832,36 @@ shared_ptr<class_or_union>
 is_class_or_union_type(const shared_ptr<type_or_decl_base>& t)
 {return dynamic_pointer_cast<class_or_union>(t);}
 
+/// Test if two class or union types are of the same kind.
+///
+/// @param first the first type to consider.
+///
+/// @param second the second type to consider.
+///
+/// @return true iff @p first is of the same kind as @p second.
+bool
+class_or_union_types_of_same_kind(const class_or_union* first,
+				  const class_or_union* second)
+{
+  if ((is_class_type(first) && is_class_type(second))
+      || (is_union_type(first) && is_union_type(second)))
+    return true;
+
+  return false;
+}
+
+/// Test if two class or union types are of the same kind.
+///
+/// @param first the first type to consider.
+///
+/// @param second the second type to consider.
+///
+/// @return true iff @p first is of the same kind as @p second.
+bool
+class_or_union_types_of_same_kind(const class_or_union_sptr& first,
+				  const class_or_union_sptr& second)
+{return class_or_union_types_of_same_kind(first.get(), second.get());}
+
 /// Test if a type is a @ref union_decl.
 ///
 /// @param t the type to consider.
@@ -27430,6 +27501,27 @@ lookup_data_member(const type_base* type,
   return cou->find_data_member(dm_name).get();
 }
 
+/// Look for a data member of a given class, struct or union type and
+/// return it.
+///
+/// The data member is designated by its name.
+///
+/// @param type the class, struct or union type to consider.
+///
+/// @param dm the data member to lookup.
+///
+/// @return the data member iff it was found in @type or NULL if no
+/// data member with that name was found.
+const var_decl_sptr
+lookup_data_member(const type_base_sptr& type, const var_decl_sptr& dm)
+{
+  class_or_union_sptr cou = is_class_or_union_type(type);
+  if (!cou)
+    return var_decl_sptr();
+
+  return cou->find_data_member(dm);
+}
+
 /// Get the function parameter designated by its index.
 ///
 /// Note that the first function parameter has index 0.
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index cc38f240..c8122af3 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -402,8 +402,12 @@ represent(const var_diff_sptr	&diff,
   const bool o_anon = !!is_anonymous_data_member(o);
   const bool n_anon = !!is_anonymous_data_member(n);
   const bool is_strict_anonymous_data_member_change = o_anon && n_anon;
-  const string o_name = o->get_qualified_name();
-  const string n_name = n->get_qualified_name();
+  const string o_name = (is_data_member_of_anonymous_class_or_union(o)
+			 ? o->get_name()
+			 : o->get_qualified_name());
+  const string n_name = (is_data_member_of_anonymous_class_or_union(n)
+			 ? n->get_name()
+			 : n->get_qualified_name());
   const uint64_t o_size = get_var_size_in_bits(o);
   const uint64_t n_size = get_var_size_in_bits(n);
   const uint64_t o_offset = get_data_member_offset(o);
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index adb6d8bd..3134df7d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -362,6 +362,11 @@ test-abidiff-exit/test-anonymous-enums-change-v0.c \
 test-abidiff-exit/test-anonymous-enums-change-v0.o \
 test-abidiff-exit/test-anonymous-enums-change-v1.c \
 test-abidiff-exit/test-anonymous-enums-change-v1.o \
+test-abidiff-exit/test-anon-types-report-1.txt \
+test-abidiff-exit/test-anon-types-v0.c \
+test-abidiff-exit/test-anon-types-v0.o \
+test-abidiff-exit/test-anon-types-v1.c \
+test-abidiff-exit/test-anon-types-v1.o \
 \
 test-diff-dwarf/test0-v0.cc		\
 test-diff-dwarf/test0-v0.o			\
diff --git a/tests/data/test-abidiff-exit/test-anon-types-report-1.txt b/tests/data/test-abidiff-exit/test-anon-types-report-1.txt
new file mode 100644
index 00000000..916b880d
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anon-types-report-1.txt
@@ -0,0 +1,31 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+Unreachable types summary: 2 removed, 3 changed, 0 added types
+
+2 removed types unreachable from any public interface:
+
+  [D] 'struct {char z; int w;}' at test-anon-types-v0.c:34:1
+  [D] 'union {char x; unsigned int y;}' at test-anon-types-v0.c:28:1
+
+3 changed types unreachable from any public interface:
+
+  [C] 'struct {int a; int b;}' changed:
+    type size changed from 64 to 96 (in bits)
+    1 data member insertion:
+      'int c', at offset 64 (in bits) at test-anon-types-v1.c:18:1
+
+  [C] 'enum {a=0, b=1, c=2, d=3, }' changed:
+    type size hasn't changed
+    2 enumerator insertions:
+      'e' value '4'
+      'f' value '5'
+
+  [C] 'union {int a; int b; int d;}' changed:
+    type size hasn't changed
+    1 data member change:
+      name of 'd' changed to 'c' at test-anon-types-v1.c:11:1
+    type changed from:
+      union {int a; int b; int d;}
+    to:
+      union {int a; int b; int c;}
+
diff --git a/tests/data/test-abidiff-exit/test-anon-types-v0.c b/tests/data/test-abidiff-exit/test-anon-types-v0.c
new file mode 100644
index 00000000..2f9a2599
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anon-types-v0.c
@@ -0,0 +1,42 @@
+/**
+ * Compile with:
+ *
+ * gcc -c -g -fno-eliminate-unused-debug-types test-anon-types-v{0,1}.c
+ */
+
+union
+{
+  int a;
+  int b;
+  int d;
+};
+
+struct
+{
+  int a;
+  int b;
+};
+
+enum
+{
+  a,
+  b,
+  c,
+  d
+};
+
+union
+{
+  char x;
+  unsigned y;
+};
+
+struct
+{
+  char z;
+  int w;
+};
+
+void
+fun()
+{}
diff --git a/tests/data/test-abidiff-exit/test-anon-types-v0.o b/tests/data/test-abidiff-exit/test-anon-types-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..32d7fdfc3631aa467094410a8df1e50d39792972
GIT binary patch
literal 3240
zcmbtWPj4Gl5TCbeCr&m=orKbs1ng9;NGf(6hf+eSgg`_S0;;M?<%Z0z{bDcJ>u7f!
zk|0#U0SR#_5=U-ufEx(D0Uv=&B+f{P11e_@Fta<)-7K#vDkJUA%y0g_H~XG__q8`~
z7(##|0UPi@Qz*bUqYvcGMBIcYU>5G|eERFXw}1K_p(2P9SrX5u6Q9g06Ay*aTWAq3
zjHQAH<EhXBD-obnDEdJR#i<Y-4HwEOY<Mu8NCgZnd`?Nu3Sy><j|akRf?>A6gpop0
zurU8UIUT|?r9?P_$^`kth!`POy!bP|jbpf!*ui)oE^~qLy+HtCX}B3`0pd##lVFzC
z7Q}VyCF}KBj6bEXTG-1Xdd#CxI47)yLh8F91UeUI5#i_*8My?OwPBf4xOday^3<$l
zR^}?xVrH~_4xq$V+}p8&*sv@txn@ym$~Nx6%NMYj1fY=3^T!u(Nzc);@WJ@xtzK#s
zN>_Xrg(CW1K`w;&Yig1hEgl~fD#<<=qGFs$(<XsM0b@heToOfN*D%q25JY}EkgX~W
zar@?->Q?>5YQ63}@6@X+%PTAO`bxdJcpDvd+?Wma)upQ4iwA*RZ_7Z2eiKzUY<AWU
zSFhREuG$AHRl8la_kzAHyME6P+*sO!U=Ycc-ICs*ZO2FZGJ<Bu4I!3MY`Z}}NJ0Bx
z*=a(p)9=YztKWLpueJTS*7ZHt^V_c9t$8wzWtc`ZyKWTK_Cv}MJzkKuycUG*t*y1{
zB5u;sf7l^Bb18}A+xS_R#oWYb=^oBz9$|Wjk{Q1;RsO`-njCo*9a32Prm+^_&%bp>
zoTLuM(>0v=DZ7al9hq1`M|etgFlNzzr6!C$#2*iuhD?~ypm;a|Pnw2IIHN(yfAU}W
zlZeb@_Gj3!cF1&<q@-psj%s%GssiD(N~O=FVL&)Nil{!3!q28EJjI+Qmz~lT#>rpx
zK+qQ%JiEI;=I{?$|Al!zzgi3BFR~A@GRt}Yi;S!OcUh-<i%8*jQx)pW6|VZe&Uik5
zm2ujG>^^`K9ra?@Lmr1I?<gsjhcP%UH+I4Cq6nN&c3mgAS{i<^*GC&&GY!}CLV0k?
z?1pa8#=9pQ()9zWLa>Aq32r2Mv)}7Uyda&RA4>;s06U7^=6jq(b{c!3+mpPI|H<Ys
zp7u!1Nu}FlVfg*BPQF=MK!vdU3E$2-W#oMPvuLC5?s4O3{`s6#PSyW|lnmv4>ARv^
zXfxwO;y!<@CyY-cCqH#Y&NIG_JfD+HFEIEO`ze<9P5$sGV}_rw<8lTgF(3a1V!Hl!
zc%Ukt`lngu`)_G-A_OHq95+eHP`-WxZMyo0T>l-8rTTP_<m>MvMmbfVC?@n4*Z)`n
z%vF8GKR{d;f5P$KJ|h0Jhs1xxA7t$j@pRv)Ub3#=<v(aP=6$I@!noaG3KhRPL{dTR
zpMt+eLAU=Wy#MMurTwR0F%_?HU2V$!8~5MghUxc)ejW4iG*jJDZ}It2zdPubP=5W?
QmoEN3_x}UODVC4_2gPCpxBvhE

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/test-anon-types-v1.c b/tests/data/test-abidiff-exit/test-anon-types-v1.c
new file mode 100644
index 00000000..73716a1f
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-anon-types-v1.c
@@ -0,0 +1,33 @@
+/**
+ * Compile with:
+ *
+ * gcc -c -g -fno-eliminate-unused-debug-types test-anon-types-v{0,1}.c
+ */
+
+union
+{
+  int a;
+  int b;
+  int c;
+};
+
+struct
+{
+  int a;
+  int b;
+  int c;
+};
+
+enum
+{
+  a,
+  b,
+  c,
+  d,
+  e,
+  f
+};
+
+void
+fun()
+{}
diff --git a/tests/data/test-abidiff-exit/test-anon-types-v1.o b/tests/data/test-abidiff-exit/test-anon-types-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..868f00a98192c96378714174dffadd9680393fc1
GIT binary patch
literal 3168
zcmb_e&2Jl35TEC@V>_FqPF(ea6lH@zBo(`kO(`K&f+2#mDJrN^kI3D%pX~*E9eLML
zT0Y7N3317RBN7Kt1>y!5jv&;(qG$d9&KzK7cV4o2SyTj!v^z7u`FQi*y!Un=yz$nX
zIUzuifGs%I6bf*+cq}(#u?c6P3U{u5_S@mRzy5+y0Yr%`d3rrfuQa9Np^z6v@eW#Z
zE|g>L!F0^qU=oL^e8CSQD9(sE@geGl3zgVlcrZ^w-e|)D2_+~M^IxMN&WV`0D0(17
z8*-uphLDgKT`aDgk4u>DP680t(HvD>;!6-KV3aPISk^2G8_VLF`O0$fMiqxY39O?}
zeqKB`S2c~L#ie<%P^_HC1voEEbHl_aQ((~4vtXKArh$u6te&ux@?y(0%^THY=Q2Cb
z0Zcpa>O~wsPDHtz7w%ug3BG_&4j-Cxn$!%^7|FZ%6wvoFav{VYbF;)~;`pGj6t6)}
zEalE5Y0-ia0?J3KVTnR+H)o*xBnbUpAUhWIW#`r%YrFokRj)fQI(4hD)@ao0jk>jR
z8y&8@5gY6)tCl^CCV|}S$v}?%HmdHp-QPS|ziMB-V(&LByJy+mU}VdIKlB4PlJ+E+
zgtB9Iq&Ml=(Y-wxLajd<%35dCdC#x){HQkYJ=gPlu0N=GGK%Ebc7su1w+C(**7nAc
z45JX}o#1g2d%y0q|Hn+3>0xJkd&646^;!J~i-XI3HePh>$Nk$N4k}`CrdT?}##}<2
z9-_Fxugz6H&27(4y^anEocX4n=Hd50vy9lrEEo*lR=UwZOBNZ)5kF-zVCob`fRW7L
zl+A$hDJ=2F^OZpc%w(XHA5TpN8E_^8CI8t|_&G!tQtNYcs50A3cSu627t^SwXRk&e
zoMx%?g(M6Jr{^WsX?!AuCmO(0EKui;jwQ;M87F^L13?c{czShzU|i3mYNk8|_90eb
zS@(a2aaHFo>vTC0Df~gALY=w7zhM0ub3MPsIL$RZUvR>E!^riJN8^O|l@!T?2%L@^
zx!`zV2+mjzTqnLiT7J+Sp^fg6mg{+Axqrg!j@_V#7fd>2;0IEL;1EhAxE1T|(Qqj7
z7IcD9Bpp2Kb{M(s_c@8|x4L6@D0w3Pku738t&!@JO4nrJXrHo9zG+%Ug)sdj@1&hl
zvL63D+Gv0M+j#1~o|A@C<3A!LMY=ETEBc{mrhG_j@@D;+@p<Irr_RC!#y64cImtA`
z;8*OYnC?rz7&=D2-!r(T0-5W+HxbXOUo}+4Q~lISz5WhjdQODkF@v{ANs;c`LR;4O
zYrLWEax9Hc_k}+G9%7VJ)rn$Et9&>=QUG%`zTzJso)!O)<G*`C{O5lY|2A*P+7sgG
zzEQQLT|d@0G#hnas*kV}cM<BJaQr&QDW=v>>EED`wf={^{%W7n`qS4+#Vb5(Y|8x;
qkKgBl>AON-K|P*&nl)96&yV`Ppj%A({Hd<2_;0!XA307jJ^n9btofJ#

literal 0
HcmV?d00001

diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index 4c1eaea5..b9ea4792 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1064,6 +1064,22 @@ InOutSpec in_out_specs[] =
     "data/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt",
     "output/test-abidiff-exit/test-anonymous-enums-change-report-v1.txt"
   },
+  {
+    "data/test-abidiff-exit/test-anon-types-v0.o",
+    "data/test-abidiff-exit/test-anon-types-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression --harmless --non-reachable-types",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE
+    | abigail::tools_utils::ABIDIFF_ABI_INCOMPATIBLE_CHANGE,
+    "data/test-abidiff-exit/test-anon-types-report-1.txt",
+    "output/test-abidiff-exit/test-anon-types-report-1.txt"
+  },
 #ifdef WITH_BTF
   {
     "data/test-abidiff-exit/btf/test0-v0.o",
-- 
2.39.3


-- 
		Dodji


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

* [PATCH 6/7, applied] Support suppressing data member insertion before a flexible array member
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
                   ` (4 preceding siblings ...)
  2023-10-20 10:01 ` [PATCH 5/7, applied] comparison: Represent changed unreachable anonymous unions, structs & enums Dodji Seketeli
@ 2023-10-20 10:03 ` Dodji Seketeli
  2023-10-20 10:04 ` [PATCH 7/7, applied] suppression: Make the "end" data member offset selector be named boundary Dodji Seketeli
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20 10:03 UTC (permalink / raw)
  To: Dodji Seketeli
  Cc: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail

Hello,

Consider this code example:

    $ cat test-v0.c
     1	struct foo
     2	{
     3	  int member0;
     4	  char pad[]; /* <-- flexible array member.  */
     5	};
     6
     7	void
     8	foo(struct foo * p __attribute__((unused)))
     9	{
    10	}
    $

Consider this new version of the code where a data member has been
added right before the flexible array member:

    $ cat -n test-v1.c
     1	struct foo
     2	{
     3	  int member0;
     4	  char member1; /*<-- added member.  */
     5	  char pad[]; /* <-- flexible array member.  */
     6	};
     7
     8	void
     9	foo(struct foo * p __attribute__((unused)))
    10	{
    11	}
    $

Here is what abidiff reports about the change:

    $ abidiff test-v0.o test-v1.o || echo "returned value: $?"
    Functions changes summary: 0 Removed, 1 Changed, 0 Added function
    Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

    1 function with some indirect sub-type change:

      [C] 'function void foo(foo*)' at test-v0.c:8:1 has some indirect sub-type changes:
	parameter 1 of type 'foo*' has sub-type changes:
	  in pointed to type 'struct foo' at test-v1.c:1:1:
	    type size changed from 32 to 64 (in bits)
	    1 data member insertion:
	      'char member1', at offset 32 (in bits) at test-v1.c:4:1
	    1 data member change:
	      'char pad[]' offset changed from 32 to 40 (in bits) (by +8 bits)

    returned value: 4
    $

This patch allows users to suppress this change report using a new
property value to the "has_data_member_inserted_at" property of the
[suppress_type] directive.  The resulting suppression specification
reads:

    $ cat -n foo.suppr
	 1	[suppress_type]
	 2	 type_kind = struct
         3       name = foo
	 4	 has_data_member_inserted_at = offset_of_flexible_array_data_member
	 5	 has_size_change = yes
    $

With this suppression specification the previous command now gives:

    $ abidiff --suppr foo.suppr test-v0.o test-v1.o && echo "returned value: $?"
    Functions changes summary: 0 Removed, 0 Changed (1 filtered out), 0 Added function
    Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

    returned value: 0
    $

The patch adds new test cases and updates the documentation to add a
mention to the new offset_of_flexible_array_data_member named
boundary.

	* doc/manuals/libabigail-concepts.rst: Add documentation for the
	new "offset_of_flexible_array_data_member" named boundary.
	* include/abg-fwd.h (has_flexible_array_data_member): Declare new
	function.
	* src/abg-ir.cc (has_flexible_array_data_member): Define it.
	* include/abg-suppression.h
	(type_suppression::insertion_range::named_boundary_sptr): Define
	new typedef.
	(type_suppression::insertion_range::create_named_boundary): Declare
	new static function member function.
	(is_named_boundary): Declare new function.
	(class type_suppression::insertion_range::named_boundary): Declare
	new type.
	* src/abg-suppression.cc
	(struct type_suppression::insertion_range::named_boundary::priv):
	Define new private type.
	(OFFSET_OF_FLEXIBLE_ARRAY_DATA_MEMBER_STRING): Define new static
	constant string getter function.
	(type_suppression::insertion_range::create_named_boundary): Define
	new static member function.
	(is_named_boundary): Define new function.
	(read_type_suppression): Parse the new
	"offset_of_flexible_array_data_member" named boundary.
	(type_suppression::insertion_range::eval_boundary): Evaluate the
	new "offset_of_flexible_array_data_member" named boundary.
	* tests/data/test-abidiff-exit/test-fam1-report-[1-5].txt: New
	reference test output.
	* tests/data/test-abidiff-exit/test-fam2-report-1.txt: Likewise.
	* tests/data/test-abidiff-exit/test-fam1-suppr-[1-4].abignore: New test
	suppression specification.
	* tests/data/test-abidiff-exit/test-fam{1,2}-v{0,1}.o: New test input
	binaries.
	* tests/data/test-abidiff-exit/test-fam{1,2}-v{0,1}.c: Source code of
	the test input binaries.
	* tests/data/Makefile.am: Add the new test material to the source
	distribution.
	* tests/test-abidiff-exit.cc (in_out_specs): Add the new test
	input to this harness.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 doc/manuals/libabigail-concepts.rst           |   5 +
 include/abg-fwd.h                             |   9 ++
 include/abg-suppression.h                     |  27 +++++
 src/abg-ir.cc                                 |  61 ++++++++++
 src/abg-suppression.cc                        |  83 ++++++++++++++
 tests/data/Makefile.am                        |  18 +++
 .../test-abidiff-exit/test-fam1-report-1.txt  |  14 +++
 .../test-abidiff-exit/test-fam1-report-2.txt  |   3 +
 .../test-abidiff-exit/test-fam1-report-3.txt  |  14 +++
 .../test-abidiff-exit/test-fam1-report-4.txt  |   3 +
 .../test-abidiff-exit/test-fam1-report-5.txt  |  14 +++
 .../test-fam1-suppr-1.abignore                |   4 +
 .../test-fam1-suppr-2.abignore                |   3 +
 .../test-fam1-suppr-3.abignore                |   5 +
 .../test-fam1-suppr-4.abignore                |   5 +
 tests/data/test-abidiff-exit/test-fam1-v0.c   |  10 ++
 tests/data/test-abidiff-exit/test-fam1-v0.o   | Bin 0 -> 3184 bytes
 tests/data/test-abidiff-exit/test-fam1-v1.c   |  11 ++
 tests/data/test-abidiff-exit/test-fam1-v1.o   | Bin 0 -> 3224 bytes
 .../test-abidiff-exit/test-fam2-report-1.txt  |  14 +++
 tests/data/test-abidiff-exit/test-fam2-v0.c   |  10 ++
 tests/data/test-abidiff-exit/test-fam2-v0.o   | Bin 0 -> 3184 bytes
 tests/data/test-abidiff-exit/test-fam2-v1.c   |  12 ++
 tests/data/test-abidiff-exit/test-fam2-v1.o   | Bin 0 -> 3232 bytes
 tests/test-abidiff-exit.cc                    | 105 ++++++++++++++++++
 25 files changed, 430 insertions(+)
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-2.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-3.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-4.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-report-5.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-1.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-2.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-3.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-suppr-4.abignore
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam1-v1.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-report-1.txt
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v0.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v1.c
 create mode 100644 tests/data/test-abidiff-exit/test-fam2-v1.o

diff --git a/doc/manuals/libabigail-concepts.rst b/doc/manuals/libabigail-concepts.rst
index 324c5162..28e71684 100644
--- a/doc/manuals/libabigail-concepts.rst
+++ b/doc/manuals/libabigail-concepts.rst
@@ -500,6 +500,11 @@ names start with the string "private_data_member".
 	       value equals the offset of the end of the structure or
 	       class.
 
+	     - the keyword ``offset_of_flexible_array_data_member``
+               which is a named constant that evaluates to the offset
+               of the flexible array data member contained in the
+               relevant structure.
+
 	     - the function call expression
 	       ``offset_of(data-member-name)`` where `data-member-name` is
 	       the name of a given data member of the relevant structure
diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index 0edc9927..7d6637b9 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -481,6 +481,15 @@ is_class_type(const type_or_decl_base*);
 class_decl_sptr
 is_class_type(const type_or_decl_base_sptr&);
 
+var_decl_sptr
+has_flexible_array_data_member(const class_decl&);
+
+var_decl_sptr
+has_flexible_array_data_member(const class_decl*);
+
+var_decl_sptr
+has_flexible_array_data_member(const class_decl_sptr&);
+
 bool
 is_declaration_only_class_or_union_type(const type_base *t,
 					bool look_through_decl_only = false);
diff --git a/include/abg-suppression.h b/include/abg-suppression.h
index cbb16207..996600bb 100644
--- a/include/abg-suppression.h
+++ b/include/abg-suppression.h
@@ -366,6 +366,7 @@ public:
   class boundary;
   class integer_boundary;
   class fn_call_expr_boundary;
+  class named_boundary;
 
   /// Convenience typedef for a shared_ptr to @ref boundary
   typedef shared_ptr<boundary> boundary_sptr;
@@ -377,6 +378,10 @@ public:
   /// fn_call_expr_boundary
   typedef shared_ptr<fn_call_expr_boundary> fn_call_expr_boundary_sptr;
 
+  /// Convenience typedef for a shared_ptr to a @ref
+  /// named_boundary
+  typedef shared_ptr<named_boundary> named_boundary_sptr;
+
   insertion_range();
 
   insertion_range(boundary_sptr begin, boundary_sptr end);
@@ -396,6 +401,9 @@ public:
   static insertion_range::fn_call_expr_boundary_sptr
   create_fn_call_expr_boundary(const string&);
 
+  static insertion_range::named_boundary_sptr
+  create_named_boundary(const string&);
+
   static bool
   eval_boundary(const boundary_sptr	boundary,
 		const class_or_union*	context,
@@ -411,6 +419,9 @@ is_integer_boundary(type_suppression::insertion_range::boundary_sptr);
 type_suppression::insertion_range::fn_call_expr_boundary_sptr
 is_fn_call_expr_boundary(type_suppression::insertion_range::boundary_sptr);
 
+type_suppression::insertion_range::named_boundary_sptr
+is_named_boundary(type_suppression::insertion_range::boundary_sptr);
+
 /// The abstraction of the boundary of an @ref insertion_range, in the
 /// context of a @ref type_suppression
 class type_suppression::insertion_range::boundary
@@ -458,6 +469,22 @@ public:
   ~fn_call_expr_boundary();
 }; //end class type_suppression::insertion_range::fn_call_expr_boundary
 
+/// An @ref insertion_range boundary that is expressed as a named
+/// constant that is to be evaluated later in the context of a given
+/// type and resolved to a bit offset.
+class type_suppression::insertion_range::named_boundary
+  : public type_suppression::insertion_range::boundary
+{
+  struct priv;
+  std::unique_ptr<priv> priv_;
+
+  named_boundary();
+
+public:
+  named_boundary(const string& name);
+  const string& get_name() const;
+}; //end class type_suppression::insertion_range::named_boundary
+
 /// Abstraction of a negated type suppression specification.
 ///
 /// A negated type suppression suppresses a type if the negation of
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index bb9483c9..79aec355 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -10760,6 +10760,67 @@ class_decl_sptr
 is_class_type(const type_or_decl_base_sptr& d)
 {return dynamic_pointer_cast<class_decl>(d);}
 
+/// Test if the last data member of a class is an array with
+/// non-finite data member.
+///
+/// The flexible data member idiom is a well known C idiom:
+/// https://en.wikipedia.org/wiki/Flexible_array_member.
+///
+/// @param klass the class to consider.
+///
+/// @return the data member which type is a flexible array, if any, or
+/// nil.
+var_decl_sptr
+has_flexible_array_data_member(const class_decl& klass)
+{
+  var_decl_sptr nil;
+  const class_or_union::data_members& dms = klass.get_data_members();
+  if (dms.empty())
+    return nil;
+
+  if (array_type_def_sptr array = is_array_type(dms.back()->get_type()))
+    {// The type of the last data member is an array.
+      if (array->is_infinite())
+	// The array has a non-finite size.  We are thus looking at a
+	// flexible array data member.  Let's return it.
+	return dms.back();
+    }
+
+  return nil;
+}
+
+/// Test if the last data member of a class is an array with
+/// non-finite data member.
+///
+/// The flexible data member idiom is a well known C idiom:
+/// https://en.wikipedia.org/wiki/Flexible_array_member.
+///
+/// @param klass the class to consider.
+///
+/// @return the data member which type is a flexible array, if any, or
+/// nil.
+var_decl_sptr
+has_flexible_array_data_member(const class_decl* klass)
+{
+  if (!klass)
+    return var_decl_sptr();
+
+  return has_flexible_array_data_member(*klass);
+}
+
+/// Test if the last data member of a class is an array with
+/// non-finite data member.
+///
+/// The flexible data member idiom is a well known C idiom:
+/// https://en.wikipedia.org/wiki/Flexible_array_member.
+///
+/// @param klass the class to consider.
+///
+/// @return the data member which type is a flexible array, if any, or
+/// nil.
+var_decl_sptr
+has_flexible_array_data_member(const class_decl_sptr& klass)
+{return has_flexible_array_data_member(klass.get());}
 
 /// Test wheter a type is a declaration-only class.
 ///
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index f8d065f6..d84857ba 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -43,6 +43,14 @@ using namespace comparison;
 using std::dynamic_pointer_cast;
 using regex::regex_t_sptr;
 
+/// @return the string constant "offset_of_flexible_array_data_member".
+static const string&
+OFFSET_OF_FLEXIBLE_ARRAY_DATA_MEMBER_STRING()
+{
+  static string s = "offset_of_flexible_array_data_member";
+  return s;
+}
+
 // <parsing stuff>
 
 // section parsing
@@ -1482,6 +1490,25 @@ type_suppression::insertion_range::create_fn_call_expr_boundary(const string& s)
   return result;
 }
 
+/// Create a named boundary.
+///
+/// The return value is to be used as a boundary for an instance of
+/// @ref type_suppression::insertion_range.  The value of that
+/// boundary is a named constant that is to be evaluated to an integer
+/// value, in the context of a @ref class_decl.  That evaluate is
+/// performed by the function
+/// type_suppression::insertion_range::eval_boundary().
+///
+/// @param name the name of the boundary.
+///
+/// @return the newly created named boundary.
+type_suppression::insertion_range::named_boundary_sptr
+type_suppression::insertion_range::create_named_boundary(const string& name)
+{
+  named_boundary_sptr result(new named_boundary(name));
+  return result;
+}
+
 /// Evaluate an insertion range boundary to get a resulting integer
 /// value.
 ///
@@ -1563,6 +1590,19 @@ type_suppression::insertion_range::eval_boundary(const boundary_sptr	boundary,
 	    }
 	}
     }
+  else if (named_boundary_sptr b = is_named_boundary(boundary))
+    {
+      if (b->get_name() == OFFSET_OF_FLEXIBLE_ARRAY_DATA_MEMBER_STRING())
+	{
+	  // Look at the last data member of 'context' and make sure
+	  // its type is an array with non-finite size.
+	  if (var_decl_sptr dm = has_flexible_array_data_member(is_class_type(context)))
+	    {
+	      value = get_data_member_offset(dm);
+	      return true;
+	    }
+	}
+    }
   return false;
 }
 
@@ -1605,6 +1645,18 @@ type_suppression::insertion_range::fn_call_expr_boundary_sptr
 is_fn_call_expr_boundary(type_suppression::insertion_range::boundary_sptr b)
 {return dynamic_pointer_cast<type_suppression::insertion_range::fn_call_expr_boundary>(b);}
 
+/// Test if a given instance of @ref
+/// type_suppression::insertion_range::boundary is actually a named boundary.
+///
+/// @param b the boundary to consider.
+///
+/// @return the instance of @ref
+/// type_suppression::insertion_range::named_boundary if @p b is a
+/// named boundary, or nil.
+type_suppression::insertion_range::named_boundary_sptr
+is_named_boundary(type_suppression::insertion_range::boundary_sptr b)
+{return dynamic_pointer_cast<type_suppression::insertion_range::named_boundary>(b);}
+
 /// The private data type of @ref
 /// type_suppression::insertion_range::boundary.
 struct type_suppression::insertion_range::boundary::priv
@@ -1706,6 +1758,35 @@ type_suppression::insertion_range::fn_call_expr_boundary::operator ini::function
 type_suppression::insertion_range::fn_call_expr_boundary::~fn_call_expr_boundary()
 {}
 
+/// The private data type for the @ref
+/// type_suppression::insertion_range::named_boundary.
+struct type_suppression::insertion_range::named_boundary::priv
+{
+  string name_;
+
+  priv()
+  {}
+
+  priv(const string& name)
+    : name_(name)
+  {}
+}; // end struct type_suppression::insertion_range::named_boundary::priv
+
+/// Constructor for @ref
+/// type_suppression::insertion_range::named_boundary
+///
+/// @param name the name of the @ref named_boundary type.
+type_suppression::insertion_range::named_boundary::named_boundary(const string& name)
+  : priv_(new priv(name))
+{}
+
+/// Getter for the name of the named boundary.
+///
+/// @return the name of the named boundary.
+const string&
+type_suppression::insertion_range::named_boundary::get_name() const
+{return priv_->name_;}
+
 /// Test if an instance of @ref suppression is an instance of @ref
 /// type_suppression.
 ///
@@ -2021,6 +2102,8 @@ read_type_suppression(const ini::config::section& section)
       type_suppression::insertion_range::boundary_sptr begin, end;
       if (ins_point == "end")
 	begin = type_suppression::insertion_range::create_integer_boundary(-1);
+      else if (ins_point == OFFSET_OF_FLEXIBLE_ARRAY_DATA_MEMBER_STRING())
+	begin = type_suppression::insertion_range::create_named_boundary(ins_point);
       else if (isdigit(ins_point[0]))
 	begin = type_suppression::insertion_range::create_integer_boundary
 	  (atoi(ins_point.c_str()));
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3134df7d..945831ff 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -367,6 +367,24 @@ test-abidiff-exit/test-anon-types-v0.c \
 test-abidiff-exit/test-anon-types-v0.o \
 test-abidiff-exit/test-anon-types-v1.c \
 test-abidiff-exit/test-anon-types-v1.o \
+test-abidiff-exit/test-fam1-report-1.txt \
+test-abidiff-exit/test-fam1-report-2.txt \
+test-abidiff-exit/test-fam1-report-3.txt \
+test-abidiff-exit/test-fam1-report-4.txt \
+test-abidiff-exit/test-fam1-report-5.txt \
+test-abidiff-exit/test-fam1-suppr-1.abignore \
+test-abidiff-exit/test-fam1-suppr-2.abignore \
+test-abidiff-exit/test-fam1-suppr-3.abignore \
+test-abidiff-exit/test-fam1-suppr-4.abignore \
+test-abidiff-exit/test-fam1-v0.c \
+test-abidiff-exit/test-fam1-v0.o \
+test-abidiff-exit/test-fam1-v1.c \
+test-abidiff-exit/test-fam1-v1.o \
+test-abidiff-exit/test-fam2-report-1.txt \
+test-abidiff-exit/test-fam2-v0.c \
+test-abidiff-exit/test-fam2-v0.o \
+test-abidiff-exit/test-fam2-v1.c \
+test-abidiff-exit/test-fam2-v1.o \
 \
 test-diff-dwarf/test0-v0.cc		\
 test-diff-dwarf/test0-v0.o			\
diff --git a/tests/data/test-abidiff-exit/test-fam1-report-1.txt b/tests/data/test-abidiff-exit/test-fam1-report-1.txt
new file mode 100644
index 00000000..90861635
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-report-1.txt
@@ -0,0 +1,14 @@
+Functions changes summary: 0 Removed, 1 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+1 function with some indirect sub-type change:
+
+  [C] 'function void foo(foo*)' at test-fam1-v0.c:8:1 has some indirect sub-type changes:
+    parameter 1 of type 'foo*' has sub-type changes:
+      in pointed to type 'struct foo' at test-fam1-v1.c:1:1:
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char member1', at offset 32 (in bits) at test-fam1-v1.c:4:1
+        1 data member change:
+          'char pad[]' offset changed from 32 to 40 (in bits) (by +8 bits)
+
diff --git a/tests/data/test-abidiff-exit/test-fam1-report-2.txt b/tests/data/test-abidiff-exit/test-fam1-report-2.txt
new file mode 100644
index 00000000..9666a8fd
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-report-2.txt
@@ -0,0 +1,3 @@
+Functions changes summary: 0 Removed, 0 Changed (1 filtered out), 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
diff --git a/tests/data/test-abidiff-exit/test-fam1-report-3.txt b/tests/data/test-abidiff-exit/test-fam1-report-3.txt
new file mode 100644
index 00000000..90861635
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-report-3.txt
@@ -0,0 +1,14 @@
+Functions changes summary: 0 Removed, 1 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+1 function with some indirect sub-type change:
+
+  [C] 'function void foo(foo*)' at test-fam1-v0.c:8:1 has some indirect sub-type changes:
+    parameter 1 of type 'foo*' has sub-type changes:
+      in pointed to type 'struct foo' at test-fam1-v1.c:1:1:
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char member1', at offset 32 (in bits) at test-fam1-v1.c:4:1
+        1 data member change:
+          'char pad[]' offset changed from 32 to 40 (in bits) (by +8 bits)
+
diff --git a/tests/data/test-abidiff-exit/test-fam1-report-4.txt b/tests/data/test-abidiff-exit/test-fam1-report-4.txt
new file mode 100644
index 00000000..9666a8fd
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-report-4.txt
@@ -0,0 +1,3 @@
+Functions changes summary: 0 Removed, 0 Changed (1 filtered out), 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
diff --git a/tests/data/test-abidiff-exit/test-fam1-report-5.txt b/tests/data/test-abidiff-exit/test-fam1-report-5.txt
new file mode 100644
index 00000000..90861635
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-report-5.txt
@@ -0,0 +1,14 @@
+Functions changes summary: 0 Removed, 1 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+1 function with some indirect sub-type change:
+
+  [C] 'function void foo(foo*)' at test-fam1-v0.c:8:1 has some indirect sub-type changes:
+    parameter 1 of type 'foo*' has sub-type changes:
+      in pointed to type 'struct foo' at test-fam1-v1.c:1:1:
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char member1', at offset 32 (in bits) at test-fam1-v1.c:4:1
+        1 data member change:
+          'char pad[]' offset changed from 32 to 40 (in bits) (by +8 bits)
+
diff --git a/tests/data/test-abidiff-exit/test-fam1-suppr-1.abignore b/tests/data/test-abidiff-exit/test-fam1-suppr-1.abignore
new file mode 100644
index 00000000..ab6f8500
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-suppr-1.abignore
@@ -0,0 +1,4 @@
+[suppress_type]
+ type_kind = struct
+ has_data_member_inserted_at = offset_of_flexible_array_data_member
+ has_size_change = yes
\ No newline at end of file
diff --git a/tests/data/test-abidiff-exit/test-fam1-suppr-2.abignore b/tests/data/test-abidiff-exit/test-fam1-suppr-2.abignore
new file mode 100644
index 00000000..1699a00f
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-suppr-2.abignore
@@ -0,0 +1,3 @@
+[suppress_type]
+ type_kind = struct
+ has_data_member_inserted_at = offset_of_flexible_array_data_member
diff --git a/tests/data/test-abidiff-exit/test-fam1-suppr-3.abignore b/tests/data/test-abidiff-exit/test-fam1-suppr-3.abignore
new file mode 100644
index 00000000..7ff5e6d1
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-suppr-3.abignore
@@ -0,0 +1,5 @@
+[suppress_type]
+ type_kind = struct
+ name = foo
+ has_data_member_inserted_at = offset_of_flexible_array_data_member
+ has_size_change = yes
\ No newline at end of file
diff --git a/tests/data/test-abidiff-exit/test-fam1-suppr-4.abignore b/tests/data/test-abidiff-exit/test-fam1-suppr-4.abignore
new file mode 100644
index 00000000..6afd1283
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-suppr-4.abignore
@@ -0,0 +1,5 @@
+[suppress_type]
+ type_kind = struct
+ name = bar
+ has_data_member_inserted_at = offset_of_flexible_array_data_member
+ has_size_change = yes
\ No newline at end of file
diff --git a/tests/data/test-abidiff-exit/test-fam1-v0.c b/tests/data/test-abidiff-exit/test-fam1-v0.c
new file mode 100644
index 00000000..982f0429
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-v0.c
@@ -0,0 +1,10 @@
+struct foo
+{
+  int member0;
+  char pad[];
+};
+
+void
+foo(struct foo * p __attribute__((unused)))
+{
+}
diff --git a/tests/data/test-abidiff-exit/test-fam1-v0.o b/tests/data/test-abidiff-exit/test-fam1-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..e36cdc0864827b07b045e1fafae82038a4c250bf
GIT binary patch
literal 3184
zcmb_e&2Jl35TEC@<4v}4oH&A}0cDFo{SdqUpoGwpVib`kfGVg|ZdJOr*Y<+fwstpB
zC_)I3kSZ=ka6%j^gphjRfVgn)jsJr?+$wQ^ncaDt?aNk0z)1UM<~N`3)BgDNx3&vH
zfFuEz;YgDxz_ffMw_~vl%TR;sJGXz^x&6_DJ2&p%L%0M&Cu@O*r)kKNkx{h%WCBGY
z^mh>~l0j%?lA$zpdLWAW4U~&8Q!IJo2+AR9Bm8t4uu9yI5HqCBQZAvVeakxH+aJ(6
zH$~eLNrf+mVCXi5h-bktE*n|}(M9oGrDkYrt80s5sa$;$K&uH&H;jwMCF5m7)Uc0v
z&?<?#Tid|=B?R;=FvAIP`eh+@YZRrQhFxT{ws>_#dY@ULBJGp6R>)(nlu1)K31BQ>
zUlat-Q^V9M#48$0G|0)N01Mm5OXzzZxe(&d$~-Yz6Z}wEi<hS$)(Q(r+BmKxU^Z1x
zeOA!W^~%-j=2r71v)QyS*iEz5XuZ%_Z@g%pz2^4J9VcRg)jDTdezZS!HwW(64ZJR@
zPS7209&W5#>ldtpmT3)OG#L-f{c-3G#u!d}>AQZ%4I0oLIsrs(7+HPCZ(0Wpy9@Q<
z#CPkxN$)+cKJcRY$m=*AZ{T>NIyzb5{&X7DDJHD<oXCkq3q5*Xzi+vRUi3d?P+C${
zxU#i%(L9TbbnYLlP`t=EEVCePT?27g6{{!8`W@Vnrx2%)DBjuED%H;mTk|v9=#ap<
zBW-38{`f1;h<lg^gU07cHEL+dBQ3d?$4nZ;w=M_IJQ5kJ2D2IMNYoy2mNhtW<dl&#
zz}uQb8Z6|Xc#C2F7+ytWDYHK5ZBllbUKAp^2XiQAXDu@mo}Jwi1tAempQI;Pkhtvl
z6yvmG={-dGe8yk)K+r20oa)|WJ?S>7N%&R9513P3!iTJX%3Q50=Scn~_8~^=Mx^>b
zlfdbG-(j6zFCsbLuM!oS%q9LE>zA0T`Ax=YZRktM4nOcCrvr8v1qmNYDRK`Zu<3aK
zyAy_B2kywRdv0fcu;-2Y6ST#$)9D26!9!*zaK;1o;gFFxc4Y{bkRri*vEH5dzKidg
zJ)T6ajSqtrMo#yAPV5f%`hnxSY3Kh*SjA{sBe_p9S(}CQJhM)|SvrjhVd{;4GwYO*
z)%Y`Lqx1N0<7xlZoK#NM|B;joslIfs=-)y+<3pm!hxK>H7m<^nygT^Q8q+3@YECjd
zh^+wfJhFPs_iZ%f#ec(KLk2QeeQBO~{a1NIWjysyuc_L94>2_-LhvhtZ;+B9)prkV
zdG*^||0c&$eR?m{`cuRxr|c8On3nl+`VwF+>r4J2;(76(aQsh?iT~me@hv`(^~c12
z&GCvGIO>6B2idpuzsK?1u7qL8@f#_U2y*=-{5=YJ>wlNmU!GH1fBKD(@e-$g)Y=Ha
sU9LamhUs^Rel68_+S9zL>U@9X{}gnKNu59Sl^6dD_y04;Nv6jC4RnF@YybcN

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/test-fam1-v1.c b/tests/data/test-abidiff-exit/test-fam1-v1.c
new file mode 100644
index 00000000..0267d32b
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam1-v1.c
@@ -0,0 +1,11 @@
+struct foo
+{
+  int member0;
+  char member1;
+  char pad[];
+};
+
+void
+foo(struct foo * p __attribute__((unused)))
+{
+}
diff --git a/tests/data/test-abidiff-exit/test-fam1-v1.o b/tests/data/test-abidiff-exit/test-fam1-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..3bfcfc3f15baea9759c977da0a2f38f84f2527ad
GIT binary patch
literal 3224
zcmb_eOOG2x5U%#v>+w$ZX#~40XlJ9KJj9IcB`nK^4Mr;xuZW@$DMz#!+hco(U$V!G
z2?B(WkRpT>1QHxL0Yc(N1PAV1_ywG~@B_FZae%6sYP;Q;C@7*NPgQ+gUv+i$bdTSE
z^~$A`5FkasMVNXL1^6;MwabxNhQ}ZeH!64jsN8w?ue)#j@)N=t5GIWp^mv*cs#uDX
zZuEL!3SoK(Ml%{&GGjY!w$Myx`d%GG#_XY!fw^=h=!TFIa}<}Qi1+Yk(gRXvRAG+N
ziri!ga!T>lJq()f<Jc-$sZU#AnJzKK0vL;XTjGNCqIH<xMMmlrSk^_$Sj2^_h-Vh_
zma)09xgu7x%THicd108AwPz7Q<gqeLV8(9DpJP6@A}hpUo`TFRI7F3m#mnn5`t&;G
zEU(>Or-=ECk|wnVU@c)8M1p6jVyYFQ?nV|p<mx5>8x_<Uj6H{12=Vvg0x4<={?OQr
z`jZlysiin=#LEcCO<W@<K1>-HeEI4P`=IoKT`IZf-IBds+<vaOQ+(b&bKS4o6))rg
zXZx(}biz^B-*5U|e-PBr^#--p{&;uC**WhVZ`)22+P!Ym9(9L7vx{`v&RWYGK*#S?
z{Xvm+2||AuIt{N=a*j)G4GOJZ$1l`-^*4h;GYAXqpz2kFrWdpe7~~8`{r;dpoMEBv
zg<fPj7*P)z4aXk`;s209D@k+V^1;ELeFmF#_CItA@a)7QZeIs6UKSfCvgTdfm8TG<
zA4#;kuPiQqlsZ_LyMzHTocN>-O~ar6Bn{#&Cc$_}C%Zi}Zp6oT1|!G78Ir_+=s?~#
zWPoyMD5D1C6mM!84|tyqI57=UECcX>CWrw`2`JUSa38*m$g0wx$%)eTm#!5Oxd-!T
ztE-lo30GIQN+cA*=_loJHY6@9ev)z8F?Dy&De<xff?iT^n%8HaZU7R>Pk4tMlv}Zy
z;5XU-K*O)H{|Rfo9=UePpWzr%)K3yU{$vbK`tUmYbhDAjK71CtP+~3dui3xATF-AY
zPCZlm2JZ0fPUuxphl5zRq!s$(5L~)2z^x94;12w@=hpq|sCg808$BG0Y_D1!_{THD
z-oWcN{aH#o==zd^Q%IBGqsXuIIvpQxJh$5meHX6^XBc|5Tb$T$9W@4CM{Xdm=TX%L
z5~)XWpJbjg8<Y2(eTr3O3mw9u54ke%nqsS_&OeQV^qxK{pY~tRN%P71e<nu}J(k`p
zx~<Ae44FlKSxqLaAVzWWOyOrYl6`#YIcdOP@S7-V`p{#q;gF6|^mhyvr_{*OV`-g9
z_3!eAN<P(3x2#@&9Wgy8Lhu`dSIALBk3GV%r1@Js|4ru7{B*zQ^Y;;>oU%?dBRR>3
zb0h)Qa(=1bK|G271@rGcg#Yma_!WL33lHIc&U`Hl-qK%a4v=-r`0trNa~B~tX8x`W
zWG(wA;cwAM>i@6YfBBwL|LNNy`4Xpk^tlm&A9(&27fjzL`ikm&+S8<^uJQSi|6edH
U5`FztR}%ksuK!2oNu~4u1vo+YiU0rr

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/test-fam2-report-1.txt b/tests/data/test-abidiff-exit/test-fam2-report-1.txt
new file mode 100644
index 00000000..e922b423
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam2-report-1.txt
@@ -0,0 +1,14 @@
+Functions changes summary: 0 Removed, 1 Changed, 0 Added function
+Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+
+1 function with some indirect sub-type change:
+
+  [C] 'function void foo(foo*)' at test-fam2-v0.c:8:1 has some indirect sub-type changes:
+    parameter 1 of type 'foo*' has sub-type changes:
+      in pointed to type 'struct foo' at test-fam2-v1.c:1:1:
+        type size hasn't changed
+        1 data member insertion:
+          'char member1', at offset 32 (in bits) at test-fam2-v1.c:4:1
+        1 data member change:
+          'char pad[10]' offset changed from 32 to 40 (in bits) (by +8 bits)
+
diff --git a/tests/data/test-abidiff-exit/test-fam2-v0.c b/tests/data/test-abidiff-exit/test-fam2-v0.c
new file mode 100644
index 00000000..2403e6cf
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam2-v0.c
@@ -0,0 +1,10 @@
+struct foo
+{
+  int member0;
+  char pad[10];
+};
+
+void
+foo(struct foo * p __attribute__((unused)))
+{
+}
diff --git a/tests/data/test-abidiff-exit/test-fam2-v0.o b/tests/data/test-abidiff-exit/test-fam2-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..e5cc0b042e78465c477f6905b60bc70a446d38ea
GIT binary patch
literal 3184
zcmb_e&2Jl35TEC@<4v}4oVcP*1IiYG`XP4xK^sC#icv(G0IHx;xmD@fUfT=awYA=a
zP=q)XAyr(8;0RKMkPsY@5SQLL^Jny4ZXgbHW<Ae+d0iw#8EJQBe)IW0cRzXkt*x98
zAW6U_c%(@bU{ri0H&d|*N1+1Owr}6xzWwnZcdq~XBf<p`CRuazdWK#qS&CwGheId}
zVZMuCo(#e$k_?5B*8!0?ucMrYnS3FL5-299h4`5Cn#D3{Lqg1;3bT|<nA65(A@TM1
zXq_9OZHc7Z7k#iymqNsIU|E+eqlD<9c)nDzjMbIZMX^*Y9|JHd!Z0oCf_2e)*%B3O
zWFCytMBS;ZWBvjHrV7k(LL7flh@A>WnI~bVQbq4sSG>9`{ZB1Zndb4E%j7dxP!i>i
z16T{#*$!IZ1!|d^g>+I=iC%JeQ-Fmn<OTFSi(CltS81LY%?ds!tfmu`6RWv}N!m27
zAYgW?p174W(Dm|_YxZXSCA(gC&$)HGQER+dTdSS7Pha&r_O_R>!D*baoiN#p{EeO;
z`Ek%j)r;Hxjf3?yXYHJ`->{t?42Dt9-iyXTFT!wI&d?8Aeq4ig--{vf$BEPR!iKY7
zbK6ku4@1A&8Ft<as=Xko4uY1~3VL2JsG^fI-W!eLD#eVe9WU`x(Ls++(Cs?@L6H0p
z8MKx(6)taXUa(K&B%S#eGn7v9(e#b0aPumNgR)pTQZ(=2ay*SVJw)lUzE&!KmfM`4
z*+Pd2ocX4e%){@0XBlw;vtTfIGwDVHEm>qt&gEk!1JXm6fh(7UVm0u*W|8p^8`*#(
zS?<^+9@Y#pU?Bs=Lk#ne;blaYl=+z+C2fi6LLriCFo&`_YMGgEb#zM<ghV(!lAdBg
z;<DotjMIuu4<X8D6@S?SL9Zw{)xE*`NW-tN{(*+~S--_xuPet$eHPe<7|k1z?*Hrr
zo{sk&*6HdZlH>hyqC%ay#J^?zB6B^z%{a}CIzQl!KMWJEg*=HTyf3B1KS;o(y8+zR
zcnogr4?MTyxAuCwLDU_hEtS1iEB5yfnZ4MHdj8>%K@j;e1WQPf;N4Vj55v&MOU;dj
ziSOdA;EWTm{XQr5`@7xP3w<8Q6S5VIr#X`AB-1rnnC@rR$ycS5s1T-~_%~H2Mb_g_
zp^f(Ae~qX0*K<-iS^p<e6w-ZZU(w$}Q}H3u=FR$m@kQk1C(jOkS5w-+x1N&>f2LM|
z@0d%b`@W3^9V6dw7_7-a=DIJ9GpqkHFQ|;C{^>T=`|lv8=R^p8WAF`96w-Zn(Uw)e
z$@On=EY+v`MXx_XjB?68QB3I=A5Qu^Q%TmB{3A4G#ed52KdZs)OOTBJoMpZKdESs!
za#l#jN&Xeuq^!6>N8iwF)O~;8_(OLQVttNZSCgVF=TE}4zq024F3-Q*r!@ccjgavY
xr+)O>2*F*h-{*$uJ49bgJ)YJyYp5olANikxZYk;Gr@pe{?{WXXaGYd%{6j_-^xgmf

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/test-fam2-v1.c b/tests/data/test-abidiff-exit/test-fam2-v1.c
new file mode 100644
index 00000000..35002c53
--- /dev/null
+++ b/tests/data/test-abidiff-exit/test-fam2-v1.c
@@ -0,0 +1,12 @@
+struct foo
+{
+  int member0;
+  char member1;	     /*  This is an added data member.  */
+  char pad[10]; 	     /*  This is not a fam, so the change should not be
+				 suppressed.  */
+};
+
+void
+foo(struct foo * p __attribute__((unused)))
+{
+}
diff --git a/tests/data/test-abidiff-exit/test-fam2-v1.o b/tests/data/test-abidiff-exit/test-fam2-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..867701a692dd3f2a056d5154c11336ffe4602e52
GIT binary patch
literal 3232
zcmb_e-ESL35TEtg@x|9TPK=--pj;4DKg69sC?TYz7)7*+T2)Y~k0?FcXZxsqw(N5h
zf>04iNEH$)f+xfSLh#T>KuGkNe}Gs103=>{L*fBu?q)CN?Nvn;BYAh`Hy=AYv%BZp
zZ(O~U5dtI$xCqCRL;=3eAM=fnZNL*yh8w$ge&4<G{$F?B{^cixb0BomYBW4cLz0Yy
zknIeIP!d9S5DZt;^2A1bR_`I3&5fKkh@3t|AqR8WoaYCS5p!ghCyU$o(`lH8j2@;q
zPjN*d-h*6IeDwpG6-KCACNA??4-DN#4#Waz#jSO5!Fa{kD{rDl=6NuTi-uOjoh*q{
z#j>HTt*$MJ<$UQWOsgz3-7vNcau8)q4Fl+r82Qh!Kh`2I#9o<<^mW)PS1|azEnZuZ
z_NP}UYUAY53fUBLi9nf?0LCIFvWFUYfpVs7AuMpn(IEF11I+B=oI~4lI13^EE-uhS
zWx*dZYhi^lVlA^6g$@030_I~;D~OLW8X8}|cEjAMy=>NM_IbNz)~odws~gpq%rn>B
zwz=yBtgz~5O=}QLeRsR-`tI0kq3DcTz3s!z4Qu1Pbx=30F7$_f*PQwjuj`{bb+pxU
z#xQUPO?O=7xdwqd39ODYs9Og$y9JfraNt(j!}dE~rRxQizSne`Uf1#Z6*RIY)6r;L
zA)iU5?F3H9T4>SsIvvYB^n(8(f|8OV!sVTvE%OW(>+FB1R9J4nI~0*Px(?#7Bvw!4
z^}E=bXAq_zQP|?wi=~e<I}3A{&>(_SN9t-8{`@CRiLFe7@v_D(pV4d4HJ-sp&~Sw`
z(jdH;52!RqJRS+HhPO72w1*sO4Njz)V?KCKQ%Hlw6qNE`cmOXUvYe<-e65rw)9XSc
zdr&|=xoa7j@Z|26$q9*Y`bm0{8Hvk`pJtpomh8^CguTpxpjQ((t?RN(&j1m{CwxEx
z(yeHU@tZ7vsNmOF{*-4mAGvpmpJN-EsGdZs{c{l<*WoRe>3JiPb@)6Ip~kbszhU_T
z&uV;=ajF^pVzMXi4g#kM_9Pfbb5C-Cdl-OCuLju7$pq}N+js1?+njdyJ-;(VUC2Al
z=GZ-$Q9EPD@4B-teb0BL3oap9g7-tYH5?3FeD-XA7`QgR7uF<jTDLf`+uQGqoq=p%
zyn)AKR?&@WB>N<zG?<CcIm=|5q;(Vs3qR-y#gzn~WL5vusHAiHxc=0CH72bm*S}9f
zf>c{NSM*vn5;nwc@?q84VF@v^lXnWgy&-MmsKz8kmcj2rtK&hneG^qGM%MQjtRB0D
zoN7z^Ov}H)4VC_sKfSVQ{%yq6m<Yjd3|=K6L8|RO>eAL9@%lH}m)58EMO}Y{7{!!%
zA{){vzMNAD@GRGt^LvP=`G3j&-#^0tlZW_U;R9KDg#Q=pub9D+dZ5`r<}K~-vH#3l
zgxCk{zbOrQmi3eHx5%W`|5vWRJf~ED`gTZviBmr6+6ckVync@prtcGdMOA<5Y1&pz
bzCZH+3z~(b?w|5X^Z$eM|B?OVr2790Gb;H(

literal 0
HcmV?d00001

diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index b9ea4792..42b717f6 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1080,6 +1080,111 @@ InOutSpec in_out_specs[] =
     "data/test-abidiff-exit/test-anon-types-report-1.txt",
     "output/test-abidiff-exit/test-anon-types-report-1.txt"
   },
+  {
+    "data/test-abidiff-exit/test-fam1-v0.o",
+    "data/test-abidiff-exit/test-fam1-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/test-fam1-report-1.txt",
+    "output/test-abidiff-exit/test-fam1-report-1.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-fam1-v0.o",
+    "data/test-abidiff-exit/test-fam1-v1.o",
+    "data/test-abidiff-exit/test-fam1-suppr-1.abignore",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_OK,
+    "data/test-abidiff-exit/test-fam1-report-2.txt",
+    "output/test-abidiff-exit/test-fam1-report-2.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-fam1-v0.o",
+    "data/test-abidiff-exit/test-fam1-v1.o",
+    "data/test-abidiff-exit/test-fam1-suppr-2.abignore",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/test-fam1-report-3.txt",
+    "output/test-abidiff-exit/test-fam1-report-3.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-fam1-v0.o",
+    "data/test-abidiff-exit/test-fam1-v1.o",
+    "data/test-abidiff-exit/test-fam1-suppr-3.abignore",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_OK,
+    "data/test-abidiff-exit/test-fam1-report-4.txt",
+    "output/test-abidiff-exit/test-fam1-report-4.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-fam1-v0.o",
+    "data/test-abidiff-exit/test-fam1-v1.o",
+    "data/test-abidiff-exit/test-fam1-suppr-4.abignore",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/test-fam1-report-5.txt",
+    "output/test-abidiff-exit/test-fam1-report-5.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-fam2-v0.o",
+    "data/test-abidiff-exit/test-fam2-v1.o",
+    "data/test-abidiff-exit/test-fam1-suppr-1.abignore",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/test-fam2-report-1.txt",
+    "output/test-abidiff-exit/test-fam2-report-1.txt"
+  },
+  {
+    "data/test-abidiff-exit/test-fam2-v0.o",
+    "data/test-abidiff-exit/test-fam2-v1.o",
+    "data/test-abidiff-exit/test-fam1-suppr-3.abignore",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/test-fam2-report-1.txt",
+    "output/test-abidiff-exit/test-fam2-report-1.txt"
+  },
 #ifdef WITH_BTF
   {
     "data/test-abidiff-exit/btf/test0-v0.o",
-- 
2.39.3


-- 
		Dodji


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

* [PATCH 7/7, applied] suppression: Make the "end" data member offset selector be named boundary
  2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
                   ` (5 preceding siblings ...)
  2023-10-20 10:03 ` [PATCH 6/7, applied] Support suppressing data member insertion before a flexible array member Dodji Seketeli
@ 2023-10-20 10:04 ` Dodji Seketeli
  6 siblings, 0 replies; 8+ messages in thread
From: Dodji Seketeli @ 2023-10-20 10:04 UTC (permalink / raw)
  To: Dodji Seketeli
  Cc: John Moon, Trilok Soni, Satya Durga Srinivasu Prabhala, libabigail

Hello,

Now that we have what is called a "named boundary", introduced by
commit [1], this patch re-writes the handling of the "end" data member
offset selector (used in expressions like: offset_of(end) in
suppression specifications) in terms of the new "named boundary"
infrastructure.  In other words, the "end" keyword is now a named
boundary constant, just like the
"offset_of_flexible_array_data_member" is a named boundary constant.

[1]: The patch that introduced the concept of "named boundary" is this
one:

    commit b12ba51e62de7c61526bd0a0cac6cc9bcf28fdee
    Author: Dodji Seketeli <dodji@redhat.com>
    Date:   Thu Oct 5 13:32:21 2023 +0200

	Support suppressing data member insertion before a flexible array member

	* src/abg-suppression.cc (END_STRING): Define new static string
	constant accessor.
	(type_suppression::insertion_range::eval_boundary): Eval the "end"
	named boundary as having a numerical value of
	std::numeric_limits<uint64_t>::max().
	(read_type_suppression): Parse the "end" token as a named
	boundary.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 src/abg-suppression.cc | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index d84857ba..326d003e 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -51,6 +51,14 @@ OFFSET_OF_FLEXIBLE_ARRAY_DATA_MEMBER_STRING()
   return s;
 }
 
+/// @return the string constant "end";
+static const string&
+END_STRING()
+{
+  static string s = "end";
+  return s;
+}
+
 // <parsing stuff>
 
 // section parsing
@@ -1602,6 +1610,14 @@ type_suppression::insertion_range::eval_boundary(const boundary_sptr	boundary,
 	      return true;
 	    }
 	}
+      else if (b->get_name() == END_STRING())
+	{
+	  // The 'end' of a struct is represented by the value
+	  // std::numeric_limits<uint64_t>::max(), recognized by
+	  // type_suppression::insertion_range::boundary_value_is_end.
+	  value = std::numeric_limits<uint64_t>::max();
+	  return true;
+	}
     }
   return false;
 }
@@ -2100,8 +2116,8 @@ read_type_suppression(const ini::config::section& section)
       //   has_data_member_inserted_at = <one-string-property-value>
       string ins_point = prop->get_value()->as_string();
       type_suppression::insertion_range::boundary_sptr begin, end;
-      if (ins_point == "end")
-	begin = type_suppression::insertion_range::create_integer_boundary(-1);
+      if (ins_point == END_STRING())
+	begin = type_suppression::insertion_range::create_named_boundary(ins_point);
       else if (ins_point == OFFSET_OF_FLEXIBLE_ARRAY_DATA_MEMBER_STRING())
 	begin = type_suppression::insertion_range::create_named_boundary(ins_point);
       else if (isdigit(ins_point[0]))
-- 
2.39.3



-- 
		Dodji


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

end of thread, other threads:[~2023-10-20 10:04 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-20  9:55 [PATCH 0/7, applied to mainline] Support the Linux Kernel UAPI checker project Dodji Seketeli
2023-10-20  9:57 ` [PATCH 1/7, applied] suppression: Add "changed_enumerators_regexp" property Dodji Seketeli
2023-10-20  9:58 ` [PATCH 2/7, applied] default-reporter,reporter-priv: Do not report names of anonymous enums Dodji Seketeli
2023-10-20  9:59 ` [PATCH 3/7, applied] ir,comparison,corpus: Better support anonymous enums comparison Dodji Seketeli
2023-10-20 10:00 ` [PATCH 4/7, applied] ir,comparison: Represent changed anonymous enums Dodji Seketeli
2023-10-20 10:01 ` [PATCH 5/7, applied] comparison: Represent changed unreachable anonymous unions, structs & enums Dodji Seketeli
2023-10-20 10:03 ` [PATCH 6/7, applied] Support suppressing data member insertion before a flexible array member Dodji Seketeli
2023-10-20 10:04 ` [PATCH 7/7, applied] suppression: Make the "end" data member offset selector be named boundary 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).