[1/4,applied] Improve type naming

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index de5b72b0..3687d346 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -436,6 +436,9 @@  is_anonymous_type(const type_base*);
 bool
 is_anonymous_type(const type_base_sptr&);
 
+bool
+is_npaf_type(const type_base_sptr&);
+
 const type_decl*
 is_type_decl(const type_or_decl_base*);
 
@@ -536,26 +539,35 @@  is_compatible_with_class_type(const type_base_sptr&);
 class_decl_sptr
 is_compatible_with_class_type(const decl_base_sptr&);
 
-pointer_type_def*
-is_pointer_type(type_or_decl_base*);
-
 const pointer_type_def*
-is_pointer_type(const type_or_decl_base*);
+is_pointer_type(const type_or_decl_base*,
+		bool look_through_qualifiers=false);
+
+pointer_type_def_sptr
+is_pointer_type(const type_or_decl_base_sptr&,
+		bool look_through_qualifiers=false);
+
+pointer_type_def_sptr
+is_pointer_to_function_type(const type_base_sptr&);
+
+pointer_type_def_sptr
+is_pointer_to_array_type(const type_base_sptr&);
 
 pointer_type_def_sptr
-is_pointer_type(const type_or_decl_base_sptr&);
+is_pointer_to_npaf_type(const type_base_sptr&);
 
 bool
 is_typedef_ptr_or_ref_to_decl_only_class_or_union_type(const type_base* t);
 
 reference_type_def*
-is_reference_type(type_or_decl_base*);
+is_reference_type(type_or_decl_base*, bool look_through_qualifiers=false);
 
 const reference_type_def*
-is_reference_type(const type_or_decl_base*);
+is_reference_type(const type_or_decl_base*, bool look_through_qualifiers=false);
 
 reference_type_def_sptr
-is_reference_type(const type_or_decl_base_sptr&);
+is_reference_type(const type_or_decl_base_sptr&,
+		  bool look_through_qualifiers=false);
 
 const type_base*
 is_void_pointer_type(const type_base*);
@@ -799,10 +811,12 @@  const class_or_union_sptr
 data_member_has_anonymous_type(const var_decl_sptr& d);
 
 array_type_def*
-is_array_type(const type_or_decl_base* decl);
+is_array_type(const type_or_decl_base* decl,
+	      bool look_through_qualifiers = false);
 
 array_type_def_sptr
-is_array_type(const type_or_decl_base_sptr& decl);
+is_array_type(const type_or_decl_base_sptr& decl,
+	      bool look_through_qualifiers = false);
 
 array_type_def_sptr
 is_array_of_qualified_element(const type_base_sptr&);
diff --git a/include/abg-ir.h b/include/abg-ir.h
index 0cb378ad..8ed8d734 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -1485,9 +1485,6 @@  public:
   friend class_decl*
   is_class_type(const type_or_decl_base*);
 
-  friend pointer_type_def*
-  is_pointer_type(type_or_decl_base*);
-
   friend type_base*
   is_type(const type_or_decl_base*);
 
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 78a4dfe0..06cfe558 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -221,6 +221,49 @@  update_qualified_name(decl_base * d);
 static void
 update_qualified_name(decl_base_sptr d);
 
+static interned_string
+pointer_declaration_name(const type_base* ptr,
+			 const string& variable_name,
+			 bool qualified, bool internal);
+
+static interned_string
+pointer_declaration_name(const type_base_sptr& ptr,
+			 const string& variable_name,
+			 bool qualified, bool internal);
+
+static interned_string
+array_declaration_name(const array_type_def* array,
+		       const string& variable_name,
+		       bool qualified, bool internal);
+
+static interned_string
+array_declaration_name(const array_type_def_sptr& array,
+		       const string& variable_name,
+		       bool qualified, bool internal);
+
+static void
+stream_pretty_representation_of_fn_parms(const function_type& fn_type,
+					 ostream& o, bool qualified,
+					 bool internal);
+static string
+add_outer_pointer_to_fn_type_expr(const type_base* pointer_to_fn,
+				  const string& input, bool qualified,
+				  bool internal);
+
+static string
+add_outer_pointer_to_fn_type_expr(const type_base_sptr& pointer_to_fn,
+				  const string& input, bool qualified,
+				  bool internal);
+
+static string
+add_outer_pointer_to_array_type_expr(const type_base* pointer_to_ar,
+				     const string& input, bool qualified,
+				     bool internal);
+
+static string
+add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar,
+				     const string& input, bool qualified,
+				     bool internal);
 void
 push_composite_type_comparison_operands(const type_base& left,
 					const type_base& right);
@@ -9121,24 +9164,10 @@  get_function_type_name(const function_type& fn_type,
     : fn_type.get_return_type();
   const environment& env = fn_type.get_environment();
 
-  o <<  get_pretty_representation(return_type, internal);
-
-  o << " (";
-  type_base_sptr type;
-  for (function_type::parameters::const_iterator i =
-	 fn_type.get_parameters().begin();
-       i != fn_type.get_parameters().end();
-       ++i)
-    {
-      if (i != fn_type.get_parameters().begin())
-	o << ", ";
-      type = (*i)->get_type();
-      if (internal)
-	type = peel_typedef_type(type);
-      o << get_pretty_representation(type, internal);
-    }
-  o <<")";
-
+  o <<  get_pretty_representation(return_type, internal) << " ";
+  stream_pretty_representation_of_fn_parms(fn_type, o,
+					   /*qualified=*/true,
+					   internal);
   return env.intern(o.str());
 }
 
@@ -9236,28 +9265,10 @@  get_method_type_name(const method_type& fn_type,
   class_or_union_sptr class_type = fn_type.get_class_type();
   ABG_ASSERT(class_type);
 
-  o << " (" << class_type->get_qualified_name(internal) << "::*)"
-    << " (";
-
-  type_base_sptr type;
-  for (function_type::parameters::const_iterator i =
-	 fn_type.get_parameters().begin();
-       i != fn_type.get_parameters().end();
-       ++i)
-    {
-      if (i != fn_type.get_parameters().begin())
-	o << ", ";
-      type = (*i)->get_type();
-      if (internal)
-	type = peel_typedef_type(type);
-      if (*i)
-	o << type->get_cached_pretty_representation(internal);
-      else
-	// There are still some abixml files out there in which "void"
-	// can be expressed as an empty type.
-	o << "void";
-    }
-  o <<")";
+  o << " (" << class_type->get_qualified_name(internal) << "::*) ";
+  stream_pretty_representation_of_fn_parms(fn_type, o,
+					   /*qualified=*/true,
+					   internal);
 
   return env.intern(o.str());
 }
@@ -10563,6 +10574,21 @@  bool
 is_anonymous_type(const type_base_sptr& t)
 {return is_anonymous_type(t.get());}
 
+/// Test if a type is a neither a pointer, an array nor a function
+/// type.
+///
+/// @param t the type to consider.
+///
+/// @return true if the @p t is NOT a pointer, an array nor a
+/// function.
+bool
+is_npaf_type(const type_base_sptr& t)
+{
+  if (!(is_pointer_type(t) || is_array_type(t) || is_function_type(t)))
+    return true;
+  return false;
+}
+
 /// Test whether a type is a type_decl (a builtin type).
 ///
 /// @return the type_decl* for @t if it's type_decl, otherwise, return
@@ -11055,43 +11081,97 @@  is_union_type(const shared_ptr<type_or_decl_base>& t)
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// pointer_type_def.
+///
 /// @return the @ref pointer_type_def_sptr if @p t is a
 /// pointer_type_def, null otherwise.
-pointer_type_def*
-is_pointer_type(type_or_decl_base* t)
+const pointer_type_def*
+is_pointer_type(const type_or_decl_base* t,
+		bool look_through_qualifiers)
 {
   if (!t)
     return 0;
 
-  if (t->kind() & type_or_decl_base::POINTER_TYPE)
-    return reinterpret_cast<pointer_type_def*>
-      (const_cast<type_or_decl_base*>(t)->runtime_type_instance());
+  const type_base* type = is_type(t);
+  if (look_through_qualifiers)
+    type = peel_qualified_type(is_type(t));
 
-  return 0;
+  return dynamic_cast<pointer_type_def*>(const_cast<type_base*>(type));
 }
 
 /// Test whether a type is a pointer_type_def.
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// pointer_type_def.
+///
 /// @return the @ref pointer_type_def_sptr if @p t is a
 /// pointer_type_def, null otherwise.
-const pointer_type_def*
-is_pointer_type(const type_or_decl_base* t)
+pointer_type_def_sptr
+is_pointer_type(const type_or_decl_base_sptr &t,
+		bool look_through_qualifiers)
 {
-  return is_pointer_type(const_cast<type_or_decl_base*>(t));
+  type_base_sptr type = is_type(t);
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_pointer_cast<pointer_type_def>(type);
 }
 
-/// Test whether a type is a pointer_type_def.
+/// Test if a type is a pointer to function type.
 ///
-/// @param t the type to test.
+/// @param t the type to consider.
 ///
-/// @return the @ref pointer_type_def_sptr if @p t is a
-/// pointer_type_def, null otherwise.
+/// @return the @ref pointer_type_def_sptr iff @p t is a pointer to
+/// function type.
 pointer_type_def_sptr
-is_pointer_type(const type_or_decl_base_sptr &t)
-{return dynamic_pointer_cast<pointer_type_def>(t);}
+is_pointer_to_function_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_function_type(p->get_pointed_to_type()))
+	return p;
+    }
+  return pointer_type_def_sptr();
+}
+
+/// Test if a type is a pointer to array type.
+///
+/// @param t the type to consider.
+///
+/// @return the pointer_type_def_sptr iff @p t is a pointer to array
+/// type.
+pointer_type_def_sptr
+is_pointer_to_array_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_array_type(p->get_pointed_to_type()))
+	return p;
+    }
+  return pointer_type_def_sptr();
+}
 
+/// Test if we are looking at a pointer to a
+/// neither-a-pointer-to-an-array-nor-a-function type.
+///
+/// @param t the type to consider.
+///
+/// @return the @ref pointer_type_def_sptr type iff @p t is a
+/// neither-a-pointer-an-array-nor-a-function type.
+pointer_type_def_sptr
+is_pointer_to_npaf_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_npaf_type(p->get_pointed_to_type()))
+	return p;
+    }
+  return pointer_type_def_sptr();
+}
 
 /// Test if a type is a typedef, pointer or reference to a decl-only
 /// class/union.
@@ -11119,31 +11199,65 @@  is_typedef_ptr_or_ref_to_decl_only_class_or_union_type(const type_base* t)
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// reference_type_def.
+///
 /// @return the @ref reference_type_def_sptr if @p t is a
 /// reference_type_def, null otherwise.
 reference_type_def*
-is_reference_type(type_or_decl_base* t)
-{return dynamic_cast<reference_type_def*>(t);}
+is_reference_type(type_or_decl_base* t,
+		  bool look_through_qualifiers)
+{
+  const type_base* type = is_type(t);
+  if (!type)
+    return nullptr;
+
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_cast<reference_type_def*>(const_cast<type_base*>(type));
+}
 
 /// Test whether a type is a reference_type_def.
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// reference_type_def.
+///
 /// @return the @ref reference_type_def_sptr if @p t is a
 /// reference_type_def, null otherwise.
 const reference_type_def*
-is_reference_type(const type_or_decl_base* t)
-{return dynamic_cast<const reference_type_def*>(t);}
+is_reference_type(const type_or_decl_base* t,
+		  bool look_through_qualifiers)
+{
+  const type_base* type = is_type(t);
+
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_cast<const reference_type_def*>(type);
+}
 
 /// Test whether a type is a reference_type_def.
 ///
 /// @param t the type to test.
 ///
+/// @param look_through_decl_only if this is true, then look through
+/// qualified types to see if the underlying type is a
+/// reference_type_def.
+///
 /// @return the @ref reference_type_def_sptr if @p t is a
 /// reference_type_def, null otherwise.
 reference_type_def_sptr
-is_reference_type(const type_or_decl_base_sptr& t)
-{return dynamic_pointer_cast<reference_type_def>(t);}
+is_reference_type(const type_or_decl_base_sptr& t,
+		  bool look_through_qualifiers)
+{
+  type_base_sptr type = is_type(t);
+  if (look_through_qualifiers)
+    type = peel_qualified_type(type);
+  return dynamic_pointer_cast<reference_type_def>(type);
+}
 
 /// Test if a type is equivalent to a pointer to void type.
 ///
@@ -11226,7 +11340,7 @@  is_void_pointer_type(const type_base_sptr& t)
   if (t->get_environment().get_void_pointer_type().get() == t.get())
     return t;
 
-  pointer_type_def* ptr = is_pointer_type(t.get());
+  const pointer_type_def* ptr = is_pointer_type(t.get());
   if (!ptr)
     return nil;
 
@@ -11528,8 +11642,15 @@  is_function_template_pattern(const shared_ptr<decl_base> decl)
 ///
 /// @return true iff @p type is an array_type_def.
 array_type_def*
-is_array_type(const type_or_decl_base* type)
-{return dynamic_cast<array_type_def*>(const_cast<type_or_decl_base*>(type));}
+is_array_type(const type_or_decl_base* type,
+	      bool look_through_qualifiers)
+{
+  const type_base* t = is_type(type);
+
+  if (look_through_qualifiers)
+    t = peel_qualified_type(t);
+  return dynamic_cast<array_type_def*>(const_cast<type_base*>(t));
+}
 
 /// Test if a type is an array_type_def.
 ///
@@ -11537,8 +11658,15 @@  is_array_type(const type_or_decl_base* type)
 ///
 /// @return true iff @p type is an array_type_def.
 array_type_def_sptr
-is_array_type(const type_or_decl_base_sptr& type)
-{return dynamic_pointer_cast<array_type_def>(type);}
+is_array_type(const type_or_decl_base_sptr& type,
+	      bool look_through_qualifiers)
+{
+  type_base_sptr t = is_type(type);
+
+  if (look_through_qualifiers)
+    t = peel_qualified_type(t);
+  return dynamic_pointer_cast<array_type_def>(t);
+}
 
 /// Tests if the element of a given array is a qualified type.
 ///
@@ -17419,13 +17547,14 @@  pointer_type_def::get_qualified_name(bool internal) const
 	  if (priv_->internal_qualified_name_.empty())
 	    if (pointed_to_type)
 	      priv_->internal_qualified_name_ =
-		get_name_of_pointer_to_type(*pointed_to_type,
-					    /*qualified_name=*/
-					    is_typedef(pointed_to_type)
-					    ? false
-					    : true,
-					    /*internal=*/true);
-	  return priv_->internal_qualified_name_;
+		pointer_declaration_name(this,
+					 /*variable_name=*/"",
+					 /*qualified_name=*/
+					 is_typedef(pointed_to_type)
+					 ? false
+					 : true,
+					 /*internal=*/true);
+		return priv_->internal_qualified_name_;
 	}
       else
 	{
@@ -17435,12 +17564,13 @@  pointer_type_def::get_qualified_name(bool internal) const
 	  // function.
 	  if (pointed_to_type)
 	    priv_->temp_internal_qualified_name_ =
-	      get_name_of_pointer_to_type(*pointed_to_type,
-					  /*qualified_name=*/
-					  is_typedef(pointed_to_type)
-					  ? false
-					  : true,
-					  /*internal=*/true);
+		pointer_declaration_name(this,
+					 /*variable_name=*/"",
+					 /*qualified_name=*/
+					 is_typedef(pointed_to_type)
+					 ? false
+					 : true,
+					 /*internal=*/true);
 	  return priv_->temp_internal_qualified_name_;
 	}
     }
@@ -17450,9 +17580,10 @@  pointer_type_def::get_qualified_name(bool internal) const
 	{
 	  if (decl_base::peek_qualified_name().empty())
 	    set_qualified_name
-	      (get_name_of_pointer_to_type(*pointed_to_type,
-					   /*qualified_name=*/true,
-					   /*internal=*/false));
+	      (pointer_declaration_name(this,
+					/*variable_name=*/"",
+					/*qualified_name=*/true,
+					/*internal=*/false));
 	  return decl_base::peek_qualified_name();
 	}
       else
@@ -17463,9 +17594,10 @@  pointer_type_def::get_qualified_name(bool internal) const
 	  // function.
 	  if (pointed_to_type)
 	    set_qualified_name
-	      (get_name_of_pointer_to_type(*pointed_to_type,
-					   /*qualified_name=*/true,
-					   /*internal=*/false));
+	      (pointer_declaration_name(this,
+					/*variable_name=*/"",
+					/*qualified_name=*/true,
+					/*internal=*/false));
 	  return decl_base::peek_qualified_name();
 	}
     }
@@ -18598,48 +18730,6 @@  array_type_def::get_subrange_representation() const
   return r;
 }
 
-/// Get the string representation of an @ref array_type_def.
-///
-/// @param a the array type to consider.
-///
-/// @param internal set to true if the call is intended for an
-/// internal use (for technical use inside the library itself), false
-/// otherwise.  If you don't know what this is for, then set it to
-/// false.
-static string
-get_type_representation(const array_type_def& a, bool internal)
-{
-  type_base_sptr e_type = a.get_element_type();
-  decl_base_sptr d = get_type_declaration(e_type);
-  string r;
-
-  if (is_ada_language(a.get_language()))
-    {
-      std::ostringstream o;
-      o << "array ("
-	<< a.get_subrange_representation()
-	<< ") of "
-	<<  e_type ? e_type->get_pretty_representation(internal):string("void");
-    }
-  else
-    {
-      if (internal)
-	r = (e_type
-	     ? get_type_name(e_type,
-			     /*qualified=*/true,
-			     /*internal=*/true)
-	     : string("void"))
-	  + a.get_subrange_representation();
-      else
-	r = (e_type
-	     ? get_type_name(e_type, /*qualified=*/true, /*internal=*/false)
-	     : string("void"))
-	  + a.get_subrange_representation();
-    }
-
-  return r;
-}
-
 /// Get the pretty representation of the current instance of @ref
 /// array_type_def.
 ///
@@ -18660,8 +18750,11 @@  get_type_representation(const array_type_def& a, bool internal)
 /// @return the pretty representation of the ABI artifact.
 string
 array_type_def::get_pretty_representation(bool internal,
-					  bool /*qualified_name*/) const
-{return get_type_representation(*this, internal);}
+					  bool qualified_name) const
+{
+  return array_declaration_name(this, /*variable_name=*/"",
+				qualified_name, internal);
+}
 
 /// Compares two instances of @ref array_type_def.
 ///
@@ -18891,22 +18984,22 @@  array_type_def::get_qualified_name(interned_string& qn, bool internal) const
 const interned_string&
 array_type_def::get_qualified_name(bool internal) const
 {
-  const environment& env = get_environment();
-
-
   if (internal)
     {
       if (get_canonical_type())
 	{
 	  if (priv_->internal_qualified_name_.empty())
 	    priv_->internal_qualified_name_ =
-	      env.intern(get_type_representation(*this, /*internal=*/true));
+	      array_declaration_name(this, /*variable_name=*/"",
+				     /*qualified=*/false,
+				     /*internal=*/true);
 	  return priv_->internal_qualified_name_;
 	}
       else
 	{
 	  priv_->temp_internal_qualified_name_ =
-	    env.intern(get_type_representation(*this, /*internal=*/true));
+	    array_declaration_name(this, /*variable_name=*/"",
+				   /*qualified*/false, /*internal*/true);
 	  return priv_->temp_internal_qualified_name_;
 	}
     }
@@ -18915,15 +19008,18 @@  array_type_def::get_qualified_name(bool internal) const
       if (get_canonical_type())
 	{
 	  if (decl_base::peek_qualified_name().empty())
-	    set_qualified_name(env.intern(get_type_representation
-					   (*this, /*internal=*/false)));
+	    set_qualified_name(array_declaration_name(this,
+						      /*variable_name=*/"",
+						      /*qualified=*/false,
+						      /*internal=*/false));
 	  return decl_base::peek_qualified_name();
 	}
       else
 	{
-	  set_temporary_qualified_name(env.intern(get_type_representation
-						   (*this,
-						    /*internal=*/false)));
+	  set_temporary_qualified_name
+	    (array_declaration_name(this, /*variable_name=*/"",
+				    /*qualified=*/false,
+				    /*internal=*/false));
 	  return decl_base::peek_temporary_qualified_name();
 	}
     }
@@ -20433,7 +20529,10 @@  var_decl::get_pretty_representation(bool internal, bool qualified_name) const
     if (scope->get_is_anonymous())
       member_of_anonymous_class = true;
 
-  if (array_type_def_sptr t = is_array_type(get_type()))
+  type_base_sptr type = get_type();
+  if (is_array_type(type, /*look_through_qualifiers=*/true)
+      || is_pointer_type(type, /*look_through_qualifiers=*/true)
+      || is_reference_type(type, /*look_through_qualifiers=*/true))
     {
       string name;
       if (member_of_anonymous_class || !qualified_name)
@@ -20441,12 +20540,22 @@  var_decl::get_pretty_representation(bool internal, bool qualified_name) const
       else
 	name = get_qualified_name(internal);
 
-      type_base_sptr et = t->get_element_type();
-      ABG_ASSERT(et);
-      decl_base_sptr decl = get_type_declaration(et);
-      ABG_ASSERT(decl);
-      result += decl->get_qualified_name(internal)
-	+ " " + name + t->get_subrange_representation();
+      if (qualified_type_def_sptr q = is_qualified_type(type))
+	{
+	  string quals_repr =
+	    get_string_representation_of_cv_quals(q->get_cv_quals());
+	  if (!quals_repr.empty())
+	    name = quals_repr + " " + name;
+	  type = peel_qualified_type(type);
+	}
+
+      name = string(" ") + name;
+      if (array_type_def_sptr t = is_array_type(type))
+	result += array_declaration_name(t, name, qualified_name, internal);
+      else if (pointer_type_def_sptr t = is_pointer_type(type))
+	result += pointer_declaration_name(t, name, qualified_name, internal);
+      else if (reference_type_def_sptr t = is_reference_type(type))
+	result += pointer_declaration_name(t, name, qualified_name, internal);
     }
   else
     {
@@ -21425,32 +21534,48 @@  function_decl::get_pretty_representation(bool internal,
   const method_decl* mem_fn =
     dynamic_cast<const method_decl*>(this);
 
-  string result = mem_fn ? "method ": "function ";
+  string fn_prefix = mem_fn ? "method ": "function ";
+  string result;
 
   if (mem_fn
       && is_member_function(mem_fn)
       && get_member_function_is_virtual(mem_fn))
-    result += "virtual ";
+    fn_prefix += "virtual ";
 
-  decl_base_sptr type;
+  decl_base_sptr return_type;
   if ((mem_fn
        && is_member_function(mem_fn)
        && (get_member_function_is_dtor(*mem_fn)
 	   || get_member_function_is_ctor(*mem_fn))))
     /*cdtors do not have return types.  */;
   else
-    type = mem_fn
+    return_type = mem_fn
       ? get_type_declaration(mem_fn->get_type()->get_return_type())
       : get_type_declaration(get_type()->get_return_type());
 
-  if (type)
-    result += get_type_name(is_type(type).get(),
-			    qualified_name,
-			    internal) + " ";
-
-  result += get_pretty_representation_of_declarator(internal);
+  result = get_pretty_representation_of_declarator(internal);
+  if (return_type)
+    {
+      if (is_npaf_type(is_type(return_type))
+	  || !(is_pointer_to_function_type(is_type(return_type))
+	       || is_pointer_to_array_type(is_type(return_type))))
+	result = get_type_name(is_type(return_type).get(), qualified_name,
+			       internal) + " " + result;
+      else if (pointer_type_def_sptr p =
+	       is_pointer_to_function_type(is_type(return_type)))
+	result = add_outer_pointer_to_fn_type_expr(p, result,
+						   /*qualified=*/true,
+						   internal);
+      else if(pointer_type_def_sptr p =
+	      is_pointer_to_array_type(is_type(return_type)))
+	result = add_outer_pointer_to_array_type_expr(p, result,
+						      qualified_name,
+						      internal);
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
 
-  return result;
+  return fn_prefix + result;
 }
 
 /// Compute and return the pretty representation for the part of the
@@ -21486,35 +21611,12 @@  function_decl::get_pretty_representation_of_declarator (bool internal) const
   else
     result += get_qualified_name();
 
-  result += "(";
-
-  parameters::const_iterator i = get_parameters().begin(),
-    end = get_parameters().end();
-
-  // Skip the first parameter if this is a method.
-  if (mem_fn && i != end)
-    ++i;
-  parameter_sptr parm;
-  parameter_sptr first_parm;
-  if (i != end)
-    first_parm = *i;
-  for (; i != end; ++i)
-    {
-      parm = *i;
-      if (parm.get() != first_parm.get())
-	result += ", ";
-      if (parm->get_variadic_marker()
-	  || get_environment().is_variadic_parameter_type(parm->get_type()))
-	result += "...";
-      else
-	{
-	  type_base_sptr type = parm->get_type();
-	  if (internal)
-	    type = peel_typedef_type(type);
-	  result += get_type_name(type, /*qualified=*/true, internal);
-	}
-    }
-  result += ")";
+  std::ostringstream fn_parms;
+  stream_pretty_representation_of_fn_parms(*get_type(),
+					   fn_parms,
+					   /*qualified=*/true,
+					   internal);
+  result += fn_parms.str();
 
   if (mem_fn
       &&((is_member_function(mem_fn) && get_member_function_is_const(*mem_fn))
@@ -22326,7 +22428,7 @@  function_decl::parameter::get_qualified_name(interned_string& qualified_name,
 /// function parameter.
 string
 function_decl::parameter::get_pretty_representation(bool internal,
-						    bool /*qualified_name*/) const
+						    bool qualified_name) const
 {
   const environment& env = get_environment();
 
@@ -22337,7 +22439,7 @@  function_decl::parameter::get_pretty_representation(bool internal,
   else if (env.is_variadic_parameter_type(t))
     type_repr = "...";
   else
-    type_repr = ir::get_pretty_representation(t, internal);
+    type_repr = ir::get_type_name(t, qualified_name, internal);
 
   string result = type_repr;
   string parm_name = get_name_id();
@@ -27775,6 +27877,545 @@  find_last_data_member_matching_regexp(const class_or_union& t,
   return var_decl_sptr();
 }
 
+/// Emit the pretty representation of the parameters of a function
+/// type.
+///
+/// @param fn_type the function type to consider.
+///
+/// @param o the output stream to emit the pretty representation to.
+///
+/// @param qualified if true, emit fully qualified names.
+///
+/// @param internal if true, then the result is to be used for the
+/// purpose of type canonicalization.
+static void
+stream_pretty_representation_of_fn_parms(const function_type& fn_type,
+					 ostream& o, bool qualified,
+					 bool internal)
+{
+  o << "(";
+  if (fn_type.get_parameters().empty())
+    o << "void";
+  else
+    {
+      type_base_sptr type;
+      auto end = fn_type.get_parameters().end();
+      auto first_parm = fn_type.get_first_non_implicit_parm();
+      function_decl::parameter_sptr parm;
+      const environment& env = fn_type.get_environment();
+      for (auto i = fn_type.get_first_non_implicit_parm(); i != end; ++i)
+	{
+	  if (i != first_parm)
+	    o << ", ";
+	  parm = *i;
+	  type = parm->get_type();
+	  if (env.is_variadic_parameter_type(type))
+	    o << "...";
+	  else
+	    {
+	      if (internal)
+		type = peel_typedef_type(type);
+	      o << get_type_name(type, qualified, internal);
+	    }
+	}
+    }
+  o << ")";
+}
+
+/// When constructing the name of a pointer to function type, add the
+/// return type to the left of the existing type identifier, and the
+/// parameters declarator to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "an array of pointer to function taking a char parameter and
+///    returning an int".
+///
+/// It's going to look like:
+///
+///   int(*a[])(char);
+///
+/// Suppose the caller of this function started to emit the inner
+/// "a[]" part of the expression already.  It thus calls this
+/// function with that input "a[]" part.  We consider that "a[]" as
+/// the "type identifier".
+///
+/// So the inner_expr is going to be "(*a[])".
+///
+/// The left_expr part is "int".  The right_expr part is "(char)".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to function type expression".
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to function type to consider.
+///
+/// @param input the type-id to use as the inner expression of the
+/// overall pointer-to-function type expression
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to function type.
+static string
+add_outer_pointer_to_fn_type_expr(const type_base* p,
+				  const string& input,
+				  bool qualified, bool internal)
+{
+  if (!p)
+    return "";
+
+  function_type_sptr pointed_to_fn;
+  string star_or_ref;
+
+  if (const pointer_type_def* ptr = is_pointer_type(p))
+    {
+      pointed_to_fn = is_function_type(ptr->get_pointed_to_type());
+      star_or_ref= "*";
+    }
+  else if (const reference_type_def* ref = is_reference_type(p))
+    {
+      star_or_ref = "&";
+      pointed_to_fn = is_function_type(ref->get_pointed_to_type());
+    }
+
+  if (!pointed_to_fn)
+    return "";
+
+  std::ostringstream left, right, inner;
+
+  inner <<  "(" << star_or_ref  << input << ")";
+
+  type_base_sptr type;
+  stream_pretty_representation_of_fn_parms(*pointed_to_fn, right,
+					   qualified, internal);
+  type_base_sptr return_type =
+    internal
+    ? peel_typedef_type(pointed_to_fn->get_return_type())
+    : pointed_to_fn->get_return_type();
+
+  string result;
+
+  if (is_npaf_type(return_type)
+      || !(is_pointer_to_function_type(return_type)
+	   || is_pointer_to_array_type(return_type)))
+    {
+      if (return_type)
+	left << get_type_name(return_type, qualified, internal);
+      result = left.str() + " " + inner.str() + right.str();
+    }
+  else if (pointer_type_def_sptr p = is_pointer_to_function_type(return_type))
+    {
+      string inner_string = inner.str() + right.str();
+      result = add_outer_pointer_to_fn_type_expr(p, inner_string,
+						 qualified, internal);
+    }
+  else if (pointer_type_def_sptr p = is_pointer_to_array_type(return_type))
+    {
+      string inner_string = inner.str() + right.str();
+      result = add_outer_pointer_to_array_type_expr(p, inner_string,
+						    qualified, internal);
+    }
+  else
+    ABG_ASSERT_NOT_REACHED;
+
+  return result;
+}
+
+/// When constructing the name of a pointer to function type, add the
+/// return type to the left of the existing type identifier, and the
+/// parameters declarator to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "an array of pointer to function taking a char parameter and
+///    returning an int".
+///
+/// It's going to look like:
+///
+///   int(*a[])(char);
+///
+/// Suppose the caller of this function started to emit the inner
+/// "a[]" part of the expression already.  It thus calls this
+/// function with that input "a[]" part.  We consider that "a[]" as
+/// the "type identifier".
+///
+/// So the inner_expr is going to be "(*a[])".
+///
+/// The left_expr part is "int".  The right_expr part is "(char)".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to function type expression".
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to function type to consider.
+///
+/// @param input the type-id to use as the inner expression of the
+/// overall pointer-to-function type expression
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to function type.
+static string
+add_outer_pointer_to_fn_type_expr(const type_base_sptr& p,
+				  const string& input,
+				  bool qualified, bool internal)
+{return add_outer_pointer_to_fn_type_expr(p.get(), input, qualified, internal);}
+
+/// When constructing the name of a pointer to array type, add the
+/// array element type type to the left of the existing type
+/// identifier, and the array declarator part to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "a pointer to an array of int".
+///
+/// It's going to look like:
+///
+///   int(*foo)[];
+///
+/// Suppose the caller of this function started to emit the inner
+/// "foo" part of the expression already.  It thus calls this function
+/// with that input "foo" part.  We consider that "foo" as the "type
+/// identifier".
+///
+/// So we are passed an input string that is "foo" and it's going to
+/// be turned into the inner_expr part, which is going to be "(*foo)".
+///
+/// The left_expr part is "int".  The right_expr part is "[]".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to array type expression".
+///
+/// The model of this function was taken from the article "Reading C
+/// type declaration", from Steve Friedl at
+/// http://unixwiz.net/techtips/reading-cdecl.html.
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to array type to consider.
+///
+/// @param input the type-id to start from as the inner part of the
+/// final type name.
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to array type.
+static string
+add_outer_pointer_to_array_type_expr(const type_base* p,
+				     const string& input, bool qualified,
+				     bool internal)
+{
+  if (!p)
+    return "";
+
+  string star_or_ref;
+  type_base_sptr pointed_to_type;
+
+  if (const pointer_type_def *ptr = is_pointer_type(p))
+    {
+      pointed_to_type = ptr->get_pointed_to_type();
+      star_or_ref = "*";
+    }
+  else if (const reference_type_def *ref = is_reference_type(p))
+    {
+      pointed_to_type = ref->get_pointed_to_type();
+      star_or_ref = "&";
+    }
+
+  array_type_def_sptr array = is_array_type(pointed_to_type);
+  if (!array)
+    return "";
+
+  std::ostringstream left, right, inner;
+  inner <<  "(" << star_or_ref  << input << ")";
+  right << array->get_subrange_representation();
+  string result;
+
+  type_base_sptr array_element_type = array->get_element_type();
+
+  if (is_npaf_type(array_element_type)
+      || !(is_pointer_to_function_type(array_element_type)
+	   || is_pointer_to_array_type(array_element_type)))
+    {
+      left << get_type_name(array_element_type, qualified, internal);
+      result = left.str() + inner.str() + right.str();
+    }
+  else if (pointer_type_def_sptr p =
+	   is_pointer_to_function_type(array_element_type))
+    {
+      string r = inner.str() + right.str();
+      result = add_outer_pointer_to_fn_type_expr(p, r, qualified, internal);
+    }
+  else if (pointer_type_def_sptr p =
+	   is_pointer_to_array_type(array_element_type))
+    {
+      string inner_string = inner.str() + right.str();
+      result = add_outer_pointer_to_array_type_expr(p, inner_string,
+						    qualified, internal);
+    }
+  else
+    ABG_ASSERT_NOT_REACHED;
+
+  return result;
+}
+
+/// When constructing the name of a pointer to array type, add the
+/// array element type type to the left of the existing type
+/// identifier, and the array declarator part to the right.
+///
+/// This function considers the name of the type as an expression.
+///
+/// The resulting type expr is going to be made of three parts:
+/// left_expr inner_expr right_expr.
+///
+/// Suppose we want to build the type expression representing:
+///
+///   "a pointer to an array of int".
+///
+/// It's going to look like:
+///
+///   int(*foo)[];
+///
+/// Suppose the caller of this function started to emit the inner
+/// "foo" part of the expression already.  It thus calls this function
+/// with that input "foo" part.  We consider that "foo" as the "type
+/// identifier".
+///
+/// So we are passed an input string that is "foo" and it's going to
+/// be turned into the inner_expr part, which is going to be "(*foo)".
+///
+/// The left_expr part is "int".  The right_expr part is "[]".
+///
+/// In other words, this function adds the left_expr and right_expr to
+/// the inner_expr.  left_expr and right_expr are called "outer
+/// pointer to array type expression".
+///
+/// The model of this function was taken from the article "Reading C
+/// type declaration", from Steve Friedl at
+/// http://unixwiz.net/techtips/reading-cdecl.html.
+///
+/// This is a sub-routine of @ref pointer_declaration_name() and @ref
+/// array_declaration_name()
+///
+/// @param p the pointer to array type to consider.
+///
+/// @param input the type-id to start from as the inner part of the
+/// final type name.
+///
+/// @param qualified if true then use qualified names in the resulting
+/// type name.
+///
+/// @param internal if true then the resulting type name is going to
+/// be used for type canonicalization purposes.
+///
+/// @return the name of the pointer to array type.
+static string
+add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar,
+				     const string& input, bool qualified,
+				     bool internal)
+{return add_outer_pointer_to_array_type_expr(pointer_to_ar.get(),
+					     input, qualified, internal);}
+
+/// Emit the name of a pointer declaration.
+///
+/// @param the pointer to consider.
+///
+/// @param idname the name of the variable that has @p as a type or
+/// the id of the type.  If it's empty then the resulting name is
+/// going to be the abstract name of the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+pointer_declaration_name(const type_base* ptr,
+			 const string& idname,
+			 bool qualified, bool internal)
+{
+  if (!ptr)
+    return interned_string();
+
+  type_base_sptr pointed_to_type;
+  string star_or_ref;
+  if (const pointer_type_def* p = is_pointer_type(ptr))
+    {
+      pointed_to_type = p->get_pointed_to_type();
+      star_or_ref = "*";
+    }
+  else if (const reference_type_def* p = is_reference_type(ptr))
+    {
+      pointed_to_type = p->get_pointed_to_type();
+      star_or_ref = "&";
+    }
+
+  if (!pointed_to_type)
+    return interned_string();
+
+  string result;
+  if (is_npaf_type(pointed_to_type)
+      || !(is_function_type(pointed_to_type)
+	   || is_array_type(pointed_to_type)))
+    {
+      result = get_type_name(pointed_to_type,
+			     qualified,
+			     internal)
+	+ star_or_ref;
+
+      if (!idname.empty())
+	result += idname;
+    }
+  else
+    {
+      // derived type
+      if (is_function_type(pointed_to_type))
+	result = add_outer_pointer_to_fn_type_expr(ptr, idname,
+						   qualified, internal);
+      else if (is_array_type(pointed_to_type))
+	result = add_outer_pointer_to_array_type_expr(ptr, idname,
+						      qualified, internal);
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
+  return ptr->get_environment().intern(result);
+}
+
+
+/// Emit the name of a pointer declaration.
+///
+/// @param the pointer to consider.
+///
+/// @param the name of the variable that has @p as a type.  If it's
+/// empty then the resulting name is going to be the abstract name of
+/// the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+pointer_declaration_name(const type_base_sptr& ptr,
+			 const string& variable_name,
+			 bool qualified, bool internal)
+{return pointer_declaration_name(ptr.get(), variable_name,
+				 qualified, internal);}
+
+/// Emit the name of a array declaration.
+///
+/// @param the array to consider.
+///
+/// @param the name of the variable that has @p as a type.  If it's
+/// empty then the resulting name is going to be the abstract name of
+/// the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+array_declaration_name(const array_type_def* array,
+		       const string& variable_name,
+		       bool qualified, bool internal)
+{
+  if (!array)
+    return interned_string();
+
+  type_base_sptr e_type = array->get_element_type();
+  string e_type_repr =
+    (e_type
+     ? get_type_name(e_type, qualified, internal)
+     : string("void"));
+
+  string result;
+  if (is_ada_language(array->get_language()))
+    {
+      std::ostringstream o;
+      if (!variable_name.empty())
+	o << variable_name << " is ";
+      o << "array ("
+	<< array->get_subrange_representation()
+	<< ") of " << e_type_repr;
+      result = o.str();
+    }
+  else
+    {
+      if (is_npaf_type(e_type)
+	  || !(is_pointer_to_function_type(e_type)
+	       || is_pointer_to_array_type(e_type)))
+	{
+	  result = e_type_repr;
+	  if (!variable_name.empty())
+	    result += variable_name;
+	  result += array->get_subrange_representation();
+	}
+      else if (pointer_type_def_sptr p = is_pointer_type(e_type))
+	{
+	  string s = variable_name + array->get_subrange_representation();
+	  result = pointer_declaration_name(p, s, qualified, internal);
+	}
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
+  return array->get_environment().intern(result);
+}
+
+/// Emit the name of a array declaration.
+///
+/// @param the array to consider.
+///
+/// @param the name of the variable that has @p as a type.  If it's
+/// empty then the resulting name is going to be the abstract name of
+/// the type.
+///
+/// @param qualified if true then the type name is going to be
+/// fully qualified.
+///
+/// @param internal if true then the type name is going to be used for
+/// type canonicalization purposes.
+static interned_string
+array_declaration_name(const array_type_def_sptr& array,
+		       const string& variable_name,
+		       bool qualified, bool internal)
+{return array_declaration_name(array.get(), variable_name,
+			       qualified, internal);}
 bool
 ir_traversable_base::traverse(ir_node_visitor&)
 {return true;}
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-0.txt b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
index 7e6286dc..f7ef97bb 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
@@ -4,14 +4,14 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function libapp::S0* libapp::create_s0()' has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0(void)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char m1', at offset 32 (in bits)
 
-  [C] 'function libapp::S1* libapp::create_s1()' has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1(void)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1':
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-2.txt b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
index e2e85b44..70fba89e 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
@@ -4,14 +4,14 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libapp-v0.cc:47:1 has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0(void)' at test0-fn-changed-libapp-v0.cc:47:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0' at test0-fn-changed-libapp-v1.cc:10:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:13:1
 
-  [C] 'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libapp-v0.cc:55:1 has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1(void)' at test0-fn-changed-libapp-v0.cc:55:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1' at test0-fn-changed-libapp-v1.cc:21:1:
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test1-fn-removed-report-0.txt b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
index e957129f..5165960f 100644
--- a/tests/data/test-abicompat/test1-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
@@ -4,5 +4,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void fun2()'    {_Z4fun2v}
+  [D] 'function void fun2(void)'    {_Z4fun2v}
 
diff --git a/tests/data/test-abicompat/test3-fn-removed-report-0.txt b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
index e8eaf4b3..a58fef7b 100644
--- a/tests/data/test-abicompat/test3-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
@@ -4,5 +4,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
+  [D] 'function void _internal_fun1(void)'    {_Z4fun1v@@VERSION_1.0}
 
diff --git a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
index 2650b5a0..7bbbc2e2 100644
--- a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
+++ b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt
@@ -3,22 +3,22 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 7 functions with some indirect sub-type change:
 
-  [C] 'function int[7]* N()' at PR30048-test-2-v0.cc:62:1 has some indirect sub-type changes:
+  [C] 'function int(*N(void))[7]' at PR30048-test-2-v0.cc:62:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'int[7]*' to 'int'
+      entity changed from 'int(*)[7]' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function int* O()' at PR30048-test-2-v0.cc:64:1 has some indirect sub-type changes:
+  [C] 'function int* O(void)' at PR30048-test-2-v0.cc:64:1 has some indirect sub-type changes:
     return type changed:
       entity changed from 'int*' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function int ()* P()' at PR30048-test-2-v0.cc:67:1 has some indirect sub-type changes:
+  [C] 'function int (*P(void))(void)' at PR30048-test-2-v0.cc:67:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'int ()*' to 'int'
+      entity changed from 'int (*)(void)' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function amusement* fun()' at PR30048-test-2-v0.cc:57:1 has some indirect sub-type changes:
+  [C] 'function amusement* fun(void)' at PR30048-test-2-v0.cc:57:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct amusement' at PR30048-test-2-v1.cc:1:1:
         type size changed from 6528 to 768 (in bits)
@@ -30,8 +30,8 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'int*' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 256 to 32 (in bits) (by -224 bits)
-          type of 'int ()* C' changed:
-            entity changed from 'int ()*' to 'int'
+          type of 'int (* C)(void)' changed:
+            entity changed from 'int (*)(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 320 to 64 (in bits) (by -256 bits)
           type of 'int D[7][7]' changed:
@@ -42,32 +42,32 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'int*[7]' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 1984 to 128 (in bits) (by -1856 bits)
-          type of 'int ()* F[7]' changed:
-            entity changed from 'int ()*[7]' to 'int'
+          type of 'int (* F[7])(void)' changed:
+            entity changed from 'int (*[7])(void)' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 2432 to 160 (in bits) (by -2272 bits)
-          type of 'int[7]* G' changed:
-            entity changed from 'int[7]*' to 'int'
+          type of 'int(* G)[7]' changed:
+            entity changed from 'int(*)[7]' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 2880 to 192 (in bits) (by -2688 bits)
           type of 'int** H' changed:
             entity changed from 'int**' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 2944 to 224 (in bits) (by -2720 bits)
-          type of 'int ()* I' changed:
-            entity changed from 'int ()*' to 'int'
+          type of 'int (* I)(void)' changed:
+            entity changed from 'int (*)(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3008 to 256 (in bits) (by -2752 bits)
-          type of 'int[7]* ()* J' changed:
-            entity changed from 'int[7]* ()*' to 'int'
+          type of 'int(*(* J)(void))[7]' changed:
+            entity changed from 'int(*(*)(void))[7]' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3072 to 288 (in bits) (by -2784 bits)
-          type of 'int* ()* K' changed:
-            entity changed from 'int* ()*' to 'int'
+          type of 'int* (* K)(void)' changed:
+            entity changed from 'int* (*)(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3136 to 320 (in bits) (by -2816 bits)
-          type of 'int ()* ()* L' changed:
-            entity changed from 'int ()* ()*' to 'int'
+          type of 'int (*(* L)(void))(void)' changed:
+            entity changed from 'int (*(*)(void))(void)' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3200 to 352 (in bits) (by -2848 bits)
           type of 'volatile int a[7]' changed:
@@ -78,8 +78,8 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'volatile int* const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3520 to 416 (in bits) (by -3104 bits)
-          type of 'int ()* const c' changed:
-            entity changed from 'int ()* const' to 'int'
+          type of 'int (* const c)(void)' changed:
+            entity changed from 'int (*)(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 3584 to 448 (in bits) (by -3136 bits)
           type of 'volatile int d[7][7]' changed:
@@ -90,47 +90,47 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'volatile int* const[7]' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 5248 to 512 (in bits) (by -4736 bits)
-          type of 'int ()* const f[7]' changed:
-            entity changed from 'int ()* const[7]' to 'int'
+          type of 'void* const f[7]' changed:
+            entity changed from 'int (*)(void) const[7]' to 'int'
             type size changed from 448 to 32 (in bits)
           and offset changed from 5696 to 544 (in bits) (by -5152 bits)
-          type of 'volatile int[7]* const g' changed:
-            entity changed from 'volatile int[7]* const' to 'int'
+          type of 'volatile int(* const g)[7]' changed:
+            entity changed from 'volatile int(*)[7] const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6144 to 576 (in bits) (by -5568 bits)
           type of 'volatile int* const* const h' changed:
             entity changed from 'volatile int* const* const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6208 to 608 (in bits) (by -5600 bits)
-          type of 'int ()* const i' changed:
-            entity changed from 'int ()* const' to 'int'
+          type of 'int (* const i)(void)' changed:
+            entity changed from 'int (*)(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6272 to 640 (in bits) (by -5632 bits)
-          type of 'volatile int[7]* ()* const j' changed:
-            entity changed from 'volatile int[7]* ()* const' to 'int'
+          type of 'volatile int(*(* const j)(void))[7]' changed:
+            entity changed from 'volatile int(*(*)(void))[7] const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6336 to 672 (in bits) (by -5664 bits)
-          type of 'volatile int* ()* const k' changed:
-            entity changed from 'volatile int* ()* const' to 'int'
+          type of 'volatile int* (* const k)(void)' changed:
+            entity changed from 'volatile int* (*)(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6400 to 704 (in bits) (by -5696 bits)
-          type of 'int ()* ()* const l' changed:
-            entity changed from 'int ()* ()* const' to 'int'
+          type of 'int (*(* const l)(void))(void)' changed:
+            entity changed from 'int (*(*)(void))(void) const' to 'int'
             type size changed from 64 to 32 (in bits)
           and offset changed from 6464 to 736 (in bits) (by -5728 bits)
 
-  [C] 'function volatile int[7]* n()' at PR30048-test-2-v0.cc:72:1 has some indirect sub-type changes:
+  [C] 'function volatile int(*n(void))[7]' at PR30048-test-2-v0.cc:72:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'volatile int[7]*' to 'int'
+      entity changed from 'volatile int(*)[7]' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function volatile int* o()' at PR30048-test-2-v0.cc:74:1 has some indirect sub-type changes:
+  [C] 'function volatile int* o(void)' at PR30048-test-2-v0.cc:74:1 has some indirect sub-type changes:
     return type changed:
       entity changed from 'volatile int*' to 'int'
       type size changed from 64 to 32 (in bits)
 
-  [C] 'function int ()* p()' at PR30048-test-2-v0.cc:77:1 has some indirect sub-type changes:
+  [C] 'function int (*p(void))(void)' at PR30048-test-2-v0.cc:77:1 has some indirect sub-type changes:
     return type changed:
-      entity changed from 'int ()*' to 'int'
+      entity changed from 'int (*)(void)' to 'int'
       type size changed from 64 to 32 (in bits)
 
diff --git a/tests/data/test-abidiff-exit/PR30048-test-report-0.txt b/tests/data/test-abidiff-exit/PR30048-test-report-0.txt
index 23a4c10b..26c04c6d 100644
--- a/tests/data/test-abidiff-exit/PR30048-test-report-0.txt
+++ b/tests/data/test-abidiff-exit/PR30048-test-report-0.txt
@@ -8,12 +8,12 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
     type of variable changed:
       type size changed from 448 to 128 (in bits)
       5 data member deletions:
-        'int (int)* f01', at offset 0 (in bits) at PR30048-test-v0.c:2:1
-        'int (const int*)* f02', at offset 64 (in bits) at PR30048-test-v0.c:3:1
-        'int (int* const)* f03', at offset 128 (in bits) at PR30048-test-v0.c:4:1
-        'int (int* restrict)* f04', at offset 192 (in bits) at PR30048-test-v0.c:5:1
-        'int (const int* restrict)* f05', at offset 256 (in bits) at PR30048-test-v0.c:6:1
+        'int (* f01)(int)', at offset 0 (in bits) at PR30048-test-v0.c:2:1
+        'int (* f02)(const int*)', at offset 64 (in bits) at PR30048-test-v0.c:3:1
+        'int (* f03)(int* const)', at offset 128 (in bits) at PR30048-test-v0.c:4:1
+        'int (* f04)(int* restrict)', at offset 192 (in bits) at PR30048-test-v0.c:5:1
+        'int (* f05)(const int* restrict)', at offset 256 (in bits) at PR30048-test-v0.c:6:1
       2 data member changes:
-        'int (int* restrict const)* f06' offset changed from 320 to 0 (in bits) (by -320 bits)
-        'int (int* restrict const)* f07' offset changed from 384 to 64 (in bits) (by -320 bits)
+        'int (* f06)(int* restrict const)' offset changed from 320 to 0 (in bits) (by -320 bits)
+        'int (* f07)(int* restrict const)' offset changed from 384 to 64 (in bits) (by -320 bits)
 
diff --git a/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt b/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt
index e5e40069..f83d9a11 100644
--- a/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt
+++ b/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt
@@ -142,7 +142,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                                   'void* pTrueEnd', at offset 704 (in bits) at sqlite3.c:16849:1
                             'sqlite3_xauth xAuth' offset changed from 3968 to 4032 (in bits) (by +64 bits)
                             'void* pAuthArg' offset changed from 4032 to 4096 (in bits) (by +64 bits)
-                            'int (void*)* xProgress' offset changed from 4096 to 4160 (in bits) (by +64 bits)
+                            'int (* xProgress)(void*)' offset changed from 4096 to 4160 (in bits) (by +64 bits)
                             'void* pProgressArg' offset changed from 4160 to 4224 (in bits) (by +64 bits)
                             'unsigned int nProgressOps' offset changed from 4224 to 4288 (in bits) (by +64 bits)
                             'int nVTrans' offset changed from 4256 to 4320 (in bits) (by +64 bits)
@@ -165,6 +165,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                             'sqlite3* pBlockingConnection' offset changed from 6144 to 6208 (in bits) (by +64 bits)
                             'sqlite3* pUnlockConnection' offset changed from 6208 to 6272 (in bits) (by +64 bits)
                             'void* pUnlockArg' offset changed from 6272 to 6336 (in bits) (by +64 bits)
-                            'void (void**, int)* xUnlockNotify' offset changed from 6336 to 6400 (in bits) (by +64 bits)
+                            'void (* xUnlockNotify)(void**, int)' offset changed from 6336 to 6400 (in bits) (by +64 bits)
                             'sqlite3* pNextBlocked' offset changed from 6400 to 6464 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt b/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt
index 2b451fb7..73a38f9f 100644
--- a/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt
+++ b/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt
@@ -9,10 +9,10 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct SDL12_AudioCVT' at SDL12_compat.c:880:1 changed:
           type size hasn't changed
           1 data member change:
-            type of 'void (SDL_AudioCVT*, typedef Uint16)* filters[10]' changed:
-              array element type 'void (SDL_AudioCVT*, typedef Uint16)*' changed:
-                entity changed from 'void (SDL_AudioCVT*, typedef Uint16)*' to compatible type 'typedef SDL12_AudioCVTFilter' at SDL12_compat.c:903:1
-                  in pointed to type 'function type void (SDL_AudioCVT*, typedef SDL_AudioFormat)':
+            type of 'void (* filters[10])(SDL_AudioCVT*, Uint16)' changed:
+              array element type 'void (*)(SDL_AudioCVT*, Uint16)' changed:
+                entity changed from 'void (*)(SDL_AudioCVT*, Uint16)' to compatible type 'typedef SDL12_AudioCVTFilter' at SDL12_compat.c:903:1
+                  in pointed to type 'function type void (SDL_AudioCVT*, SDL_AudioFormat)':
                     parameter 1 of type 'SDL_AudioCVT*' changed:
                       in pointed to type 'struct SDL_AudioCVT' at SDL12_compat.c:907:1:
                         type name changed from 'SDL_AudioCVT' to 'SDL12_AudioCVT'
@@ -21,6 +21,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                           'double len_ratio' offset changed from 288 to 320 (in bits) (by +32 bits)
                           name of 'SDL_AudioCVT::filters' changed to 'SDL12_AudioCVT::filters' at SDL12_compat.c:918:1, offset changed from 352 to 384 (in bits) (by +32 bits)
                           'int filter_index' offset changed from 992 to 1024 (in bits) (by +32 bits)
-              type name changed from 'void (SDL_AudioCVT*, typedef Uint16)*[10]' to 'SDL12_AudioCVTFilter[10]'
+              type name changed from 'void (*[10])(SDL_AudioCVT*, Uint16)' to 'SDL12_AudioCVTFilter[10]'
               type size hasn't changed
 
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
index 1233215e..69f3eb5f 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-1.txt
@@ -3,13 +3,13 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function test1__my_int[6] test1__first_function()' at test1.adb:6:1 has some indirect sub-type changes:
+  [C] 'function test1__my_int[6] test1__first_function(void)' at test1.adb:6:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'test1__my_int[6]' to 'test1__my_int[7]'
       array type size changed from 6000 to 7000
       array type subrange 1 changed length from 6 to 7
 
-  [C] 'function test1__my_index test1__second_function()' at test1.adb:14:1 has some indirect sub-type changes:
+  [C] 'function test1__my_index test1__second_function(void)' at test1.adb:14:1 has some indirect sub-type changes:
     return type changed:
       upper bound of range 'test1__my_index' change from '5' to '6'
 
diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
index 30d7488d..7c299ea9 100644
--- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
+++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada-subrange-report-2.txt
@@ -5,13 +5,13 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some sub-type change:
 
-  [C] 'function test1__my_int[6] test1__first_function()' at test1.adb:6:1 has some sub-type changes:
+  [C] 'function test1__my_int[6] test1__first_function(void)' at test1.adb:6:1 has some sub-type changes:
     return type changed:
       type name changed from 'test1__my_int[6]' to 'test1__my_int[7]'
       array type size changed from 6000 to 7000
       array type subrange 1 changed length from 6 to 7
 
-  [C] 'function test1__my_index test1__second_function()' at test1.adb:14:1 has some sub-type changes:
+  [C] 'function test1__my_index test1__second_function(void)' at test1.adb:14:1 has some sub-type changes:
     return type changed:
       upper bound of range 'test1__my_index' change from '5' to '6'
 
diff --git a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
index 83b3e836..ac6ab3be 100644
--- a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
+++ b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
@@ -56,7 +56,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'typedef C' to compatible type 'void* restrict const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'void* restrict const'
-              type name changed from 'void* const[7]' to 'void* restrict const[7]'
+              type name changed from 'void* const[7]' to 'void* const restrict[7]'
               type size hasn't changed
           type of 'D v_d' changed:
             entity changed from 'typedef D' to compatible type 'void* const volatile[7]'
@@ -68,18 +68,18 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'typedef D' to compatible type 'void* restrict const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'void* restrict const'
-              type name changed from 'void* const[7]' to 'void* restrict const[7]'
+              type name changed from 'void* const[7]' to 'void* const restrict[7]'
               type size hasn't changed
           type of 'E r_e' changed:
             entity changed from 'typedef E' to compatible type 'void* restrict const volatile[7]'
               array element type 'void* const volatile' changed:
                 'void* const volatile' changed to 'void* restrict const volatile'
-              type name changed from 'void* const volatile[7]' to 'void* restrict const volatile[7]'
+              type name changed from 'void* const volatile[7]' to 'void* const volatile restrict const[7]'
               type size hasn't changed
           type of 'F r_f' changed:
             entity changed from 'typedef F' to compatible type 'void* restrict const volatile[7]'
               array element type 'void* const volatile' changed:
                 'void* const volatile' changed to 'void* restrict const volatile'
-              type name changed from 'void* const volatile[7]' to 'void* restrict const volatile[7]'
+              type name changed from 'void* const volatile[7]' to 'void* const volatile restrict const[7]'
               type size hasn't changed
 
diff --git a/tests/data/test-abidiff-exit/test-fun-param-report.txt b/tests/data/test-abidiff-exit/test-fun-param-report.txt
index 7e357483..e37bf0df 100644
--- a/tests/data/test-abidiff-exit/test-fun-param-report.txt
+++ b/tests/data/test-abidiff-exit/test-fun-param-report.txt
@@ -8,7 +8,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct ops' at test-fun-param-v1.c:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'void (void*, unsigned int, unsigned long int)* bind_class' changed:
+          type of 'void (* bind_class)(void*, unsigned int, unsigned long int)' changed:
             in pointed to type 'function type void (void*, unsigned int, unsigned long int)':
               parameter 4 of type 'void*' was added
               parameter 5 of type 'unsigned long int' was added
diff --git a/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt b/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt
index 16d4dc97..365a8f88 100644
--- a/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt
+++ b/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt
@@ -7,10 +7,10 @@  Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
     type of variable changed:
       type size hasn't changed
       6 data member changes:
-        'int (const char**, const char**, bool*, void (void*)*, void*)* _dl_catch_error' offset changed from 5120 to 5376 (in bits) (by +256 bits)
-        'void (void*)* _dl_error_free' offset changed from 5184 to 5440 (in bits) (by +256 bits)
-        'void* (link_map*)* _dl_tls_get_addr_soft' offset changed from 5248 to 5120 (in bits) (by -128 bits)
-        'int ()* _dl_discover_osversion' offset changed from 5312 to 5184 (in bits) (by -128 bits)
+        'int (* _dl_catch_error)(const char**, const char**, bool*, void*, void*)' offset changed from 5120 to 5376 (in bits) (by +256 bits)
+        'void (* _dl_error_free)(void*)' offset changed from 5184 to 5440 (in bits) (by +256 bits)
+        'void* (* _dl_tls_get_addr_soft)(link_map*)' offset changed from 5248 to 5120 (in bits) (by -128 bits)
+        'int (* _dl_discover_osversion)(void)' offset changed from 5312 to 5184 (in bits) (by -128 bits)
         'audit_ifaces* _dl_audit' offset changed from 5376 to 5248 (in bits) (by -128 bits)
         'unsigned int _dl_naudit' offset changed from 5440 to 5312 (in bits) (by -128 bits)
 
diff --git a/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt b/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt
index 1caf2cba..38be69a9 100644
--- a/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt
@@ -6,5 +6,5 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct ops' changed:
   type size hasn't changed
   there are data member changes:
-    type 'void (int)*' of 'ops::munge' changed:
-      pointer type changed from: 'void (int)*' to: 'char (long int, bool)*'
+    type 'void (*)(int)' of 'ops::munge' changed:
+      pointer type changed from: 'void (*)(int)' to: 'char (*)(long int, bool)'
diff --git a/tests/data/test-abidiff-exit/test-leaf-more-report.txt b/tests/data/test-abidiff-exit/test-leaf-more-report.txt
index aea08b81..c0a692c6 100644
--- a/tests/data/test-abidiff-exit/test-leaf-more-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-more-report.txt
@@ -5,15 +5,15 @@  Removed/Changed/Added variables summary: 1 Removed, 1 Changed, 1 Added variable
 
 1 Removed function:
 
-  [D] 'function int deleted_fun()'    {_Z11deleted_funv}
+  [D] 'function int deleted_fun(void)'    {_Z11deleted_funv}
 
 1 Added function:
 
-  [A] 'function long int added_fun()'    {_Z9added_funv}
+  [A] 'function long int added_fun(void)'    {_Z9added_funv}
 
 1 function with some sub-type change:
 
-  [C] 'function int directly_changed_fun()' has some sub-type changes:
+  [C] 'function int directly_changed_fun(void)' has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
index 7c51164b..a8eb1cd8 100644
--- a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
@@ -24,8 +24,8 @@  Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct ops3 at test-leaf-peeling-v0.cc:14:1' changed:
   type size hasn't changed
   there are data member changes:
-    type 'void (int&)*' of 'ops3::spong' changed:
-      pointer type changed from: 'void (int&)*' to: 'void (int&&)*'
+    type 'void (*)(int&)' of 'ops3::spong' changed:
+      pointer type changed from: 'void (*)(int&)' to: 'void (*)(int&&)'
 
 'struct ops4 at test-leaf-peeling-v0.cc:18:1' changed:
   type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test-leaf-stats-report.txt b/tests/data/test-abidiff-exit/test-leaf-stats-report.txt
index 25ee8dc5..e17b461b 100644
--- a/tests/data/test-abidiff-exit/test-leaf-stats-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-stats-report.txt
@@ -5,7 +5,7 @@  Removed/Changed/Added variables summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 function with some sub-type change:
 
-  [C] 'function int changed_fun()' has some sub-type changes:
+  [C] 'function int changed_fun(void)' has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-net-change-report0.txt b/tests/data/test-abidiff-exit/test-net-change-report0.txt
index 64ac3a83..e087c15f 100644
--- a/tests/data/test-abidiff-exit/test-net-change-report0.txt
+++ b/tests/data/test-abidiff-exit/test-net-change-report0.txt
@@ -3,15 +3,15 @@  Variables changes summary: 1 Removed, 1 Changed, 1 Added variables
 
 1 Removed function:
 
-  [D] 'function int fun_removed()'    {fun_removed}
+  [D] 'function int fun_removed(void)'    {fun_removed}
 
 1 Added function:
 
-  [A] 'function long int fun_added()'    {fun_added}
+  [A] 'function long int fun_added(void)'    {fun_added}
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function int fun_changed()' has some indirect sub-type changes:
+  [C] 'function int fun_changed(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-net-change-report2.txt b/tests/data/test-abidiff-exit/test-net-change-report2.txt
index ca3b3e05..c6fd8079 100644
--- a/tests/data/test-abidiff-exit/test-net-change-report2.txt
+++ b/tests/data/test-abidiff-exit/test-net-change-report2.txt
@@ -5,15 +5,15 @@  Removed/Changed/Added variables summary: 1 Removed, 1 Changed, 1 Added variable
 
 1 Removed function:
 
-  [D] 'function int fun_removed()'    {fun_removed}
+  [D] 'function int fun_removed(void)'    {fun_removed}
 
 1 Added function:
 
-  [A] 'function long int fun_added()'    {fun_added}
+  [A] 'function long int fun_added(void)'    {fun_added}
 
 1 function with some sub-type change:
 
-  [C] 'function int fun_changed()' has some sub-type changes:
+  [C] 'function int fun_changed(void)' has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'long int'
       type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
index 6640a6dd..ecfcc70d 100644
--- a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
+++ b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void to_erase()'    {to_erase}
+  [D] 'function void to_erase(void)'    {to_erase}
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index 49c96d53..18cb0cf9 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -16,11 +16,11 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::connection':
         type size hasn't changed
         1 data member change:
-          type of 'sigc::slot_base* slot_' changed:
+          type of 'slot_base* slot_' changed:
             in pointed to type 'class sigc::slot_base':
               type size hasn't changed
               1 data member change:
-                type of 'sigc::slot_base::rep_type* rep_' changed:
+                type of 'rep_type* rep_' changed:
                   in pointed to type 'typedef sigc::slot_base::rep_type':
                     underlying type 'struct sigc::internal::slot_rep' changed:
                       type size hasn't changed
@@ -28,7 +28,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                         'struct sigc::trackable' changed:
                           type size hasn't changed
                           1 data member change:
-                            type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
+                            type of 'trackable_callback_list* callback_list_' changed:
                               in pointed to type 'struct sigc::internal::trackable_callback_list':
                                 type size changed from 192 to 256 (in bits)
                                 2 data member changes:
@@ -169,7 +169,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct sigc::trackable' changed:
             details were reported earlier
         1 data member change:
-          type of 'sigc::internal::signal_impl* impl_' changed:
+          type of 'signal_impl* impl_' changed:
             pointed to type 'struct sigc::internal::signal_impl' changed, as reported earlier
 
   [C] 'method bool sigc::signal_base::blocked()' has some indirect sub-type changes:
diff --git a/tests/data/test-abidiff/test-crc-report-0-1.txt b/tests/data/test-abidiff/test-crc-report-0-1.txt
index 0db42f68..0a6438f5 100644
--- a/tests/data/test-abidiff/test-crc-report-0-1.txt
+++ b/tests/data/test-abidiff/test-crc-report-0-1.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void exported_function()' has some indirect sub-type changes:
+  [C] 'function void exported_function(void)' has some indirect sub-type changes:
     CRC (modversions) changed from (none) to 0xe52d5bcf
 
 2 Changed variables:
diff --git a/tests/data/test-abidiff/test-crc-report-1-0.txt b/tests/data/test-abidiff/test-crc-report-1-0.txt
index e11f29c1..cb2fb86e 100644
--- a/tests/data/test-abidiff/test-crc-report-1-0.txt
+++ b/tests/data/test-abidiff/test-crc-report-1-0.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void exported_function()' has some indirect sub-type changes:
+  [C] 'function void exported_function(void)' has some indirect sub-type changes:
     CRC (modversions) changed from 0xe52d5bcf to (none)
 
 2 Changed variables:
diff --git a/tests/data/test-abidiff/test-crc-report-1-2.txt b/tests/data/test-abidiff/test-crc-report-1-2.txt
index 9bea309e..809e278f 100644
--- a/tests/data/test-abidiff/test-crc-report-1-2.txt
+++ b/tests/data/test-abidiff/test-crc-report-1-2.txt
@@ -3,6 +3,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void exported_function()' has some indirect sub-type changes:
+  [C] 'function void exported_function(void)' has some indirect sub-type changes:
     CRC (modversions) changed from 0xe52d5bcf to 0xe52d5bd0
 
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 9abd7adf..850b1255 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -1293,19 +1293,19 @@ 
         <var-decl name='message_function' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='387' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad1 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad1)(void*) -->
         <var-decl name='dbus_internal_pad1' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad2 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad2)(void*) -->
         <var-decl name='dbus_internal_pad2' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='390' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad3 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad3)(void*) -->
         <var-decl name='dbus_internal_pad3' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='391' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void (void*)* DBusObjectPathVTable::dbus_internal_pad4 -->
+        <!-- void (* DBusObjectPathVTable::dbus_internal_pad4)(void*) -->
         <var-decl name='dbus_internal_pad4' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='392' column='1'/>
       </data-member>
     </class-decl>
@@ -1324,13 +1324,13 @@ 
         <var-decl name='counter_link' type-id='type-id-5' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='244' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef typedef dbus_bool_t (DBusTimeout*, void*)* DBusAddTimeoutFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusTimeout*, void*) DBusAddTimeoutFunction -->
     <typedef-decl name='DBusAddTimeoutFunction' type-id='type-id-70' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='110' column='1' id='type-id-71'/>
-    <!-- typedef typedef dbus_bool_t (DBusWatch*, void*)* DBusAddWatchFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusWatch*, void*) DBusAddWatchFunction -->
     <typedef-decl name='DBusAddWatchFunction' type-id='type-id-72' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='91' column='1' id='type-id-73'/>
-    <!-- typedef typedef dbus_bool_t (DBusConnection*, unsigned long int, void*)* DBusAllowUnixUserFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusConnection*, unsigned long int, void*) DBusAllowUnixUserFunction -->
     <typedef-decl name='DBusAllowUnixUserFunction' type-id='type-id-74' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='143' column='1' id='type-id-75'/>
-    <!-- typedef typedef dbus_bool_t (DBusConnection*, const char*, void*)* DBusAllowWindowsUserFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusConnection*, const char*, void*) DBusAllowWindowsUserFunction -->
     <typedef-decl name='DBusAllowWindowsUserFunction' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='153' column='1' id='type-id-77'/>
     <!-- typedef DBusAtomic DBusAtomic -->
     <typedef-decl name='DBusAtomic' type-id='type-id-56' filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-33'/>
@@ -1340,11 +1340,11 @@ 
     <typedef-decl name='DBusDataSlotList' type-id='type-id-59' filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-42'/>
     <!-- typedef DBusDispatchStatus DBusDispatchStatus -->
     <typedef-decl name='DBusDispatchStatus' type-id='type-id-52' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='84' column='1' id='type-id-47'/>
-    <!-- typedef void (DBusConnection*, typedef DBusDispatchStatus, void*)* DBusDispatchStatusFunction -->
+    <!-- typedef void (*)(DBusConnection*, DBusDispatchStatus, void*) DBusDispatchStatusFunction -->
     <typedef-decl name='DBusDispatchStatusFunction' type-id='type-id-79' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='128' column='1' id='type-id-46'/>
-    <!-- typedef void (void*)* DBusFreeFunction -->
+    <!-- typedef void (*)(void*) DBusFreeFunction -->
     <typedef-decl name='DBusFreeFunction' type-id='type-id-68' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-45'/>
-    <!-- typedef typedef DBusHandlerResult (DBusConnection*, DBusMessage*, void*)* DBusHandleMessageFunction -->
+    <!-- typedef DBusHandlerResult (*)(DBusConnection*, DBusMessage*, void*) DBusHandleMessageFunction -->
     <typedef-decl name='DBusHandleMessageFunction' type-id='type-id-80' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='169' column='1' id='type-id-81'/>
     <!-- typedef DBusHandlerResult DBusHandlerResult -->
     <typedef-decl name='DBusHandlerResult' type-id='type-id-54' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-shared.h' line='71' column='1' id='type-id-53'/>
@@ -1354,9 +1354,9 @@ 
     <typedef-decl name='DBusHeaderField' type-id='type-id-62' filepath='../dbus/dbus-marshal-header.h' line='31' column='1' id='type-id-49'/>
     <!-- typedef DBusMessage DBusMessage -->
     <typedef-decl name='DBusMessage' type-id='type-id-63' filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-82'/>
-    <!-- typedef typedef DBusHandlerResult (DBusConnection*, DBusMessage*, void*)* DBusObjectPathMessageFunction -->
+    <!-- typedef DBusHandlerResult (*)(DBusConnection*, DBusMessage*, void*) DBusObjectPathMessageFunction -->
     <typedef-decl name='DBusObjectPathMessageFunction' type-id='type-id-80' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='374' column='1' id='type-id-67'/>
-    <!-- typedef void (DBusConnection*, void*)* DBusObjectPathUnregisterFunction -->
+    <!-- typedef void (*)(DBusConnection*, void*) DBusObjectPathUnregisterFunction -->
     <typedef-decl name='DBusObjectPathUnregisterFunction' type-id='type-id-83' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='367' column='1' id='type-id-66'/>
     <!-- typedef DBusObjectPathVTable DBusObjectPathVTable -->
     <typedef-decl name='DBusObjectPathVTable' type-id='type-id-65' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='53' column='1' id='type-id-84'/>
@@ -1364,67 +1364,67 @@ 
     <typedef-decl name='DBusPendingCall' type-id='type-id-85' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='49' column='1' id='type-id-86'/>
     <!-- typedef DBusPreallocatedSend DBusPreallocatedSend -->
     <typedef-decl name='DBusPreallocatedSend' type-id='type-id-69' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='47' column='1' id='type-id-87'/>
-    <!-- typedef void (DBusTimeout*, void*)* DBusRemoveTimeoutFunction -->
+    <!-- typedef void (*)(DBusTimeout*, void*) DBusRemoveTimeoutFunction -->
     <typedef-decl name='DBusRemoveTimeoutFunction' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='123' column='1' id='type-id-89'/>
-    <!-- typedef void (DBusWatch*, void*)* DBusRemoveWatchFunction -->
+    <!-- typedef void (*)(DBusWatch*, void*) DBusRemoveWatchFunction -->
     <typedef-decl name='DBusRemoveWatchFunction' type-id='type-id-90' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='103' column='1' id='type-id-91'/>
     <!-- typedef DBusTimeout DBusTimeout -->
     <typedef-decl name='DBusTimeout' type-id='type-id-92' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='45' column='1' id='type-id-93'/>
-    <!-- typedef void (DBusTimeout*, void*)* DBusTimeoutToggledFunction -->
+    <!-- typedef void (*)(DBusTimeout*, void*) DBusTimeoutToggledFunction -->
     <typedef-decl name='DBusTimeoutToggledFunction' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='117' column='1' id='type-id-94'/>
-    <!-- typedef void (void*)* DBusWakeupMainFunction -->
+    <!-- typedef void (*)(void*) DBusWakeupMainFunction -->
     <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-68' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='135' column='1' id='type-id-44'/>
     <!-- typedef DBusWatch DBusWatch -->
     <typedef-decl name='DBusWatch' type-id='type-id-95' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='43' column='1' id='type-id-96'/>
-    <!-- typedef void (DBusWatch*, void*)* DBusWatchToggledFunction -->
+    <!-- typedef void (*)(DBusWatch*, void*) DBusWatchToggledFunction -->
     <typedef-decl name='DBusWatchToggledFunction' type-id='type-id-90' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='97' column='1' id='type-id-97'/>
     <!-- typedef int dbus_int32_t -->
     <typedef-decl name='dbus_int32_t' type-id='type-id-2' filepath='../dbus/dbus-arch-deps.h' line='42' column='1' id='type-id-98'/>
     <!-- DBusDataSlot* -->
     <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-60'/>
+    <!-- DBusHandlerResult (*)(DBusConnection*, DBusMessage*, void*) -->
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
     <!-- DBusMessage* -->
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-37'/>
     <!-- DBusPendingCall* -->
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-100'/>
     <!-- DBusPendingCall** -->
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-101'/>
     <!-- DBusPreallocatedSend* -->
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-102'/>
     <!-- DBusTimeout* -->
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-102'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-103'/>
     <!-- DBusWatch* -->
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-104'/>
     <!-- char** -->
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-105'/>
     <!-- char*** -->
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
     <!-- const DBusObjectPathVTable -->
-    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-106'/>
+    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-107'/>
     <!-- const DBusObjectPathVTable* -->
-    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
+    <!-- dbus_bool_t (*)(DBusConnection*, const char*, void*) -->
+    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-76'/>
+    <!-- dbus_bool_t (*)(DBusConnection*, unsigned long int, void*) -->
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-74'/>
+    <!-- dbus_bool_t (*)(DBusTimeout*, void*) -->
+    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-70'/>
+    <!-- dbus_bool_t (*)(DBusWatch*, void*) -->
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-72'/>
     <!-- dbus_int32_t* -->
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-108'/>
-    <!-- typedef DBusHandlerResult (DBusConnection*, DBusMessage*, void*)* -->
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-80'/>
-    <!-- typedef dbus_bool_t (DBusConnection*, const char*, void*)* -->
-    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-76'/>
-    <!-- typedef dbus_bool_t (DBusConnection*, unsigned long int, void*)* -->
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-74'/>
-    <!-- typedef dbus_bool_t (DBusTimeout*, void*)* -->
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-70'/>
-    <!-- typedef dbus_bool_t (DBusWatch*, void*)* -->
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-72'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-113'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-114'/>
-    <!-- void (DBusConnection*, typedef DBusDispatchStatus, void*)* -->
+    <!-- void (*)(DBusConnection*, DBusDispatchStatus, void*) -->
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-79'/>
-    <!-- void (DBusConnection*, void*)* -->
+    <!-- void (*)(DBusConnection*, void*) -->
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-83'/>
-    <!-- void (DBusTimeout*, void*)* -->
+    <!-- void (*)(DBusTimeout*, void*) -->
     <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-88'/>
-    <!-- void (DBusWatch*, void*)* -->
+    <!-- void (*)(DBusWatch*, void*) -->
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-90'/>
-    <!-- void (void*)* -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-68'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-120'/>
@@ -1482,7 +1482,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- DBusTimeout* DBusPendingCall::timeout -->
-        <var-decl name='timeout' type-id='type-id-102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
+        <var-decl name='timeout' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- DBusList* DBusPendingCall::timeout_link -->
@@ -1692,14 +1692,14 @@ 
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3165' column='1'/>
       <!-- DBusPreallocatedSend* -->
-      <return type-id='type-id-101'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <!-- void dbus_connection_free_preallocated_send(DBusConnection*, DBusPreallocatedSend*) -->
     <function-decl name='dbus_connection_free_preallocated_send' mangled-name='dbus_connection_free_preallocated_send' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_free_preallocated_send'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3191' column='1'/>
       <!-- parameter of type 'DBusPreallocatedSend*' -->
-      <parameter type-id='type-id-101' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3192' column='1'/>
+      <parameter type-id='type-id-102' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3192' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -1708,7 +1708,7 @@ 
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3217' column='1'/>
       <!-- parameter of type 'DBusPreallocatedSend*' -->
-      <parameter type-id='type-id-101' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3218' column='1'/>
+      <parameter type-id='type-id-102' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3218' column='1'/>
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3219' column='1'/>
       <!-- parameter of type 'dbus_uint32_t*' -->
@@ -1734,7 +1734,7 @@ 
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3400' column='1'/>
       <!-- parameter of type 'DBusPendingCall**' -->
-      <parameter type-id='type-id-100' name='pending_return' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3401' column='1'/>
+      <parameter type-id='type-id-101' name='pending_return' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3401' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='timeout_milliseconds' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3402' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -1927,7 +1927,7 @@ 
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-120' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5260' column='1'/>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='data_size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5261' column='1'/>
+      <parameter type-id='type-id-113' name='data_size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5261' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -1949,7 +1949,7 @@ 
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31' name='connection' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5357' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='windows_sid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5358' column='1'/>
+      <parameter type-id='type-id-105' name='windows_sid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5358' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -2015,7 +2015,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5673' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5674' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5674' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5675' column='1'/>
       <!-- parameter of type 'DBusError*' -->
@@ -2030,7 +2030,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5703' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5704' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5704' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5705' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -2043,7 +2043,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5743' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5744' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5744' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5745' column='1'/>
       <!-- parameter of type 'DBusError*' -->
@@ -2058,7 +2058,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5775' column='1'/>
       <!-- parameter of type 'const DBusObjectPathVTable*' -->
-      <parameter type-id='type-id-107' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5776' column='1'/>
+      <parameter type-id='type-id-108' name='vtable' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5776' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5777' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -2091,21 +2091,21 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='parent_path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5879' column='1'/>
       <!-- parameter of type 'char***' -->
-      <parameter type-id='type-id-105' name='child_entries' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5880' column='1'/>
+      <parameter type-id='type-id-106' name='child_entries' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5880' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_bool_t dbus_connection_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_connection_allocate_data_slot' mangled-name='dbus_connection_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5920' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5920' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_connection_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_connection_free_data_slot' mangled-name='dbus_connection_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5938' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5938' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -2227,7 +2227,7 @@ 
     <!-- typedef DBusWatchList DBusWatchList -->
     <typedef-decl name='DBusWatchList' type-id='type-id-141' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h' line='38' column='1' id='type-id-129'/>
     <!-- DBusHandlerResult (DBusConnection*, DBusMessage*, void*) -->
-    <function-type size-in-bits='64' id='type-id-109'>
+    <function-type size-in-bits='64' id='type-id-99'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'DBusMessage*' -->
@@ -2238,7 +2238,7 @@ 
       <return type-id='type-id-53'/>
     </function-type>
     <!-- dbus_bool_t (DBusConnection*, const char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-110'>
+    <function-type size-in-bits='64' id='type-id-109'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'const char*' -->
@@ -2249,7 +2249,7 @@ 
       <return type-id='type-id-16'/>
     </function-type>
     <!-- dbus_bool_t (DBusConnection*, unsigned long int, void*) -->
-    <function-type size-in-bits='64' id='type-id-111'>
+    <function-type size-in-bits='64' id='type-id-110'>
       <!-- parameter of type 'DBusConnection*' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -2260,18 +2260,18 @@ 
       <return type-id='type-id-16'/>
     </function-type>
     <!-- dbus_bool_t (DBusTimeout*, void*) -->
-    <function-type size-in-bits='64' id='type-id-112'>
+    <function-type size-in-bits='64' id='type-id-111'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-103'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-type>
     <!-- dbus_bool_t (DBusWatch*, void*) -->
-    <function-type size-in-bits='64' id='type-id-113'>
+    <function-type size-in-bits='64' id='type-id-112'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- typedef dbus_bool_t -->
@@ -2300,7 +2300,7 @@ 
     <!-- void (DBusTimeout*, void*) -->
     <function-type size-in-bits='64' id='type-id-117'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-103'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- void -->
@@ -2309,7 +2309,7 @@ 
     <!-- void (DBusWatch*, void*) -->
     <function-type size-in-bits='64' id='type-id-118'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- void -->
@@ -2429,7 +2429,7 @@ 
     <!-- void dbus_free_string_array(char**) -->
     <function-decl name='dbus_free_string_array' mangled-name='dbus_free_string_array' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_free_string_array'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='str_array' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='749' column='1'/>
+      <parameter type-id='type-id-105' name='str_array' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='749' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -2908,7 +2908,7 @@ 
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3164' column='1'/>
       <!-- parameter of type 'char***' -->
-      <parameter type-id='type-id-105' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3165' column='1'/>
+      <parameter type-id='type-id-106' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3165' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -3094,14 +3094,14 @@ 
     <!-- dbus_bool_t dbus_message_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_message_allocate_data_slot' mangled-name='dbus_message_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4560' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4560' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_message_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_message_free_data_slot' mangled-name='dbus_message_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4578' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4578' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -3146,7 +3146,7 @@ 
       <!-- parameter of type 'DBusMessage*' -->
       <parameter type-id='type-id-37' name='msg' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4721' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='marshalled_data_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4722' column='1'/>
+      <parameter type-id='type-id-105' name='marshalled_data_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4722' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-23' name='len_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4723' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -3216,7 +3216,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- DBusTimeout* DBusPendingCall::timeout -->
-        <var-decl name='timeout' type-id='type-id-102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
+        <var-decl name='timeout' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- DBusList* DBusPendingCall::timeout_link -->
@@ -3235,28 +3235,28 @@ 
         <var-decl name='timeout_added' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='79' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void (DBusPendingCall*, void*)* DBusPendingCallNotifyFunction -->
+    <!-- typedef void (*)(DBusPendingCall*, void*) DBusPendingCallNotifyFunction -->
     <typedef-decl name='DBusPendingCallNotifyFunction' type-id='type-id-153' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-135'/>
-    <!-- void (DBusPendingCall*, void*)* -->
+    <!-- void (*)(DBusPendingCall*, void*) -->
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-153'/>
     <!-- DBusPendingCall* dbus_pending_call_ref(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_ref' mangled-name='dbus_pending_call_ref' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_ref'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='577' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='577' column='1'/>
       <!-- DBusPendingCall* -->
-      <return type-id='type-id-99'/>
+      <return type-id='type-id-100'/>
     </function-decl>
     <!-- void dbus_pending_call_unref(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_unref' mangled-name='dbus_pending_call_unref' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_unref'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='597' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='597' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_set_notify(DBusPendingCall*, DBusPendingCallNotifyFunction, void*, DBusFreeFunction) -->
     <function-decl name='dbus_pending_call_set_notify' mangled-name='dbus_pending_call_set_notify' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_set_notify'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='622' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='622' column='1'/>
       <!-- parameter of type 'typedef DBusPendingCallNotifyFunction' -->
       <parameter type-id='type-id-135' name='function' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='623' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -3269,49 +3269,49 @@ 
     <!-- void dbus_pending_call_cancel(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_cancel' mangled-name='dbus_pending_call_cancel' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_cancel'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='663' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='663' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_get_completed(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_get_completed' mangled-name='dbus_pending_call_get_completed' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_get_completed'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='679' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='679' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- DBusMessage* dbus_pending_call_steal_reply(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_steal_reply' mangled-name='dbus_pending_call_steal_reply' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_steal_reply'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='702' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='702' column='1'/>
       <!-- DBusMessage* -->
       <return type-id='type-id-37'/>
     </function-decl>
     <!-- void dbus_pending_call_block(DBusPendingCall*) -->
     <function-decl name='dbus_pending_call_block' mangled-name='dbus_pending_call_block' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_block'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='737' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='737' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_pending_call_allocate_data_slot' mangled-name='dbus_pending_call_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='759' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='759' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_pending_call_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_pending_call_free_data_slot' mangled-name='dbus_pending_call_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='779' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='779' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
     <!-- dbus_bool_t dbus_pending_call_set_data(DBusPendingCall*, dbus_int32_t, void*, DBusFreeFunction) -->
     <function-decl name='dbus_pending_call_set_data' mangled-name='dbus_pending_call_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_set_data'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='801' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='801' column='1'/>
       <!-- parameter of type 'typedef dbus_int32_t' -->
       <parameter type-id='type-id-98' name='slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='802' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -3324,7 +3324,7 @@ 
     <!-- void* dbus_pending_call_get_data(DBusPendingCall*, dbus_int32_t) -->
     <function-decl name='dbus_pending_call_get_data' mangled-name='dbus_pending_call_get_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_pending_call_get_data'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='827' column='1'/>
+      <parameter type-id='type-id-100' name='pending' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='827' column='1'/>
       <!-- parameter of type 'typedef dbus_int32_t' -->
       <parameter type-id='type-id-98' name='slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='828' column='1'/>
       <!-- void* -->
@@ -3333,7 +3333,7 @@ 
     <!-- void (DBusPendingCall*, void*) -->
     <function-type size-in-bits='64' id='type-id-154'>
       <!-- parameter of type 'DBusPendingCall*' -->
-      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-100'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9'/>
       <!-- void -->
@@ -3411,7 +3411,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- char** DBusServer::auth_mechanisms -->
-        <var-decl name='auth_mechanisms' type-id='type-id-104' visibility='default' filepath='../dbus/dbus-server-protected.h' line='85' column='1'/>
+        <var-decl name='auth_mechanisms' type-id='type-id-105' visibility='default' filepath='../dbus/dbus-server-protected.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- unsigned int DBusServer::disconnected -->
@@ -3425,17 +3425,17 @@ 
     <!-- struct DBusServerVTable -->
     <class-decl name='DBusServerVTable' size-in-bits='128' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='44' column='1' id='type-id-166'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void (DBusServer*)* DBusServerVTable::finalize -->
+        <!-- void (* DBusServerVTable::finalize)(DBusServer*) -->
         <var-decl name='finalize' type-id='type-id-167' visibility='default' filepath='../dbus/dbus-server-protected.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void (DBusServer*)* DBusServerVTable::disconnect -->
+        <!-- void (* DBusServerVTable::disconnect)(DBusServer*) -->
         <var-decl name='disconnect' type-id='type-id-167' visibility='default' filepath='../dbus/dbus-server-protected.h' line='48' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef DBusGUID DBusGUID -->
     <typedef-decl name='DBusGUID' type-id='type-id-168' filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-162'/>
-    <!-- typedef void (DBusServer*, DBusConnection*, void*)* DBusNewConnectionFunction -->
+    <!-- typedef void (*)(DBusServer*, DBusConnection*, void*) DBusNewConnectionFunction -->
     <typedef-decl name='DBusNewConnectionFunction' type-id='type-id-169' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h' line='47' column='1' id='type-id-165'/>
     <!-- typedef DBusServer DBusServer -->
     <typedef-decl name='DBusServer' type-id='type-id-159' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.h' line='42' column='1' id='type-id-170'/>
@@ -3460,9 +3460,9 @@ 
     <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-160'/>
     <!-- const char** -->
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-174'/>
-    <!-- void (DBusServer*)* -->
+    <!-- void (*)(DBusServer*) -->
     <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-167'/>
-    <!-- void (DBusServer*, DBusConnection*, void*)* -->
+    <!-- void (*)(DBusServer*, DBusConnection*, void*) -->
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-169'/>
     <!-- DBusRMutex* -->
     <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-161'/>
@@ -3592,14 +3592,14 @@ 
     <!-- dbus_bool_t dbus_server_allocate_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_server_allocate_data_slot' mangled-name='dbus_server_allocate_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_server_allocate_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1077' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1077' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void dbus_server_free_data_slot(dbus_int32_t*) -->
     <function-decl name='dbus_server_free_data_slot' mangled-name='dbus_server_free_data_slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_server_free_data_slot'>
       <!-- parameter of type 'dbus_int32_t*' -->
-      <parameter type-id='type-id-108' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1095' column='1'/>
+      <parameter type-id='type-id-113' name='slot_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1095' column='1'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-decl>
@@ -3900,72 +3900,72 @@ 
         <var-decl name='recursive_mutex_unlock' type-id='type-id-203' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='171' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <!-- void ()* DBusThreadFunctions::padding1 -->
+        <!-- void (* DBusThreadFunctions::padding1)(void) -->
         <var-decl name='padding1' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <!-- void ()* DBusThreadFunctions::padding2 -->
+        <!-- void (* DBusThreadFunctions::padding2)(void) -->
         <var-decl name='padding2' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- void ()* DBusThreadFunctions::padding3 -->
+        <!-- void (* DBusThreadFunctions::padding3)(void) -->
         <var-decl name='padding3' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void ()* DBusThreadFunctions::padding4 -->
+        <!-- void (* DBusThreadFunctions::padding4)(void) -->
         <var-decl name='padding4' type-id='type-id-204' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='176' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void (DBusCondVar*)* DBusCondVarFreeFunction -->
+    <!-- typedef void (*)(DBusCondVar*) DBusCondVarFreeFunction -->
     <typedef-decl name='DBusCondVarFreeFunction' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='80' column='1' id='type-id-195'/>
-    <!-- typedef DBusCondVar* ()* DBusCondVarNewFunction -->
+    <!-- typedef DBusCondVar* (*)(void) DBusCondVarNewFunction -->
     <typedef-decl name='DBusCondVarNewFunction' type-id='type-id-206' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='77' column='1' id='type-id-194'/>
-    <!-- typedef void (DBusCondVar*, DBusMutex*)* DBusCondVarWaitFunction -->
+    <!-- typedef void (*)(DBusCondVar*, DBusMutex*) DBusCondVarWaitFunction -->
     <typedef-decl name='DBusCondVarWaitFunction' type-id='type-id-207' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='92' column='1' id='type-id-196'/>
-    <!-- typedef typedef dbus_bool_t (DBusCondVar*, DBusMutex*, int)* DBusCondVarWaitTimeoutFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusCondVar*, DBusMutex*, int) DBusCondVarWaitTimeoutFunction -->
     <typedef-decl name='DBusCondVarWaitTimeoutFunction' type-id='type-id-208' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='101' column='1' id='type-id-197'/>
-    <!-- typedef void (DBusCondVar*)* DBusCondVarWakeAllFunction -->
+    <!-- typedef void (*)(DBusCondVar*) DBusCondVarWakeAllFunction -->
     <typedef-decl name='DBusCondVarWakeAllFunction' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='114' column='1' id='type-id-199'/>
-    <!-- typedef void (DBusCondVar*)* DBusCondVarWakeOneFunction -->
+    <!-- typedef void (*)(DBusCondVar*) DBusCondVarWakeOneFunction -->
     <typedef-decl name='DBusCondVarWakeOneFunction' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='108' column='1' id='type-id-198'/>
-    <!-- typedef void (DBusMutex*)* DBusMutexFreeFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusMutexFreeFunction -->
     <typedef-decl name='DBusMutexFreeFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='48' column='1' id='type-id-191'/>
-    <!-- typedef typedef dbus_bool_t (DBusMutex*)* DBusMutexLockFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusMutex*) DBusMutexLockFunction -->
     <typedef-decl name='DBusMutexLockFunction' type-id='type-id-210' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='50' column='1' id='type-id-192'/>
-    <!-- typedef DBusMutex* ()* DBusMutexNewFunction -->
+    <!-- typedef DBusMutex* (*)(void) DBusMutexNewFunction -->
     <typedef-decl name='DBusMutexNewFunction' type-id='type-id-211' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='46' column='1' id='type-id-190'/>
-    <!-- typedef typedef dbus_bool_t (DBusMutex*)* DBusMutexUnlockFunction -->
+    <!-- typedef dbus_bool_t (*)(DBusMutex*) DBusMutexUnlockFunction -->
     <typedef-decl name='DBusMutexUnlockFunction' type-id='type-id-210' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='52' column='1' id='type-id-193'/>
-    <!-- typedef void (DBusMutex*)* DBusRecursiveMutexFreeFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusRecursiveMutexFreeFunction -->
     <typedef-decl name='DBusRecursiveMutexFreeFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='64' column='1' id='type-id-201'/>
-    <!-- typedef void (DBusMutex*)* DBusRecursiveMutexLockFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusRecursiveMutexLockFunction -->
     <typedef-decl name='DBusRecursiveMutexLockFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='68' column='1' id='type-id-202'/>
-    <!-- typedef DBusMutex* ()* DBusRecursiveMutexNewFunction -->
+    <!-- typedef DBusMutex* (*)(void) DBusRecursiveMutexNewFunction -->
     <typedef-decl name='DBusRecursiveMutexNewFunction' type-id='type-id-211' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='61' column='1' id='type-id-200'/>
-    <!-- typedef void (DBusMutex*)* DBusRecursiveMutexUnlockFunction -->
+    <!-- typedef void (*)(DBusMutex*) DBusRecursiveMutexUnlockFunction -->
     <typedef-decl name='DBusRecursiveMutexUnlockFunction' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='72' column='1' id='type-id-203'/>
     <!-- typedef DBusThreadFunctions DBusThreadFunctions -->
     <typedef-decl name='DBusThreadFunctions' type-id='type-id-189' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='178' column='1' id='type-id-188'/>
-    <!-- DBusCondVar* ()* -->
+    <!-- DBusCondVar* (*)(void) -->
     <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-206'/>
-    <!-- DBusMutex* ()* -->
+    <!-- DBusMutex* (*)(void) -->
     <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-211'/>
     <!-- const DBusThreadFunctions -->
     <qualified-type-def type-id='type-id-188' const='yes' id='type-id-214'/>
     <!-- const DBusThreadFunctions* -->
     <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
-    <!-- typedef dbus_bool_t (DBusCondVar*, DBusMutex*, int)* -->
+    <!-- dbus_bool_t (*)(DBusCondVar*, DBusMutex*, int) -->
     <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-208'/>
-    <!-- typedef dbus_bool_t (DBusMutex*)* -->
+    <!-- dbus_bool_t (*)(DBusMutex*) -->
     <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-210'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-204'/>
-    <!-- void (DBusCondVar*)* -->
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-205'/>
-    <!-- void (DBusCondVar*, DBusMutex*)* -->
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-207'/>
-    <!-- void (DBusMutex*)* -->
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-209'/>
+    <!-- void (*)(DBusCondVar*) -->
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-205'/>
+    <!-- void (*)(DBusCondVar*, DBusMutex*) -->
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-207'/>
+    <!-- void (*)(DBusMutex*) -->
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-209'/>
+    <!-- void (*)(void) -->
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-204'/>
     <!-- DBusCondVar* -->
     <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
     <!-- DBusMutex* -->
@@ -4018,20 +4018,15 @@ 
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-type>
-    <!-- void () -->
-    <function-type size-in-bits='64' id='type-id-218'>
-      <!-- void -->
-      <return type-id='type-id-24'/>
-    </function-type>
     <!-- void (DBusCondVar*) -->
-    <function-type size-in-bits='64' id='type-id-219'>
+    <function-type size-in-bits='64' id='type-id-218'>
       <!-- parameter of type 'DBusCondVar*' -->
       <parameter type-id='type-id-223'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-type>
     <!-- void (DBusCondVar*, DBusMutex*) -->
-    <function-type size-in-bits='64' id='type-id-220'>
+    <function-type size-in-bits='64' id='type-id-219'>
       <!-- parameter of type 'DBusCondVar*' -->
       <parameter type-id='type-id-223'/>
       <!-- parameter of type 'DBusMutex*' -->
@@ -4040,12 +4035,17 @@ 
       <return type-id='type-id-24'/>
     </function-type>
     <!-- void (DBusMutex*) -->
-    <function-type size-in-bits='64' id='type-id-221'>
+    <function-type size-in-bits='64' id='type-id-220'>
       <!-- parameter of type 'DBusMutex*' -->
       <parameter type-id='type-id-225'/>
       <!-- void -->
       <return type-id='type-id-24'/>
     </function-type>
+    <!-- void () -->
+    <function-type size-in-bits='64' id='type-id-221'>
+      <!-- void -->
+      <return type-id='type-id-24'/>
+    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='dbus-timeout.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusTimeout -->
@@ -4083,28 +4083,28 @@ 
         <var-decl name='enabled' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef typedef dbus_bool_t (void*)* DBusTimeoutHandler -->
+    <!-- typedef dbus_bool_t (*)(void*) DBusTimeoutHandler -->
     <typedef-decl name='DBusTimeoutHandler' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h' line='41' column='1' id='type-id-137'/>
-    <!-- typedef dbus_bool_t (void*)* -->
+    <!-- dbus_bool_t (*)(void*) -->
     <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-228'/>
     <!-- int dbus_timeout_get_interval(DBusTimeout*) -->
     <function-decl name='dbus_timeout_get_interval' mangled-name='dbus_timeout_get_interval' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_get_interval'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='416' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='416' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void* dbus_timeout_get_data(DBusTimeout*) -->
     <function-decl name='dbus_timeout_get_data' mangled-name='dbus_timeout_get_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_get_data'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='429' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='429' column='1'/>
       <!-- void* -->
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- void dbus_timeout_set_data(DBusTimeout*, void*, DBusFreeFunction) -->
     <function-decl name='dbus_timeout_set_data' mangled-name='dbus_timeout_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_set_data'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='446' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='446' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='447' column='1'/>
       <!-- parameter of type 'typedef DBusFreeFunction' -->
@@ -4115,14 +4115,14 @@ 
     <!-- dbus_bool_t dbus_timeout_handle(DBusTimeout*) -->
     <function-decl name='dbus_timeout_handle' mangled-name='dbus_timeout_handle' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_handle'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='472' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='472' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_bool_t dbus_timeout_get_enabled(DBusTimeout*) -->
     <function-decl name='dbus_timeout_get_enabled' mangled-name='dbus_timeout_get_enabled' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_timeout_get_enabled'>
       <!-- parameter of type 'DBusTimeout*' -->
-      <parameter type-id='type-id-102' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='486' column='1'/>
+      <parameter type-id='type-id-103' name='timeout' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='486' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -4140,7 +4140,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-7' name='filename' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='83' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='84' column='1'/>
+      <parameter type-id='type-id-105' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='84' column='1'/>
       <!-- parameter of type 'typedef dbus_bool_t' -->
       <parameter type-id='type-id-16' name='create_if_not_found' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='85' column='1'/>
       <!-- parameter of type 'DBusError*' -->
@@ -4151,7 +4151,7 @@ 
     <!-- dbus_bool_t dbus_internal_do_not_use_create_uuid(char**) -->
     <function-decl name='dbus_internal_do_not_use_create_uuid' mangled-name='dbus_internal_do_not_use_create_uuid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_create_uuid'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-104' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1'/>
+      <parameter type-id='type-id-105' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -4200,49 +4200,49 @@ 
         <var-decl name='oom_last_time' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef typedef dbus_bool_t (DBusWatch*, unsigned int, void*)* DBusWatchHandler -->
+    <!-- typedef dbus_bool_t (*)(DBusWatch*, unsigned int, void*) DBusWatchHandler -->
     <typedef-decl name='DBusWatchHandler' type-id='type-id-230' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.h' line='43' column='1' id='type-id-140'/>
-    <!-- typedef dbus_bool_t (DBusWatch*, unsigned int, void*)* -->
+    <!-- dbus_bool_t (*)(DBusWatch*, unsigned int, void*) -->
     <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-230'/>
     <!-- int dbus_watch_get_fd(DBusWatch*) -->
     <function-decl name='dbus_watch_get_fd' mangled-name='dbus_watch_get_fd' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='536' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_fd'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='536' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='536' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int dbus_watch_get_unix_fd(DBusWatch*) -->
     <function-decl name='dbus_watch_get_unix_fd' mangled-name='dbus_watch_get_unix_fd' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_unix_fd'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='557' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='557' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int dbus_watch_get_socket(DBusWatch*) -->
     <function-decl name='dbus_watch_get_socket' mangled-name='dbus_watch_get_socket' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_socket'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='586' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- unsigned int dbus_watch_get_flags(DBusWatch*) -->
     <function-decl name='dbus_watch_get_flags' mangled-name='dbus_watch_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_flags'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- void* dbus_watch_get_data(DBusWatch*) -->
     <function-decl name='dbus_watch_get_data' mangled-name='dbus_watch_get_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_data'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='623' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='623' column='1'/>
       <!-- void* -->
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- void dbus_watch_set_data(DBusWatch*, void*, DBusFreeFunction) -->
     <function-decl name='dbus_watch_set_data' mangled-name='dbus_watch_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_set_data'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='642' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='642' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-9' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='643' column='1'/>
       <!-- parameter of type 'typedef DBusFreeFunction' -->
@@ -4253,14 +4253,14 @@ 
     <!-- dbus_bool_t dbus_watch_get_enabled(DBusWatch*) -->
     <function-decl name='dbus_watch_get_enabled' mangled-name='dbus_watch_get_enabled' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_enabled'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='667' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='667' column='1'/>
       <!-- typedef dbus_bool_t -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- dbus_bool_t dbus_watch_handle(DBusWatch*, unsigned int) -->
     <function-decl name='dbus_watch_handle' mangled-name='dbus_watch_handle' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_handle'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='698' column='1'/>
+      <parameter type-id='type-id-104' name='watch' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='698' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-8' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='699' column='1'/>
       <!-- typedef dbus_bool_t -->
@@ -4269,7 +4269,7 @@ 
     <!-- dbus_bool_t (DBusWatch*, unsigned int, void*) -->
     <function-type size-in-bits='64' id='type-id-231'>
       <!-- parameter of type 'DBusWatch*' -->
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'void*' -->
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 07e81a50..e7f0e2c6 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -186,51 +186,51 @@ 
         <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
-        <!-- void (typedef GLenum)* OpenGLCurveEvaluator::beginCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
-        <!-- void ()* OpenGLCurveEvaluator::endCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::vertexCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::normalCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::colorCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
-        <!-- void (const GLfloat*)* OpenGLCurveEvaluator::texcoordCallBackN -->
+        <!-- void(*OpenGLCurveEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
-        <!-- void (typedef GLenum, void*)* OpenGLCurveEvaluator::beginCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
-        <!-- void (void*)* OpenGLCurveEvaluator::endCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::vertexCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::normalCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::colorCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
-        <!-- void (const GLfloat*, void*)* OpenGLCurveEvaluator::texcoordCallBackData -->
+        <!-- void(*OpenGLCurveEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
@@ -578,9 +578,9 @@ 
     <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-23'/>
     <!-- curveEvalMachine* -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-33'/>
-    <!-- void (const GLfloat*)* -->
+    <!-- void(*)(const GLfloat*) -->
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-13'/>
-    <!-- void (const GLfloat*, void*)* -->
+    <!-- void(*)(const GLfloat*, void*) -->
     <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-16'/>
     <!-- CurveMap* -->
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-20'/>
@@ -942,48 +942,48 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat(*)[4]) -->
         <function-decl name='transform4d' mangled-name='_ZN8GLUnurbs11transform4dEPfS0_PA4_f' filepath='libnurbs/interface/glrenderer.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::multmatrix4d(GLfloat[4]*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::multmatrix4d(GLfloat(*)[4], GLfloat(*)[4]) -->
         <function-decl name='multmatrix4d' mangled-name='_ZN8GLUnurbs12multmatrix4dEPA4_fPA4_KfS4_' filepath='libnurbs/interface/glrenderer.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadCullingMatrix(GLfloat[4]*) -->
+        <!-- void GLUnurbs::loadCullingMatrix(GLfloat(*)[4]) -->
         <function-decl name='loadCullingMatrix' mangled-name='_ZN8GLUnurbs17loadCullingMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat[4]*, const GLint*) -->
+        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat(*)[4], const GLint*) -->
         <function-decl name='loadSamplingMatrix' mangled-name='_ZN8GLUnurbs18loadSamplingMatrixEPA4_KfPKi' filepath='libnurbs/interface/glrenderer.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-52'/>
@@ -1018,7 +1018,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void GLUnurbs::grabGLMatrix() -->
         <function-decl name='grabGLMatrix' mangled-name='_ZN8GLUnurbs12grabGLMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -1096,51 +1096,51 @@ 
         <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <!-- void (typedef GLenum)* OpenGLSurfaceEvaluator::beginCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <!-- void ()* OpenGLSurfaceEvaluator::endCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::vertexCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::normalCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::colorCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::texcoordCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <!-- void (typedef GLenum, void*)* OpenGLSurfaceEvaluator::beginCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <!-- void (void*)* OpenGLSurfaceEvaluator::endCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::vertexCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::normalCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::colorCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::texcoordCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
@@ -2131,48 +2131,48 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::transform4d(GLfloat*, GLfloat(*)[4]) -->
         <function-decl name='transform4d' mangled-name='_ZN8GLUnurbs11transform4dEPfS0_PA4_f' filepath='libnurbs/interface/glrenderer.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
           <!-- parameter of type 'GLfloat*' -->
           <parameter type-id='type-id-50'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private' static='yes'>
-        <!-- void GLUnurbs::multmatrix4d(GLfloat[4]*, GLfloat[4]*) -->
+        <!-- void GLUnurbs::multmatrix4d(GLfloat(*)[4], GLfloat(*)[4]) -->
         <function-decl name='multmatrix4d' mangled-name='_ZN8GLUnurbs12multmatrix4dEPA4_fPA4_KfS4_' filepath='libnurbs/interface/glrenderer.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadCullingMatrix(GLfloat[4]*) -->
+        <!-- void GLUnurbs::loadCullingMatrix(GLfloat(*)[4]) -->
         <function-decl name='loadCullingMatrix' mangled-name='_ZN8GLUnurbs17loadCullingMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat[4]*, const GLint*) -->
+        <!-- void GLUnurbs::loadSamplingMatrix(GLfloat(*)[4], const GLint*) -->
         <function-decl name='loadSamplingMatrix' mangled-name='_ZN8GLUnurbs18loadSamplingMatrixEPA4_KfPKi' filepath='libnurbs/interface/glrenderer.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
           <parameter type-id='type-id-43' is-artificial='yes'/>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- parameter of type 'const GLint*' -->
           <parameter type-id='type-id-52'/>
@@ -2207,7 +2207,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void GLUnurbs::grabGLMatrix() -->
         <function-decl name='grabGLMatrix' mangled-name='_ZN8GLUnurbs12grabGLMatrixEPA4_f' filepath='libnurbs/interface/glrenderer.cc' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'GLfloat[4]*' -->
+          <!-- parameter of type 'GLfloat(*)[4]' -->
           <parameter type-id='type-id-51'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -2252,9 +2252,9 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (typedef GLenum)* errorCallbackType -->
+    <!-- typedef void(*)(GLenum) errorCallbackType -->
     <typedef-decl name='errorCallbackType' type-id='type-id-11' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-48'/>
-    <!-- GLfloat[4]* -->
+    <!-- GLfloat(*)[4] -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-51'/>
     <!-- class NurbsTessellator -->
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-47'>
@@ -2883,51 +2883,51 @@ 
         <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <!-- void (typedef GLenum)* OpenGLSurfaceEvaluator::beginCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <!-- void ()* OpenGLSurfaceEvaluator::endCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::vertexCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::normalCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::colorCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <!-- void (const GLfloat*)* OpenGLSurfaceEvaluator::texcoordCallBackN -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <!-- void (typedef GLenum, void*)* OpenGLSurfaceEvaluator::beginCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <!-- void (void*)* OpenGLSurfaceEvaluator::endCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::vertexCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::normalCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::colorCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <!-- void (const GLfloat*, void*)* OpenGLSurfaceEvaluator::texcoordCallBackData -->
+        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
@@ -3878,7 +3878,7 @@ 
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-100'/>
     <!-- GLenum* -->
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-95'/>
-    <!-- REAL[3]* -->
+    <!-- REAL(*)[3] -->
     <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-101'/>
     <!-- StoredVertex* -->
     <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-87'/>
@@ -13565,9 +13565,9 @@ 
     <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-165'/>
     <!-- Quiltspec* -->
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-239'/>
-    <!-- REAL[5]* -->
+    <!-- REAL(*)[5] -->
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-242'/>
-    <!-- float[4]* -->
+    <!-- float(*)[4] -->
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-243'/>
     <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
     <!-- struct Flist -->
@@ -14368,7 +14368,7 @@ 
     <!-- struct PFVS -->
     <class-decl name='PFVS' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-261' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-263'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void (NurbsTessellator*, void*)* PFVS::__pfn -->
+        <!-- void(*PFVS::__pfn)(NurbsTessellator*, void*) -->
         <var-decl name='__pfn' type-id='type-id-264' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -14386,7 +14386,7 @@ 
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
     <!-- NurbsTessellator* -->
     <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-79'/>
-    <!-- void (NurbsTessellator*, void*)* -->
+    <!-- void(*)(NurbsTessellator*, void*) -->
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-264'/>
     <!-- void (NurbsTessellator*, void*) -->
     <function-type size-in-bits='64' id='type-id-265'>
@@ -14885,7 +14885,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void Mapdesc::copy(long int, float*, long int, long int) -->
         <function-decl name='copy' mangled-name='_ZN7Mapdesc4copyEPA5_flPfll' filepath='libnurbs/internals/mapdesc.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-24'/>
@@ -14919,11 +14919,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformRational(REAL[5]*, REAL*, REAL*) -->
+        <!-- void Mapdesc::xformRational(REAL(*)[5], REAL*, REAL*) -->
         <function-decl name='xformRational' mangled-name='_ZN7Mapdesc13xformRationalEPA5_fPfS2_' filepath='libnurbs/internals/mapdesc.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -14934,11 +14934,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformNonrational(REAL[5]*, REAL*, REAL*) -->
+        <!-- void Mapdesc::xformNonrational(REAL(*)[5], REAL*, REAL*) -->
         <function-decl name='xformNonrational' mangled-name='_ZN7Mapdesc16xformNonrationalEPA5_fPfS2_' filepath='libnurbs/internals/mapdesc.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -14949,11 +14949,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformMat(REAL[5]*, REAL*, int, int, REAL*, int) -->
+        <!-- void Mapdesc::xformMat(REAL(*)[5], REAL*, int, int, REAL*, int) -->
         <function-decl name='xformMat' mangled-name='_ZN7Mapdesc8xformMatEPA5_fPfiiS2_i' filepath='libnurbs/internals/mapdesc.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -15027,11 +15027,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::xformMat(REAL[5]*, REAL*, int, int, int, int, REAL*, int, int) -->
+        <!-- void Mapdesc::xformMat(REAL(*)[5], REAL*, int, int, int, int, REAL*, int, int) -->
         <function-decl name='xformMat' mangled-name='_ZN7Mapdesc8xformMatEPA5_fPfiiiiS2_ii' filepath='libnurbs/internals/mapdesc.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -15173,11 +15173,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::bbox(REAL[5]*, REAL*, int, int, int, int) -->
+        <!-- void Mapdesc::bbox(REAL(*)[5], REAL*, int, int, int, int) -->
         <function-decl name='bbox' mangled-name='_ZN7Mapdesc4bboxEPA5_fPfiiii' filepath='libnurbs/internals/mapdesc.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-25'/>
@@ -15323,7 +15323,7 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- int Mapdesc::bboxTooBig(REAL*, int, int, int, int, REAL[5]*) -->
+        <!-- int Mapdesc::bboxTooBig(REAL*, int, int, int, int, REAL(*)[5]) -->
         <function-decl name='bboxTooBig' mangled-name='_ZN7Mapdesc10bboxTooBigEPfiiiiPA5_f' filepath='libnurbs/internals/mapdesc.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
@@ -15337,7 +15337,7 @@ 
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-10'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- int -->
           <return type-id='type-id-10'/>
@@ -15399,22 +15399,22 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::surfbbox(REAL[5]*) -->
+        <!-- void Mapdesc::surfbbox(REAL(*)[5]) -->
         <function-decl name='surfbbox' mangled-name='_ZN7Mapdesc8surfbboxEPA5_f' filepath='libnurbs/internals/mapdesc.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- void -->
           <return type-id='type-id-19'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void Mapdesc::identify(REAL[5]*) -->
+        <!-- void Mapdesc::identify(REAL(*)[5]) -->
         <function-decl name='identify' mangled-name='_ZN7Mapdesc8identifyEPA5_f' filepath='libnurbs/internals/mapdesc.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
           <parameter type-id='type-id-274' is-artificial='yes'/>
-          <!-- parameter of type 'REAL[5]*' -->
+          <!-- parameter of type 'REAL(*)[5]' -->
           <parameter type-id='type-id-242'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -16402,11 +16402,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16455,11 +16455,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16620,11 +16620,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16655,11 +16655,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16690,11 +16690,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16725,11 +16725,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16760,11 +16760,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16795,11 +16795,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- vertexArray::vertexArray(Real[2]*, Int) -->
+        <!-- vertexArray::vertexArray(Real(*)[2], Int) -->
         <function-decl name='vertexArray' filepath='libnurbs/nurbtess/monoTriangulation.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vertexArray*' -->
           <parameter type-id='type-id-293' is-artificial='yes'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
@@ -16827,14 +16827,14 @@ 
     <typedef-decl name='Real2' type-id='type-id-283' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-295'/>
     <!-- Int* -->
     <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-285'/>
+    <!-- Real(*)[2] -->
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-294'/>
     <!-- Real* -->
     <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-286'/>
     <!-- Real** -->
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-292'/>
     <!-- Real2* -->
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-289'/>
-    <!-- Real[2]* -->
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-294'/>
     <!-- primStream* -->
     <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-187'/>
     <!-- reflexChain* -->
@@ -21338,13 +21338,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21413,13 +21413,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21470,13 +21470,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21527,13 +21527,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21584,13 +21584,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21641,13 +21641,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21698,13 +21698,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21755,13 +21755,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -21812,13 +21812,13 @@ 
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
-        <!-- sampledLine::sampledLine(Int, Real[2]*) -->
+        <!-- sampledLine::sampledLine(Int, Real(*)[2]) -->
         <function-decl name='sampledLine' filepath='libnurbs/nurbtess/sampledLine.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'sampledLine*' -->
           <parameter type-id='type-id-357' is-artificial='yes'/>
           <!-- parameter of type 'typedef Int' -->
           <parameter type-id='type-id-287'/>
-          <!-- parameter of type 'Real[2]*' -->
+          <!-- parameter of type 'Real(*)[2]' -->
           <parameter type-id='type-id-294'/>
           <!-- void -->
           <return type-id='type-id-19'/>
@@ -22310,7 +22310,7 @@ 
         <var-decl name='frame' type-id='type-id-17' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- int (void*, typedef DictListKey, typedef DictListKey)* DictList::leq -->
+        <!-- int(*DictList::leq)(void*, DictListKey, DictListKey) -->
         <var-decl name='leq' type-id='type-id-383' visibility='default' filepath='libtess/dict.h' line='97' column='1'/>
       </data-member>
     </class-decl>
@@ -22429,7 +22429,7 @@ 
         <var-decl name='mesh' type-id='type-id-396' visibility='default' filepath='libtess/tess.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void (typedef GLenum)* GLUtesselator::callError -->
+        <!-- void(*GLUtesselator::callError)(GLenum) -->
         <var-decl name='callError' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
@@ -22469,7 +22469,7 @@ 
         <var-decl name='event' type-id='type-id-389' visibility='default' filepath='libtess/tess.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void (GLdouble*, void**, GLfloat*, void**)* GLUtesselator::callCombine -->
+        <!-- void(*GLUtesselator::callCombine)(GLdouble*, void**, GLfloat*, void**) -->
         <var-decl name='callCombine' type-id='type-id-399' visibility='default' filepath='libtess/tess.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -22485,23 +22485,23 @@ 
         <var-decl name='lonelyTriList' type-id='type-id-387' visibility='default' filepath='libtess/tess.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <!-- void (typedef GLenum)* GLUtesselator::callBegin -->
+        <!-- void(*GLUtesselator::callBegin)(GLenum) -->
         <var-decl name='callBegin' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <!-- void (typedef GLboolean)* GLUtesselator::callEdgeFlag -->
+        <!-- void(*GLUtesselator::callEdgeFlag)(GLboolean) -->
         <var-decl name='callEdgeFlag' type-id='type-id-400' visibility='default' filepath='libtess/tess.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <!-- void (void*)* GLUtesselator::callVertex -->
+        <!-- void(*GLUtesselator::callVertex)(void*) -->
         <var-decl name='callVertex' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <!-- void ()* GLUtesselator::callEnd -->
+        <!-- void(*GLUtesselator::callEnd)(void) -->
         <var-decl name='callEnd' type-id='type-id-12' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <!-- void (GLUmesh*)* GLUtesselator::callMesh -->
+        <!-- void(*GLUtesselator::callMesh)(GLUmesh*) -->
         <var-decl name='callMesh' type-id='type-id-401' visibility='default' filepath='libtess/tess.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
@@ -22517,27 +22517,27 @@ 
         <var-decl name='cache' type-id='type-id-368' visibility='default' filepath='libtess/tess.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
-        <!-- void (typedef GLenum, void*)* GLUtesselator::callBeginData -->
+        <!-- void(*GLUtesselator::callBeginData)(GLenum, void*) -->
         <var-decl name='callBeginData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
-        <!-- void (typedef GLboolean, void*)* GLUtesselator::callEdgeFlagData -->
+        <!-- void(*GLUtesselator::callEdgeFlagData)(GLboolean, void*) -->
         <var-decl name='callEdgeFlagData' type-id='type-id-402' visibility='default' filepath='libtess/tess.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27456'>
-        <!-- void (void*, void*)* GLUtesselator::callVertexData -->
+        <!-- void(*GLUtesselator::callVertexData)(void*, void*) -->
         <var-decl name='callVertexData' type-id='type-id-403' visibility='default' filepath='libtess/tess.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
-        <!-- void (void*)* GLUtesselator::callEndData -->
+        <!-- void(*GLUtesselator::callEndData)(void*) -->
         <var-decl name='callEndData' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
-        <!-- void (typedef GLenum, void*)* GLUtesselator::callErrorData -->
+        <!-- void(*GLUtesselator::callErrorData)(GLenum, void*) -->
         <var-decl name='callErrorData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <!-- void (GLdouble*, void**, GLfloat*, void**, void*)* GLUtesselator::callCombineData -->
+        <!-- void(*GLUtesselator::callCombineData)(GLdouble*, void**, GLfloat*, void**, void*) -->
         <var-decl name='callCombineData' type-id='type-id-404' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
@@ -22629,7 +22629,7 @@ 
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int (typedef PQHeapKey, typedef PQHeapKey)* PriorityQHeap::leq -->
+        <!-- int(*PriorityQHeap::leq)(PQHeapKey, PQHeapKey) -->
         <var-decl name='leq' type-id='type-id-416' visibility='default' filepath='libtess/priorityq-heap.h' line='92' column='1'/>
       </data-member>
     </class-decl>
@@ -22660,7 +22660,7 @@ 
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int (typedef PQSortKey, typedef PQSortKey)* PriorityQSort::leq -->
+        <!-- int(*PriorityQSort::leq)(PQSortKey, PQSortKey) -->
         <var-decl name='leq' type-id='type-id-416' visibility='default' filepath='libtess/priorityq.h' line='103' column='1'/>
       </data-member>
     </class-decl>
@@ -22763,27 +22763,27 @@ 
     <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-418'/>
     <!-- PriorityQSort* -->
     <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-398'/>
-    <!-- int (typedef PQHeapKey, typedef PQHeapKey)* -->
+    <!-- int(*)(PQHeapKey, PQHeapKey) -->
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-416'/>
-    <!-- int (void*, typedef DictListKey, typedef DictListKey)* -->
+    <!-- int(*)(void*, DictListKey, DictListKey) -->
     <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-383'/>
-    <!-- void (GLUmesh*)* -->
+    <!-- void(*)(GLUmesh*) -->
     <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-401'/>
-    <!-- void (GLdouble*, void**, GLfloat*, void**)* -->
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-399'/>
-    <!-- void (GLdouble*, void**, GLfloat*, void**, void*)* -->
-    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-404'/>
-    <!-- void (typedef GLboolean)* -->
-    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-400'/>
-    <!-- void (typedef GLboolean, void*)* -->
-    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-402'/>
-    <!-- void (typedef GLenum)* -->
+    <!-- void(*)(GLboolean) -->
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-400'/>
+    <!-- void(*)(GLboolean, void*) -->
+    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-402'/>
+    <!-- void(*)(GLdouble*, void**, GLfloat*, void**) -->
+    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-399'/>
+    <!-- void(*)(GLdouble*, void**, GLfloat*, void**, void*) -->
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-404'/>
+    <!-- void(*)(GLenum) -->
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-11'/>
-    <!-- void (typedef GLenum, void*)* -->
+    <!-- void(*)(GLenum, void*) -->
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-14'/>
-    <!-- void (void*)* -->
+    <!-- void(*)(void*) -->
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-15'/>
-    <!-- void (void*, void*)* -->
+    <!-- void(*)(void*, void*) -->
     <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-403'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-184'/>
@@ -22943,7 +22943,7 @@ 
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**) -->
-    <function-type size-in-bits='64' id='type-id-436'>
+    <function-type size-in-bits='64' id='type-id-438'>
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-441'/>
       <!-- parameter of type 'void**' -->
@@ -22956,7 +22956,7 @@ 
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-437'>
+    <function-type size-in-bits='64' id='type-id-439'>
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-441'/>
       <!-- parameter of type 'void**' -->
@@ -22971,14 +22971,14 @@ 
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLboolean) -->
-    <function-type size-in-bits='64' id='type-id-438'>
+    <function-type size-in-bits='64' id='type-id-436'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-49'/>
       <!-- void -->
       <return type-id='type-id-19'/>
     </function-type>
     <!-- void (GLboolean, void*) -->
-    <function-type size-in-bits='64' id='type-id-439'>
+    <function-type size-in-bits='64' id='type-id-437'>
       <!-- parameter of type 'typedef GLboolean' -->
       <parameter type-id='type-id-49'/>
       <!-- parameter of type 'void*' -->
@@ -23370,7 +23370,7 @@ 
         <var-decl name='drawStyle' type-id='type-id-60' visibility='default' filepath='libutil/quad.c' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (typedef GLint)* GLUquadric::errorCallback -->
+        <!-- void(*GLUquadric::errorCallback)(GLint) -->
         <var-decl name='errorCallback' type-id='type-id-455' visibility='default' filepath='libutil/quad.c' line='50' column='1'/>
       </data-member>
     </class-decl>
@@ -23378,14 +23378,14 @@ 
     <typedef-decl name='GLUquadric' type-id='type-id-454' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-456'/>
     <!-- typedef unsigned char GLboolean -->
     <typedef-decl name='GLboolean' type-id='type-id-443' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-49'/>
-    <!-- typedef void ()* _GLUfuncptr -->
+    <!-- typedef void(*)(void) _GLUfuncptr -->
     <typedef-decl name='_GLUfuncptr' type-id='type-id-12' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-22'/>
     <!-- GLUquadric* -->
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
-    <!-- void (typedef GLint)* -->
+    <!-- void(*)(GLint) -->
     <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-455'/>
+    <!-- void(*)(void) -->
+    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
     <!-- GLUquadric* gluNewQuadric() -->
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
       <!-- GLUquadric* -->
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index b749a0a6..65e69956 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3123,11 +3123,11 @@ 
         <var-decl name='alc' type-id='type-id-11' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='228' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-12' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-13'/>
-    <!-- typedef int (backtrace_state*, typedef uintptr_t, typedef backtrace_full_callback, typedef backtrace_error_callback, void*)* fileline -->
+    <!-- typedef int (*)(backtrace_state*, uintptr_t, backtrace_full_callback, backtrace_error_callback, void*) fileline -->
     <typedef-decl name='fileline' type-id='type-id-14' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='114' column='1' id='type-id-7'/>
-    <!-- typedef void (backtrace_state*, typedef uintptr_t, typedef backtrace_syminfo_callback, typedef backtrace_error_callback, void*)* syminfo -->
+    <!-- typedef void (*)(backtrace_state*, uintptr_t, backtrace_syminfo_callback, backtrace_error_callback, void*) syminfo -->
     <typedef-decl name='syminfo' type-id='type-id-15' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='121' column='1' id='type-id-8'/>
     <!-- backtrace_freelist_struct* -->
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-9'/>
@@ -3139,9 +3139,9 @@ 
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-20'/>
     <!-- fileline* -->
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-21'/>
-    <!-- int (backtrace_state*, typedef uintptr_t, typedef backtrace_full_callback, typedef backtrace_error_callback, void*)* -->
+    <!-- int (*)(backtrace_state*, uintptr_t, backtrace_full_callback, backtrace_error_callback, void*) -->
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-14'/>
-    <!-- void (backtrace_state*, typedef uintptr_t, typedef backtrace_syminfo_callback, typedef backtrace_error_callback, void*)* -->
+    <!-- void (*)(backtrace_state*, uintptr_t, backtrace_syminfo_callback, backtrace_error_callback, void*) -->
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-15'/>
     <!-- struct backtrace_freelist_struct -->
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='55' column='1' id='type-id-16'>
@@ -3191,7 +3191,7 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- void __asan_backtrace_qsort(void*, size_t, size_t, int (void*, void*)*) -->
+    <!-- void __asan_backtrace_qsort(void*, size_t, size_t, int (*)(void*, void*)) -->
     <function-decl name='__asan_backtrace_qsort' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
@@ -3199,7 +3199,7 @@ 
       <parameter type-id='type-id-11'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-11'/>
-      <!-- parameter of type 'int (void*, void*)*' -->
+      <!-- parameter of type 'int (*)(void*, void*)' -->
       <parameter type-id='type-id-12'/>
       <!-- void -->
       <return type-id='type-id-27'/>
@@ -3437,9 +3437,9 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int dl_iterate_phdr(int (dl_phdr_info*, typedef size_t, void*)*, void*) -->
+    <!-- int dl_iterate_phdr(int (*)(dl_phdr_info*, size_t, void*), void*) -->
     <function-decl name='dl_iterate_phdr' filepath='/usr/include/link.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'int (dl_phdr_info*, typedef size_t, void*)*' -->
+      <!-- parameter of type 'int (*)(dl_phdr_info*, size_t, void*)' -->
       <parameter type-id='type-id-36'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
@@ -4338,7 +4338,7 @@ 
     <qualified-type-def type-id='type-id-88' const='yes' id='type-id-89'/>
     <!-- const __sanitizer::CrashOnMapUnmap* -->
     <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-90'/>
-    <!-- void (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* -->
+    <!-- void (*)(__sanitizer::uptr, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-91' size-in-bits='64' id='type-id-92'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -4393,7 +4393,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* __sanitizer::LowLevelAllocateCallback -->
+      <!-- typedef void (*)(__sanitizer::uptr, __sanitizer::uptr) __sanitizer::LowLevelAllocateCallback -->
       <typedef-decl name='LowLevelAllocateCallback' type-id='type-id-92' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='116' column='1' id='type-id-93'/>
       <!-- __sanitizer::InternalAllocator* __sanitizer::internal_allocator() -->
       <function-decl name='internal_allocator' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4414,7 +4414,7 @@ 
         <enumerator name='AllocatorStatUnmapped' value='3'/>
         <enumerator name='AllocatorStatCount' value='4'/>
       </enum-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, void*)* __sanitizer::ForEachChunkCallback -->
+      <!-- typedef void (*)(__sanitizer::uptr, void*) __sanitizer::ForEachChunkCallback -->
       <typedef-decl name='ForEachChunkCallback' type-id='type-id-96' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='284' column='1' id='type-id-97'/>
       <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > __sanitizer::InternalAllocatorCache -->
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-98' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-99'/>
@@ -4609,9 +4609,9 @@ 
     <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-126'/>
     <!-- __sanitizer::StackTrace* -->
     <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-128'/>
-    <!-- bool (const unsigned long int&, const unsigned long int&)* -->
+    <!-- bool (*)(const unsigned long int&, const unsigned long int&) -->
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
-    <!-- bool (void*, char*, int)* -->
+    <!-- bool (*)(void*, char*, int) -->
     <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-132'/>
     <!-- const __sanitizer::LoadedModule -->
     <qualified-type-def type-id='type-id-125' const='yes' id='type-id-133'/>
@@ -4853,7 +4853,7 @@ 
       <!-- struct __sanitizer::StackTrace -->
       <class-decl name='StackTrace' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='31' column='1' id='type-id-127'>
         <member-type access='public'>
-          <!-- typedef bool (void*, char*, int)* __sanitizer::StackTrace::SymbolizeCallback -->
+          <!-- typedef bool (*)(void*, char*, int) __sanitizer::StackTrace::SymbolizeCallback -->
           <typedef-decl name='SymbolizeCallback' type-id='type-id-132' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='33' column='1' id='type-id-141'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -4982,7 +4982,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- typedef void ()* __sanitizer::DieCallbackType -->
+      <!-- typedef void (*)(void) __sanitizer::DieCallbackType -->
       <typedef-decl name='DieCallbackType' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='202' column='1' id='type-id-145'/>
       <!-- class __sanitizer::Symbolizer -->
       <class-decl name='Symbolizer' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='64' column='1' id='type-id-146'>
@@ -5062,11 +5062,11 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::EndSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::EndSymbolizationHook -->
           <typedef-decl name='EndSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-150'/>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::StartSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::StartSymbolizationHook -->
           <typedef-decl name='StartSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-151'/>
         </member-type>
         <data-member access='private' static='yes'>
@@ -5289,7 +5289,7 @@ 
         <!-- void -->
         <return type-id='type-id-27'/>
       </function-decl>
-      <!-- typedef void (const char*, int, const char*, typedef __sanitizer::u64, typedef __sanitizer::u64)* __sanitizer::CheckFailedCallbackType -->
+      <!-- typedef void (*)(const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) __sanitizer::CheckFailedCallbackType -->
       <typedef-decl name='CheckFailedCallbackType' type-id='type-id-157' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='205' column='1' id='type-id-158'/>
       <!-- bool __sanitizer::IsPowerOfTwo(__sanitizer::uptr) -->
       <function-decl name='IsPowerOfTwo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5335,13 +5335,8 @@ 
       <!-- bool -->
       <return type-id='type-id-112'/>
     </function-type>
-    <!-- void () -->
-    <function-type size-in-bits='64' id='type-id-160'>
-      <!-- void -->
-      <return type-id='type-id-27'/>
-    </function-type>
     <!-- void (const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) -->
-    <function-type size-in-bits='64' id='type-id-161'>
+    <function-type size-in-bits='64' id='type-id-160'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'int' -->
@@ -5355,6 +5350,11 @@ 
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
+    <!-- void () -->
+    <function-type size-in-bits='64' id='type-id-161'>
+      <!-- void -->
+      <return type-id='type-id-27'/>
+    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
@@ -6162,9 +6162,9 @@ 
     <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-206'/>
     <!-- sigaltstack* -->
     <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-223'/>
-    <!-- void (int, void*, void*)* -->
+    <!-- void (*)(int, void*, void*) -->
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
-    <!-- void (void*, typedef __sanitizer::uptr)* -->
+    <!-- void (*)(void*, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -6456,20 +6456,20 @@ 
       <!-- struct __sanitizer::__sanitizer_kernel_sigaction_t -->
       <class-decl name='__sanitizer_kernel_sigaction_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='423' column='1' id='type-id-213'>
         <member-type access='public'>
-          <!-- union {void (int, void*, void*)* sigaction; void (int)* handler;} -->
+          <!-- union {void (* sigaction)(int, void*, void*); void (* handler)(int);} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='424' column='1' id='type-id-230'>
             <data-member access='public'>
-              <!-- void (int, void*, void*)* sigaction -->
+              <!-- void (* sigaction)(int, void*, void*) -->
               <var-decl name='sigaction' type-id='type-id-225' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='425' column='1'/>
             </data-member>
             <data-member access='public'>
-              <!-- void (int)* handler -->
+              <!-- void (* handler)(int) -->
               <var-decl name='handler' type-id='type-id-231' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='426' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <!-- union {void (int, void*, void*)* sigaction; void (int)* handler;} -->
+          <!-- union {void (* sigaction)(int, void*, void*); void (* handler)(int);} -->
           <var-decl name='' type-id='type-id-230' visibility='default'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
@@ -6477,7 +6477,7 @@ 
           <var-decl name='sa_flags' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='428' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <!-- void ()* __sanitizer::__sanitizer_kernel_sigaction_t::sa_restorer -->
+          <!-- void (* __sanitizer::__sanitizer_kernel_sigaction_t::sa_restorer)(void) -->
           <var-decl name='sa_restorer' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='429' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
@@ -6699,7 +6699,7 @@ 
         <!-- typedef __sanitizer::uptr -->
         <return type-id='type-id-2'/>
       </function-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, typedef __sanitizer::uptr, bool, __sanitizer::uptr*, typedef __sanitizer::uptr)* __sanitizer::fill_profile_f -->
+      <!-- typedef void (*)(__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) __sanitizer::fill_profile_f -->
       <typedef-decl name='fill_profile_f' type-id='type-id-239' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_procmaps.h' line='119' column='1' id='type-id-240'/>
       <!-- bool __sanitizer::internal_iserror(__sanitizer::uptr, int*) -->
       <function-decl name='internal_iserror' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_syscall_linux_x86_64.inc' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6782,7 +6782,7 @@ 
         <var-decl name='__align' type-id='type-id-41' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='56' column='1'/>
       </data-member>
     </union-decl>
-    <!-- bool (const char*)* -->
+    <!-- bool (*)(const char*) -->
     <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
     <!-- const pthread_attr_t -->
     <qualified-type-def type-id='type-id-249' const='yes' id='type-id-252'/>
@@ -6798,7 +6798,7 @@ 
     <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-255'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
-      <!-- typedef bool (const char*)* __sanitizer::string_predicate_t -->
+      <!-- typedef bool (*)(const char*) __sanitizer::string_predicate_t -->
       <typedef-decl name='string_predicate_t' type-id='type-id-251' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='467' column='1' id='type-id-257'/>
       <!-- void __sanitizer::atomic_signal_fence(__sanitizer::memory_order) -->
       <function-decl name='atomic_signal_fence' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='18' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8065,9 +8065,9 @@ 
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
-    <!-- int atexit(void ()*) -->
+    <!-- int atexit(void (*)(void)) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144'/>
       <!-- int -->
       <return type-id='type-id-6'/>
@@ -8129,7 +8129,7 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-    <!-- void (const char*)* -->
+    <!-- void (*)(const char*) -->
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -8169,7 +8169,7 @@ 
     <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
     <!-- __sanitizer::StackDesc* -->
     <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <!-- bool (const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)* -->
+    <!-- bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&) -->
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair> -->
     <qualified-type-def type-id='type-id-272' const='yes' id='type-id-285'/>
@@ -8545,7 +8545,7 @@ 
         <!-- void -->
         <return type-id='type-id-27'/>
       </function-decl>
-      <!-- __sanitizer::uptr __sanitizer::InternalBinarySearch<__sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>, __sanitizer::StackDepotReverseMap::IdDescPair, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)>(const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>&, __sanitizer::uptr, __sanitizer::uptr, const __sanitizer::StackDepotReverseMap::IdDescPair&, bool (const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)*) -->
+      <!-- __sanitizer::uptr __sanitizer::InternalBinarySearch<__sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>, __sanitizer::StackDepotReverseMap::IdDescPair, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)>(const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>&, __sanitizer::uptr, __sanitizer::uptr, const __sanitizer::StackDepotReverseMap::IdDescPair&, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)) -->
       <function-decl name='InternalBinarySearch&lt;__sanitizer::InternalMmapVector&lt;__sanitizer::StackDepotReverseMap::IdDescPair&gt;, __sanitizer::StackDepotReverseMap::IdDescPair, bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&amp;, const __sanitizer::StackDepotReverseMap::IdDescPair&amp;)&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>&' -->
         <parameter type-id='type-id-286'/>
@@ -8555,7 +8555,7 @@ 
         <parameter type-id='type-id-2'/>
         <!-- parameter of type 'const __sanitizer::StackDepotReverseMap::IdDescPair&' -->
         <parameter type-id='type-id-291'/>
-        <!-- parameter of type 'bool (const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)*' -->
+        <!-- parameter of type 'bool (*)(const __sanitizer::StackDepotReverseMap::IdDescPair&, const __sanitizer::StackDepotReverseMap::IdDescPair&)' -->
         <parameter type-id='type-id-284'/>
         <!-- typedef __sanitizer::uptr -->
         <return type-id='type-id-2'/>
@@ -8842,7 +8842,7 @@ 
       </function-decl>
       <!-- typedef int __sanitizer::SuspendedThreadID -->
       <typedef-decl name='SuspendedThreadID' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='19' column='1' id='type-id-308'/>
-      <!-- typedef void (const __sanitizer::SuspendedThreadsList&, void*)* __sanitizer::StopTheWorldCallback -->
+      <!-- typedef void (*)(const __sanitizer::SuspendedThreadsList&, void*) __sanitizer::StopTheWorldCallback -->
       <typedef-decl name='StopTheWorldCallback' type-id='type-id-312' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='54' column='1' id='type-id-310'/>
     </namespace-decl>
   </abi-instr>
@@ -8939,25 +8939,25 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-    <!-- typedef void (void*, const char*, int)* backtrace_error_callback -->
+    <!-- typedef void (*)(void*, const char*, int) backtrace_error_callback -->
     <typedef-decl name='backtrace_error_callback' type-id='type-id-313' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='82' column='1' id='type-id-26'/>
-    <!-- typedef int (void*, typedef uintptr_t, const char*, int, const char*)* backtrace_full_callback -->
+    <!-- typedef int (*)(void*, uintptr_t, const char*, int, const char*) backtrace_full_callback -->
     <typedef-decl name='backtrace_full_callback' type-id='type-id-314' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='110' column='1' id='type-id-30'/>
-    <!-- typedef void (void*, typedef uintptr_t, const char*, typedef uintptr_t, typedef uintptr_t)* backtrace_syminfo_callback -->
+    <!-- typedef void (*)(void*, uintptr_t, const char*, uintptr_t, uintptr_t) backtrace_syminfo_callback -->
     <typedef-decl name='backtrace_syminfo_callback' type-id='type-id-315' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='175' column='1' id='type-id-29'/>
-    <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
+    <!-- typedef void (*)(const char*, size_t, void*) demangle_callbackref -->
     <typedef-decl name='demangle_callbackref' type-id='type-id-316' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-83'/>
     <!-- typedef unsigned long int uintptr_t -->
     <typedef-decl name='uintptr_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-25'/>
     <!-- backtrace_state* -->
     <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-24'/>
-    <!-- int (void*, typedef uintptr_t, const char*, int, const char*)* -->
+    <!-- int (*)(void*, uintptr_t, const char*, int, const char*) -->
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-314'/>
-    <!-- void (const char*, typedef size_t, void*)* -->
+    <!-- void (*)(const char*, size_t, void*) -->
     <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-316'/>
-    <!-- void (void*, const char*, int)* -->
+    <!-- void (*)(void*, const char*, int) -->
     <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-313'/>
-    <!-- void (void*, typedef uintptr_t, const char*, typedef uintptr_t, typedef uintptr_t)* -->
+    <!-- void (*)(void*, uintptr_t, const char*, uintptr_t, uintptr_t) -->
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-315'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -9038,7 +9038,7 @@ 
     <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-327'/>
     <!-- __sanitizer::Symbolizer::SymbolizerScope* -->
     <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-149'/>
-    <!-- bool (const char*, typedef __sanitizer::u64, char*, int)* -->
+    <!-- bool (*)(const char*, __sanitizer::u64, char*, int) -->
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
     <!-- const __sanitizer::Symbolizer -->
     <qualified-type-def type-id='type-id-146' const='yes' id='type-id-330'/>
@@ -9185,7 +9185,7 @@ 
       <!-- class __sanitizer::InternalSymbolizer -->
       <class-decl name='InternalSymbolizer' size-in-bits='131072' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='321' column='1' id='type-id-321'>
         <member-type access='public'>
-          <!-- typedef bool (const char*, typedef __sanitizer::u64, char*, int)* __sanitizer::InternalSymbolizer::SanitizerSymbolizeFn -->
+          <!-- typedef bool (*)(const char*, __sanitizer::u64, char*, int) __sanitizer::InternalSymbolizer::SanitizerSymbolizeFn -->
           <typedef-decl name='SanitizerSymbolizeFn' type-id='type-id-329' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='323' column='1' id='type-id-331'/>
         </member-type>
         <data-member access='private' static='yes'>
@@ -9564,11 +9564,11 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::EndSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::EndSymbolizationHook -->
           <typedef-decl name='EndSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-150'/>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void ()* __sanitizer::Symbolizer::StartSymbolizationHook -->
+          <!-- typedef void (*)(void) __sanitizer::Symbolizer::StartSymbolizationHook -->
           <typedef-decl name='StartSymbolizationHook' type-id='type-id-144' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-151'/>
         </member-type>
         <data-member access='private' static='yes'>
@@ -9835,7 +9835,7 @@ 
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
-      <!-- typedef __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* __sanitizer::ThreadContextFactory -->
+      <!-- typedef __sanitizer::ThreadContextBase* (*)(__sanitizer::u32) __sanitizer::ThreadContextFactory -->
       <typedef-decl name='ThreadContextFactory' type-id='type-id-332' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-333'/>
     </namespace-decl>
   </abi-instr>
@@ -10669,7 +10669,7 @@ 
     <!-- class AtExitContext -->
     <class-decl name='AtExitContext' size-in-bits='17536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='281' column='1' id='type-id-370'>
       <member-type access='public'>
-        <!-- typedef void ()* AtExitContext::atexit_t -->
+        <!-- typedef void (*)(void) AtExitContext::atexit_t -->
         <typedef-decl name='atexit_t' type-id='type-id-144' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='288' column='1' id='type-id-371'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -10681,7 +10681,7 @@ 
         <var-decl name='mtx_' type-id='type-id-372' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='333' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <!-- void ()* AtExitContext::stack_[128] -->
+        <!-- void (* AtExitContext::stack_[128])(void) -->
         <var-decl name='stack_' type-id='type-id-373' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='334' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8256'>
@@ -10999,20 +10999,20 @@ 
     <!-- struct sigaction_t -->
     <class-decl name='sigaction_t' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='91' column='1' id='type-id-400'>
       <member-type access='public'>
-        <!-- union {sighandler_t sa_handler; void (int, my_siginfo_t*, void*)* sa_sigaction;} -->
+        <!-- union {sighandler_t sa_handler; void (* sa_sigaction)(int, my_siginfo_t*, void*);} -->
         <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='92' column='1' id='type-id-401'>
           <data-member access='public'>
             <!-- sighandler_t sa_handler -->
             <var-decl name='sa_handler' type-id='type-id-402' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='93' column='1'/>
           </data-member>
           <data-member access='public'>
-            <!-- void (int, my_siginfo_t*, void*)* sa_sigaction -->
+            <!-- void (* sa_sigaction)(int, my_siginfo_t*, void*) -->
             <var-decl name='sa_sigaction' type-id='type-id-403' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='94' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- union {sighandler_t sa_handler; void (int, my_siginfo_t*, void*)* sa_sigaction;} -->
+        <!-- union {sighandler_t sa_handler; void (* sa_sigaction)(int, my_siginfo_t*, void*);} -->
         <var-decl name='' type-id='type-id-401' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -11024,7 +11024,7 @@ 
         <var-decl name='sa_flags' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void ()* sigaction_t::sa_restorer -->
+        <!-- void (* sigaction_t::sa_restorer)(void) -->
         <var-decl name='sa_restorer' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='98' column='1'/>
       </data-member>
     </class-decl>
@@ -11064,645 +11064,645 @@ 
     <typedef-decl name='SIZE_T' type-id='type-id-2' filepath='../../.././libsanitizer/interception/interception.h' line='24' column='1' id='type-id-412'/>
     <!-- typedef __sanitizer::sptr SSIZE_T -->
     <typedef-decl name='SSIZE_T' type-id='type-id-413' filepath='../../.././libsanitizer/interception/interception.h' line='25' column='1' id='type-id-414'/>
-    <!-- typedef int (int)* __close_f -->
+    <!-- typedef int (*)(int) __close_f -->
     <typedef-decl name='__close_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' id='type-id-416'/>
-    <!-- typedef int (void (void*)*, void*, void*)* __cxa_atexit_f -->
+    <!-- typedef int (*)(void (*)(void*), void*, void*) __cxa_atexit_f -->
     <typedef-decl name='__cxa_atexit_f' type-id='type-id-417' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1' id='type-id-418'/>
-    <!-- typedef int (int, int, void*)* __fxstat64_f -->
+    <!-- typedef int (*)(int, int, void*) __fxstat64_f -->
     <typedef-decl name='__fxstat64_f' type-id='type-id-419' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1271' column='1' id='type-id-420'/>
-    <!-- typedef int (int, int, void*)* __fxstat_f -->
+    <!-- typedef int (*)(int, int, void*) __fxstat_f -->
     <typedef-decl name='__fxstat_f' type-id='type-id-419' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1257' column='1' id='type-id-421'/>
-    <!-- typedef int (void*, const char*, variadic parameter type)* __isoc99_fscanf_f -->
+    <!-- typedef int (*)(void*, const char*, ...) __isoc99_fscanf_f -->
     <typedef-decl name='__isoc99_fscanf_f' type-id='type-id-422' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' id='type-id-423'/>
-    <!-- typedef int (const char*, variadic parameter type)* __isoc99_scanf_f -->
+    <!-- typedef int (*)(const char*, ...) __isoc99_scanf_f -->
     <typedef-decl name='__isoc99_scanf_f' type-id='type-id-424' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' id='type-id-425'/>
-    <!-- typedef int (const char*, const char*, variadic parameter type)* __isoc99_sscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, ...) __isoc99_sscanf_f -->
     <typedef-decl name='__isoc99_sscanf_f' type-id='type-id-426' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' id='type-id-427'/>
-    <!-- typedef int (void*, const char*, typedef __va_list_tag __va_list_tag*)* __isoc99_vfscanf_f -->
+    <!-- typedef int (*)(void*, const char*, typedef __va_list_tag __va_list_tag*) __isoc99_vfscanf_f -->
     <typedef-decl name='__isoc99_vfscanf_f' type-id='type-id-428' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' id='type-id-429'/>
-    <!-- typedef int (const char*, typedef __va_list_tag __va_list_tag*)* __isoc99_vscanf_f -->
+    <!-- typedef int (*)(const char*, typedef __va_list_tag __va_list_tag*) __isoc99_vscanf_f -->
     <typedef-decl name='__isoc99_vscanf_f' type-id='type-id-430' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' id='type-id-431'/>
-    <!-- typedef int (const char*, const char*, typedef __va_list_tag __va_list_tag*)* __isoc99_vsscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) __isoc99_vsscanf_f -->
     <typedef-decl name='__isoc99_vsscanf_f' type-id='type-id-432' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' id='type-id-433'/>
-    <!-- typedef void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* __libc_memalign_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr, __sanitizer::uptr) __libc_memalign_f -->
     <typedef-decl name='__libc_memalign_f' type-id='type-id-434' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='487' column='1' id='type-id-435'/>
-    <!-- typedef int (int, const char*, void*)* __lxstat64_f -->
+    <!-- typedef int (*)(int, const char*, void*) __lxstat64_f -->
     <typedef-decl name='__lxstat64_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' id='type-id-437'/>
-    <!-- typedef int (int, const char*, void*)* __lxstat_f -->
+    <!-- typedef int (*)(int, const char*, void*) __lxstat_f -->
     <typedef-decl name='__lxstat_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' id='type-id-438'/>
-    <!-- typedef void (void*, bool)* __res_iclose_f -->
+    <!-- typedef void (*)(void*, bool) __res_iclose_f -->
     <typedef-decl name='__res_iclose_f' type-id='type-id-439' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1447' column='1' id='type-id-440'/>
-    <!-- typedef int (void*)* __sigsetjmp_f -->
+    <!-- typedef int (*)(void*) __sigsetjmp_f -->
     <typedef-decl name='__sigsetjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='457' column='1' id='type-id-442'/>
-    <!-- typedef int (int, char*, typedef SIZE_T)* __xpg_strerror_r_f -->
+    <!-- typedef int (*)(int, char*, SIZE_T) __xpg_strerror_r_f -->
     <typedef-decl name='__xpg_strerror_r_f' type-id='type-id-443' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' id='type-id-444'/>
-    <!-- typedef int (int, const char*, void*)* __xstat64_f -->
+    <!-- typedef int (*)(int, const char*, void*) __xstat64_f -->
     <typedef-decl name='__xstat64_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' id='type-id-445'/>
-    <!-- typedef int (int, const char*, void*)* __xstat_f -->
+    <!-- typedef int (*)(int, const char*, void*) __xstat_f -->
     <typedef-decl name='__xstat_f' type-id='type-id-436' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1217' column='1' id='type-id-446'/>
-    <!-- typedef void (int)* _exit_f -->
+    <!-- typedef void (*)(int) _exit_f -->
     <typedef-decl name='_exit_f' type-id='type-id-231' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' id='type-id-447'/>
-    <!-- typedef int (void*)* _setjmp_f -->
+    <!-- typedef int (*)(void*) _setjmp_f -->
     <typedef-decl name='_setjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='455' column='1' id='type-id-448'/>
-    <!-- typedef void (int)* abort_f -->
+    <!-- typedef void (*)(int) abort_f -->
     <typedef-decl name='abort_f' type-id='type-id-231' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' id='type-id-449'/>
-    <!-- typedef int (int, void*, unsigned int*, int)* accept4_f -->
+    <!-- typedef int (*)(int, void*, unsigned int*, int) accept4_f -->
     <typedef-decl name='accept4_f' type-id='type-id-450' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1' id='type-id-451'/>
-    <!-- typedef int (int, void*, unsigned int*)* accept_f -->
+    <!-- typedef int (*)(int, void*, unsigned int*) accept_f -->
     <typedef-decl name='accept_f' type-id='type-id-452' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1324' column='1' id='type-id-453'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_tm*)* asctime_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_tm*) asctime_f -->
     <typedef-decl name='asctime_f' type-id='type-id-454' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1' id='type-id-455'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_tm*, char*)* asctime_r_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_tm*, char*) asctime_r_f -->
     <typedef-decl name='asctime_r_f' type-id='type-id-456' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' id='type-id-457'/>
-    <!-- typedef int (void ()*)* atexit_f -->
+    <!-- typedef int (*)(void (*)(void)) atexit_f -->
     <typedef-decl name='atexit_f' type-id='type-id-458' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1' id='type-id-459'/>
-    <!-- typedef int (void**, int)* backtrace_f -->
+    <!-- typedef int (*)(void**, int) backtrace_f -->
     <typedef-decl name='backtrace_f' type-id='type-id-460' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1' id='type-id-461'/>
-    <!-- typedef char** (void**, int)* backtrace_symbols_f -->
+    <!-- typedef char** (*)(void**, int) backtrace_symbols_f -->
     <typedef-decl name='backtrace_symbols_f' type-id='type-id-462' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1' id='type-id-463'/>
-    <!-- typedef int (int, void*, unsigned int)* bind_f -->
+    <!-- typedef int (*)(int, void*, unsigned int) bind_f -->
     <typedef-decl name='bind_f' type-id='type-id-464' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' id='type-id-465'/>
-    <!-- typedef void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* calloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr, __sanitizer::uptr) calloc_f -->
     <typedef-decl name='calloc_f' type-id='type-id-434' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='492' column='1' id='type-id-466'/>
-    <!-- typedef char* (const char*)* canonicalize_file_name_f -->
+    <!-- typedef char* (*)(const char*) canonicalize_file_name_f -->
     <typedef-decl name='canonicalize_file_name_f' type-id='type-id-467' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1791' column='1' id='type-id-468'/>
-    <!-- typedef void (void*)* cfree_f -->
+    <!-- typedef void (*)(void*) cfree_f -->
     <typedef-decl name='cfree_f' type-id='type-id-469' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='531' column='1' id='type-id-470'/>
-    <!-- typedef int (typedef __sanitizer::u32, void*)* clock_getres_f -->
+    <!-- typedef int (*)(__sanitizer::u32, void*) clock_getres_f -->
     <typedef-decl name='clock_getres_f' type-id='type-id-471' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='790' column='1' id='type-id-472'/>
-    <!-- typedef int (typedef __sanitizer::u32, void*)* clock_gettime_f -->
+    <!-- typedef int (*)(__sanitizer::u32, void*) clock_gettime_f -->
     <typedef-decl name='clock_gettime_f' type-id='type-id-471' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' id='type-id-473'/>
-    <!-- typedef int (typedef __sanitizer::u32, void*)* clock_settime_f -->
+    <!-- typedef int (*)(__sanitizer::u32, void*) clock_settime_f -->
     <typedef-decl name='clock_settime_f' type-id='type-id-471' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' id='type-id-474'/>
-    <!-- typedef int (int)* close_f -->
+    <!-- typedef int (*)(int) close_f -->
     <typedef-decl name='close_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' id='type-id-475'/>
-    <!-- typedef typedef SIZE_T (int, char*, typedef SIZE_T)* confstr_f -->
+    <!-- typedef SIZE_T (*)(int, char*, SIZE_T) confstr_f -->
     <typedef-decl name='confstr_f' type-id='type-id-476' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' id='type-id-477'/>
-    <!-- typedef int (int, void*, unsigned int)* connect_f -->
+    <!-- typedef int (*)(int, void*, unsigned int) connect_f -->
     <typedef-decl name='connect_f' type-id='type-id-464' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' id='type-id-478'/>
-    <!-- typedef int (const char*, int)* creat64_f -->
+    <!-- typedef int (*)(const char*, int) creat64_f -->
     <typedef-decl name='creat64_f' type-id='type-id-479' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1' id='type-id-480'/>
-    <!-- typedef int (const char*, int)* creat_f -->
+    <!-- typedef int (*)(const char*, int) creat_f -->
     <typedef-decl name='creat_f' type-id='type-id-479' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1301' column='1' id='type-id-481'/>
-    <!-- typedef char* (unsigned long int*)* ctime_f -->
+    <!-- typedef char* (*)(unsigned long int*) ctime_f -->
     <typedef-decl name='ctime_f' type-id='type-id-482' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' id='type-id-483'/>
-    <!-- typedef char* (unsigned long int*, char*)* ctime_r_f -->
+    <!-- typedef char* (*)(unsigned long int*, char*) ctime_r_f -->
     <typedef-decl name='ctime_r_f' type-id='type-id-484' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1' id='type-id-485'/>
-    <!-- typedef int (void*)* dlclose_f -->
+    <!-- typedef int (*)(void*) dlclose_f -->
     <typedef-decl name='dlclose_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' id='type-id-486'/>
-    <!-- typedef void* (const char*, int)* dlopen_f -->
+    <!-- typedef void* (*)(const char*, int) dlopen_f -->
     <typedef-decl name='dlopen_f' type-id='type-id-487' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1' id='type-id-488'/>
-    <!-- typedef int (void*, double*)* drand48_r_f -->
+    <!-- typedef int (*)(void*, double*) drand48_r_f -->
     <typedef-decl name='drand48_r_f' type-id='type-id-489' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' id='type-id-490'/>
-    <!-- typedef int (int, int)* dup2_f -->
+    <!-- typedef int (*)(int, int) dup2_f -->
     <typedef-decl name='dup2_f' type-id='type-id-491' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' id='type-id-492'/>
-    <!-- typedef int (int, int, int)* dup3_f -->
+    <!-- typedef int (*)(int, int, int) dup3_f -->
     <typedef-decl name='dup3_f' type-id='type-id-493' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1333' column='1' id='type-id-494'/>
-    <!-- typedef int (int)* dup_f -->
+    <!-- typedef int (*)(int) dup_f -->
     <typedef-decl name='dup_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' id='type-id-495'/>
-    <!-- typedef int (int)* epoll_create1_f -->
+    <!-- typedef int (*)(int) epoll_create1_f -->
     <typedef-decl name='epoll_create1_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' id='type-id-496'/>
-    <!-- typedef int (int)* epoll_create_f -->
+    <!-- typedef int (*)(int) epoll_create_f -->
     <typedef-decl name='epoll_create_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' id='type-id-497'/>
-    <!-- typedef int (int, int, int, void*)* epoll_ctl_f -->
+    <!-- typedef int (*)(int, int, int, void*) epoll_ctl_f -->
     <typedef-decl name='epoll_ctl_f' type-id='type-id-498' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' id='type-id-499'/>
-    <!-- typedef int (int, void*, int, int)* epoll_wait_f -->
+    <!-- typedef int (*)(int, void*, int, int) epoll_wait_f -->
     <typedef-decl name='epoll_wait_f' type-id='type-id-500' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' id='type-id-501'/>
-    <!-- typedef __sanitizer::__sanitizer_ether_addr* (char*)* ether_aton_f -->
+    <!-- typedef __sanitizer::__sanitizer_ether_addr* (*)(char*) ether_aton_f -->
     <typedef-decl name='ether_aton_f' type-id='type-id-502' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1' id='type-id-503'/>
-    <!-- typedef __sanitizer::__sanitizer_ether_addr* (char*, __sanitizer::__sanitizer_ether_addr*)* ether_aton_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_ether_addr* (*)(char*, __sanitizer::__sanitizer_ether_addr*) ether_aton_r_f -->
     <typedef-decl name='ether_aton_r_f' type-id='type-id-504' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' id='type-id-505'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_ether_addr*)* ether_hostton_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_ether_addr*) ether_hostton_f -->
     <typedef-decl name='ether_hostton_f' type-id='type-id-506' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' id='type-id-507'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_ether_addr*, char*)* ether_line_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_ether_addr*, char*) ether_line_f -->
     <typedef-decl name='ether_line_f' type-id='type-id-508' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' id='type-id-509'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_ether_addr*)* ether_ntoa_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_ether_addr*) ether_ntoa_f -->
     <typedef-decl name='ether_ntoa_f' type-id='type-id-510' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1' id='type-id-511'/>
-    <!-- typedef char* (__sanitizer::__sanitizer_ether_addr*, char*)* ether_ntoa_r_f -->
+    <!-- typedef char* (*)(__sanitizer::__sanitizer_ether_addr*, char*) ether_ntoa_r_f -->
     <typedef-decl name='ether_ntoa_r_f' type-id='type-id-512' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1' id='type-id-513'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_ether_addr*)* ether_ntohost_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_ether_addr*) ether_ntohost_f -->
     <typedef-decl name='ether_ntohost_f' type-id='type-id-506' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' id='type-id-514'/>
-    <!-- typedef int (unsigned int, int)* eventfd_f -->
+    <!-- typedef int (*)(unsigned int, int) eventfd_f -->
     <typedef-decl name='eventfd_f' type-id='type-id-515' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' id='type-id-516'/>
-    <!-- typedef int (void*)* fclose_f -->
+    <!-- typedef int (*)(void*) fclose_f -->
     <typedef-decl name='fclose_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' id='type-id-517'/>
-    <!-- typedef int (void*)* fflush_f -->
+    <!-- typedef int (*)(void*) fflush_f -->
     <typedef-decl name='fflush_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' id='type-id-518'/>
-    <!-- typedef void* (char*, char*)* fopen_f -->
+    <!-- typedef void* (*)(char*, char*) fopen_f -->
     <typedef-decl name='fopen_f' type-id='type-id-519' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1512' column='1' id='type-id-520'/>
-    <!-- typedef int (int)* fork_f -->
+    <!-- typedef int (*)(int) fork_f -->
     <typedef-decl name='fork_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' id='type-id-521'/>
-    <!-- typedef typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* fread_f -->
+    <!-- typedef __sanitizer::uptr (*)(void*, __sanitizer::uptr, __sanitizer::uptr, void*) fread_f -->
     <typedef-decl name='fread_f' type-id='type-id-522' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1554' column='1' id='type-id-523'/>
-    <!-- typedef void (void*)* free_f -->
+    <!-- typedef void (*)(void*) free_f -->
     <typedef-decl name='free_f' type-id='type-id-469' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='521' column='1' id='type-id-524'/>
-    <!-- typedef void* (char*, char*, void*)* freopen_f -->
+    <!-- typedef void* (*)(char*, char*, void*) freopen_f -->
     <typedef-decl name='freopen_f' type-id='type-id-525' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1524' column='1' id='type-id-526'/>
-    <!-- typedef double (double, int*)* frexp_f -->
+    <!-- typedef double (*)(double, int*) frexp_f -->
     <typedef-decl name='frexp_f' type-id='type-id-527' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='164' column='1' id='type-id-528'/>
-    <!-- typedef float (float, int*)* frexpf_f -->
+    <!-- typedef float (*)(float, int*) frexpf_f -->
     <typedef-decl name='frexpf_f' type-id='type-id-529' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='178' column='1' id='type-id-530'/>
-    <!-- typedef long double (long double, int*)* frexpl_f -->
+    <!-- typedef long double (*)(long double, int*) frexpl_f -->
     <typedef-decl name='frexpl_f' type-id='type-id-531' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='186' column='1' id='type-id-532'/>
-    <!-- typedef int (void*, const char*, variadic parameter type)* fscanf_f -->
+    <!-- typedef int (*)(void*, const char*, ...) fscanf_f -->
     <typedef-decl name='fscanf_f' type-id='type-id-422' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='622' column='1' id='type-id-533'/>
-    <!-- typedef int (int, void*)* fstat64_f -->
+    <!-- typedef int (*)(int, void*) fstat64_f -->
     <typedef-decl name='fstat64_f' type-id='type-id-534' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1278' column='1' id='type-id-535'/>
-    <!-- typedef int (int, void*)* fstat_f -->
+    <!-- typedef int (*)(int, void*) fstat_f -->
     <typedef-decl name='fstat_f' type-id='type-id-534' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1264' column='1' id='type-id-536'/>
-    <!-- typedef int (int, void*)* fstatfs64_f -->
+    <!-- typedef int (*)(int, void*) fstatfs64_f -->
     <typedef-decl name='fstatfs64_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2370' column='1' id='type-id-537'/>
-    <!-- typedef int (int, void*)* fstatfs_f -->
+    <!-- typedef int (*)(int, void*) fstatfs_f -->
     <typedef-decl name='fstatfs_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2347' column='1' id='type-id-538'/>
-    <!-- typedef int (int, void*)* fstatvfs64_f -->
+    <!-- typedef int (*)(int, void*) fstatvfs64_f -->
     <typedef-decl name='fstatvfs64_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1' id='type-id-539'/>
-    <!-- typedef int (int, void*)* fstatvfs_f -->
+    <!-- typedef int (*)(int, void*) fstatvfs_f -->
     <typedef-decl name='fstatvfs_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2393' column='1' id='type-id-540'/>
-    <!-- typedef typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* fwrite_f -->
+    <!-- typedef __sanitizer::uptr (*)(void*, __sanitizer::uptr, __sanitizer::uptr, void*) fwrite_f -->
     <typedef-decl name='fwrite_f' type-id='type-id-522' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' id='type-id-541'/>
-    <!-- typedef char* (int)* get_current_dir_name_f -->
+    <!-- typedef char* (*)(int) get_current_dir_name_f -->
     <typedef-decl name='get_current_dir_name_f' type-id='type-id-542' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' id='type-id-543'/>
-    <!-- typedef int (void*, void*, void*, void*)* getaddrinfo_f -->
+    <!-- typedef int (*)(void*, void*, void*, void*) getaddrinfo_f -->
     <typedef-decl name='getaddrinfo_f' type-id='type-id-544' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1' id='type-id-545'/>
-    <!-- typedef char* (char*, typedef SIZE_T)* getcwd_f -->
+    <!-- typedef char* (*)(char*, SIZE_T) getcwd_f -->
     <typedef-decl name='getcwd_f' type-id='type-id-546' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' id='type-id-547'/>
-    <!-- typedef typedef SSIZE_T (char**, SIZE_T*, int, void*)* getdelim_f -->
+    <!-- typedef SSIZE_T (*)(char**, SIZE_T*, int, void*) getdelim_f -->
     <typedef-decl name='getdelim_f' type-id='type-id-548' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' id='type-id-549'/>
-    <!-- typedef int (int, __sanitizer::u32*)* getgroups_f -->
+    <!-- typedef int (*)(int, __sanitizer::u32*) getgroups_f -->
     <typedef-decl name='getgroups_f' type-id='type-id-550' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1' id='type-id-551'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (void*, int, int)* gethostbyaddr_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(void*, int, int) gethostbyaddr_f -->
     <typedef-decl name='gethostbyaddr_f' type-id='type-id-552' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1' id='type-id-553'/>
-    <!-- typedef int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostbyaddr_r_f -->
+    <!-- typedef int (*)(void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostbyaddr_r_f -->
     <typedef-decl name='gethostbyaddr_r_f' type-id='type-id-554' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' id='type-id-555'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (char*, int)* gethostbyname2_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(char*, int) gethostbyname2_f -->
     <typedef-decl name='gethostbyname2_f' type-id='type-id-556' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1' id='type-id-557'/>
-    <!-- typedef int (char*, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostbyname2_r_f -->
+    <!-- typedef int (*)(char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostbyname2_r_f -->
     <typedef-decl name='gethostbyname2_r_f' type-id='type-id-558' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1' id='type-id-559'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (char*)* gethostbyname_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(char*) gethostbyname_f -->
     <typedef-decl name='gethostbyname_f' type-id='type-id-560' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' id='type-id-561'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostbyname_r_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostbyname_r_f -->
     <typedef-decl name='gethostbyname_r_f' type-id='type-id-562' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' id='type-id-563'/>
-    <!-- typedef __sanitizer::__sanitizer_hostent* (int)* gethostent_f -->
+    <!-- typedef __sanitizer::__sanitizer_hostent* (*)(int) gethostent_f -->
     <typedef-decl name='gethostent_f' type-id='type-id-564' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1' id='type-id-565'/>
-    <!-- typedef int (__sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* gethostent_r_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) gethostent_r_f -->
     <typedef-decl name='gethostent_r_f' type-id='type-id-566' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1' id='type-id-567'/>
-    <!-- typedef int (int, void*)* getitimer_f -->
+    <!-- typedef int (*)(int, void*) getitimer_f -->
     <typedef-decl name='getitimer_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' id='type-id-568'/>
-    <!-- typedef typedef SSIZE_T (char**, SIZE_T*, void*)* getline_f -->
+    <!-- typedef SSIZE_T (*)(char**, SIZE_T*, void*) getline_f -->
     <typedef-decl name='getline_f' type-id='type-id-569' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' id='type-id-570'/>
-    <!-- typedef __sanitizer::__sanitizer_mntent* (void*)* getmntent_f -->
+    <!-- typedef __sanitizer::__sanitizer_mntent* (*)(void*) getmntent_f -->
     <typedef-decl name='getmntent_f' type-id='type-id-571' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1' id='type-id-572'/>
-    <!-- typedef __sanitizer::__sanitizer_mntent* (void*, __sanitizer::__sanitizer_mntent*, char*, int)* getmntent_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_mntent* (*)(void*, __sanitizer::__sanitizer_mntent*, char*, int) getmntent_r_f -->
     <typedef-decl name='getmntent_r_f' type-id='type-id-573' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' id='type-id-574'/>
-    <!-- typedef int (int, void*, unsigned int*)* getpeername_f -->
+    <!-- typedef int (*)(int, void*, unsigned int*) getpeername_f -->
     <typedef-decl name='getpeername_f' type-id='type-id-452' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' id='type-id-575'/>
-    <!-- typedef int (int, void*, int*)* getsockname_f -->
+    <!-- typedef int (*)(int, void*, int*) getsockname_f -->
     <typedef-decl name='getsockname_f' type-id='type-id-576' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1' id='type-id-577'/>
-    <!-- typedef int (int, int, int, void*, int*)* getsockopt_f -->
+    <!-- typedef int (*)(int, int, int, void*, int*) getsockopt_f -->
     <typedef-decl name='getsockopt_f' type-id='type-id-578' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1' id='type-id-579'/>
-    <!-- typedef int (void*, void*)* gettimeofday_f -->
+    <!-- typedef int (*)(void*, void*) gettimeofday_f -->
     <typedef-decl name='gettimeofday_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' id='type-id-580'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*)* gmtime_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*) gmtime_f -->
     <typedef-decl name='gmtime_f' type-id='type-id-581' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1' id='type-id-582'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*, void*)* gmtime_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*, void*) gmtime_r_f -->
     <typedef-decl name='gmtime_r_f' type-id='type-id-583' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1' id='type-id-584'/>
-    <!-- typedef typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* iconv_f -->
+    <!-- typedef SIZE_T (*)(void*, char**, SIZE_T*, char**, SIZE_T*) iconv_f -->
     <typedef-decl name='iconv_f' type-id='type-id-585' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' id='type-id-586'/>
-    <!-- typedef int (const char*, void*)* inet_aton_f -->
+    <!-- typedef int (*)(const char*, void*) inet_aton_f -->
     <typedef-decl name='inet_aton_f' type-id='type-id-587' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' id='type-id-588'/>
-    <!-- typedef char* (int, void*, char*, typedef __sanitizer::u32)* inet_ntop_f -->
+    <!-- typedef char* (*)(int, void*, char*, __sanitizer::u32) inet_ntop_f -->
     <typedef-decl name='inet_ntop_f' type-id='type-id-589' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1' id='type-id-590'/>
-    <!-- typedef int (int, const char*, void*)* inet_pton_f -->
+    <!-- typedef int (*)(int, const char*, void*) inet_pton_f -->
     <typedef-decl name='inet_pton_f' type-id='type-id-436' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1' id='type-id-591'/>
-    <!-- typedef int (char*, typedef __sanitizer::u32)* initgroups_f -->
+    <!-- typedef int (*)(char*, __sanitizer::u32) initgroups_f -->
     <typedef-decl name='initgroups_f' type-id='type-id-592' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' id='type-id-593'/>
-    <!-- typedef int (int)* inotify_init1_f -->
+    <!-- typedef int (*)(int) inotify_init1_f -->
     <typedef-decl name='inotify_init1_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' id='type-id-594'/>
-    <!-- typedef int (int)* inotify_init_f -->
+    <!-- typedef int (*)(int) inotify_init_f -->
     <typedef-decl name='inotify_init_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' id='type-id-595'/>
-    <!-- typedef int (int, unsigned int, void*)* ioctl_f -->
+    <!-- typedef int (*)(int, unsigned int, void*) ioctl_f -->
     <typedef-decl name='ioctl_f' type-id='type-id-596' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' id='type-id-597'/>
     <!-- typedef void kernel_sigset_t -->
     <typedef-decl name='kernel_sigset_t' type-id='type-id-27' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='130' column='1' id='type-id-598'/>
-    <!-- typedef int (int, int)* kill_f -->
+    <!-- typedef int (*)(int, int) kill_f -->
     <typedef-decl name='kill_f' type-id='type-id-491' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1727' column='1' id='type-id-599'/>
-    <!-- typedef double (double)* lgamma_f -->
+    <!-- typedef double (*)(double) lgamma_f -->
     <typedef-decl name='lgamma_f' type-id='type-id-600' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2758' column='1' id='type-id-601'/>
-    <!-- typedef double (double, int*)* lgamma_r_f -->
+    <!-- typedef double (*)(double, int*) lgamma_r_f -->
     <typedef-decl name='lgamma_r_f' type-id='type-id-527' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2788' column='1' id='type-id-602'/>
-    <!-- typedef float (float)* lgammaf_f -->
+    <!-- typedef float (*)(float) lgammaf_f -->
     <typedef-decl name='lgammaf_f' type-id='type-id-603' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2765' column='1' id='type-id-604'/>
-    <!-- typedef float (float, int*)* lgammaf_r_f -->
+    <!-- typedef float (*)(float, int*) lgammaf_r_f -->
     <typedef-decl name='lgammaf_r_f' type-id='type-id-529' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2795' column='1' id='type-id-605'/>
-    <!-- typedef long double (long double)* lgammal_f -->
+    <!-- typedef long double (*)(long double) lgammal_f -->
     <typedef-decl name='lgammal_f' type-id='type-id-606' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2772' column='1' id='type-id-607'/>
-    <!-- typedef long double (long double, int*)* lgammal_r_f -->
+    <!-- typedef long double (*)(long double, int*) lgammal_r_f -->
     <typedef-decl name='lgammal_r_f' type-id='type-id-531' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2802' column='1' id='type-id-608'/>
-    <!-- typedef int (int, int)* listen_f -->
+    <!-- typedef int (*)(int, int) listen_f -->
     <typedef-decl name='listen_f' type-id='type-id-491' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1408' column='1' id='type-id-609'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*)* localtime_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*) localtime_f -->
     <typedef-decl name='localtime_f' type-id='type-id-581' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1' id='type-id-610'/>
-    <!-- typedef __sanitizer::__sanitizer_tm* (unsigned long int*, void*)* localtime_r_f -->
+    <!-- typedef __sanitizer::__sanitizer_tm* (*)(unsigned long int*, void*) localtime_r_f -->
     <typedef-decl name='localtime_r_f' type-id='type-id-583' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1' id='type-id-611'/>
     <!-- typedef long int long_t -->
     <typedef-decl name='long_t' type-id='type-id-41' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='79' column='1' id='type-id-612'/>
-    <!-- typedef void (__sanitizer::uptr*, int)* longjmp_f -->
+    <!-- typedef void (*)(__sanitizer::uptr*, int) longjmp_f -->
     <typedef-decl name='longjmp_f' type-id='type-id-613' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' id='type-id-614'/>
-    <!-- typedef int (void*, long int*)* lrand48_r_f -->
+    <!-- typedef int (*)(void*, long int*) lrand48_r_f -->
     <typedef-decl name='lrand48_r_f' type-id='type-id-615' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1' id='type-id-616'/>
-    <!-- typedef int (const char*, void*)* lstat64_f -->
+    <!-- typedef int (*)(const char*, void*) lstat64_f -->
     <typedef-decl name='lstat64_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' id='type-id-617'/>
-    <!-- typedef int (const char*, void*)* lstat_f -->
+    <!-- typedef int (*)(const char*, void*) lstat_f -->
     <typedef-decl name='lstat_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1242' column='1' id='type-id-618'/>
-    <!-- typedef void* (typedef __sanitizer::uptr)* malloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr) malloc_f -->
     <typedef-decl name='malloc_f' type-id='type-id-619' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='475' column='1' id='type-id-620'/>
-    <!-- typedef typedef __sanitizer::uptr (void*)* malloc_usable_size_f -->
+    <!-- typedef __sanitizer::uptr (*)(void*) malloc_usable_size_f -->
     <typedef-decl name='malloc_usable_size_f' type-id='type-id-621' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='541' column='1' id='type-id-622'/>
-    <!-- typedef typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* mbsnrtowcs_f -->
+    <!-- typedef SIZE_T (*)(wchar_t*, const char**, SIZE_T, SIZE_T, void*) mbsnrtowcs_f -->
     <typedef-decl name='mbsnrtowcs_f' type-id='type-id-623' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1673' column='1' id='type-id-624'/>
-    <!-- typedef typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* mbsrtowcs_f -->
+    <!-- typedef SIZE_T (*)(wchar_t*, const char**, SIZE_T, void*) mbsrtowcs_f -->
     <typedef-decl name='mbsrtowcs_f' type-id='type-id-625' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1649' column='1' id='type-id-626'/>
-    <!-- typedef typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* mbstowcs_f -->
+    <!-- typedef SIZE_T (*)(wchar_t*, const char*, SIZE_T) mbstowcs_f -->
     <typedef-decl name='mbstowcs_f' type-id='type-id-627' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1638' column='1' id='type-id-628'/>
-    <!-- typedef void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* memalign_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr, __sanitizer::uptr) memalign_f -->
     <typedef-decl name='memalign_f' type-id='type-id-434' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='770' column='1' id='type-id-629'/>
-    <!-- typedef void* (void*, int, typedef __sanitizer::uptr)* memchr_f -->
+    <!-- typedef void* (*)(void*, int, __sanitizer::uptr) memchr_f -->
     <typedef-decl name='memchr_f' type-id='type-id-630' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='646' column='1' id='type-id-631'/>
-    <!-- typedef int (void*, void*, typedef __sanitizer::uptr)* memcmp_f -->
+    <!-- typedef int (*)(void*, void*, __sanitizer::uptr) memcmp_f -->
     <typedef-decl name='memcmp_f' type-id='type-id-632' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1' id='type-id-633'/>
-    <!-- typedef void* (void*, void*, typedef __sanitizer::uptr)* memcpy_f -->
+    <!-- typedef void* (*)(void*, void*, __sanitizer::uptr) memcpy_f -->
     <typedef-decl name='memcpy_f' type-id='type-id-634' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' id='type-id-635'/>
-    <!-- typedef void* (void*, void*, typedef __sanitizer::uptr)* memmove_f -->
+    <!-- typedef void* (*)(void*, void*, __sanitizer::uptr) memmove_f -->
     <typedef-decl name='memmove_f' type-id='type-id-634' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='660' column='1' id='type-id-636'/>
-    <!-- typedef void* (char*, int, typedef __sanitizer::uptr)* memrchr_f -->
+    <!-- typedef void* (*)(char*, int, __sanitizer::uptr) memrchr_f -->
     <typedef-decl name='memrchr_f' type-id='type-id-637' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1' id='type-id-638'/>
-    <!-- typedef void* (void*, int, typedef __sanitizer::uptr)* memset_f -->
+    <!-- typedef void* (*)(void*, int, __sanitizer::uptr) memset_f -->
     <typedef-decl name='memset_f' type-id='type-id-630' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1' id='type-id-639'/>
-    <!-- typedef int (void*, typedef __sanitizer::uptr)* mlock_f -->
+    <!-- typedef int (*)(void*, __sanitizer::uptr) mlock_f -->
     <typedef-decl name='mlock_f' type-id='type-id-640' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1' id='type-id-641'/>
-    <!-- typedef int (int)* mlockall_f -->
+    <!-- typedef int (*)(int) mlockall_f -->
     <typedef-decl name='mlockall_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' id='type-id-642'/>
-    <!-- typedef void* (void*, typedef long_t, int, int, int, typedef __sanitizer::u64)* mmap64_f -->
+    <!-- typedef void* (*)(void*, long_t, int, int, int, __sanitizer::u64) mmap64_f -->
     <typedef-decl name='mmap64_f' type-id='type-id-643' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1' id='type-id-644'/>
-    <!-- typedef void* (void*, typedef long_t, int, int, int, unsigned int)* mmap_f -->
+    <!-- typedef void* (*)(void*, long_t, int, int, int, unsigned int) mmap_f -->
     <typedef-decl name='mmap_f' type-id='type-id-645' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' id='type-id-646'/>
-    <!-- typedef double (double, double*)* modf_f -->
+    <!-- typedef double (*)(double, double*) modf_f -->
     <typedef-decl name='modf_f' type-id='type-id-647' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1' id='type-id-648'/>
-    <!-- typedef float (float, float*)* modff_f -->
+    <!-- typedef float (*)(float, float*) modff_f -->
     <typedef-decl name='modff_f' type-id='type-id-649' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1' id='type-id-650'/>
-    <!-- typedef long double (long double, long double*)* modfl_f -->
+    <!-- typedef long double (*)(long double, long double*) modfl_f -->
     <typedef-decl name='modfl_f' type-id='type-id-651' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1' id='type-id-652'/>
-    <!-- typedef int (void*, typedef __sanitizer::uptr)* munlock_f -->
+    <!-- typedef int (*)(void*, __sanitizer::uptr) munlock_f -->
     <typedef-decl name='munlock_f' type-id='type-id-640' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1796' column='1' id='type-id-653'/>
-    <!-- typedef int ()* munlockall_f -->
+    <!-- typedef int (*)(void) munlockall_f -->
     <typedef-decl name='munlockall_f' type-id='type-id-654' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1806' column='1' id='type-id-655'/>
-    <!-- typedef int (void*, typedef long_t)* munmap_f -->
+    <!-- typedef int (*)(void*, long_t) munmap_f -->
     <typedef-decl name='munmap_f' type-id='type-id-656' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' id='type-id-657'/>
-    <!-- typedef int (void*, void*)* nanosleep_f -->
+    <!-- typedef int (*)(void*, void*) nanosleep_f -->
     <typedef-decl name='nanosleep_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='252' column='1' id='type-id-658'/>
-    <!-- typedef int (void (int, void*)*, void*)* on_exit_f -->
+    <!-- typedef int (*)(void (*)(int, void*), void*) on_exit_f -->
     <typedef-decl name='on_exit_f' type-id='type-id-659' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1' id='type-id-660'/>
-    <!-- typedef int (const char*, int, int)* open64_f -->
+    <!-- typedef int (*)(const char*, int, int) open64_f -->
     <typedef-decl name='open64_f' type-id='type-id-661' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1' id='type-id-662'/>
-    <!-- typedef int (const char*, int, int)* open_f -->
+    <!-- typedef int (*)(const char*, int, int) open_f -->
     <typedef-decl name='open_f' type-id='type-id-661' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' id='type-id-663'/>
-    <!-- typedef void* (char*)* opendir_f -->
+    <!-- typedef void* (*)(char*) opendir_f -->
     <typedef-decl name='opendir_f' type-id='type-id-664' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1' id='type-id-665'/>
-    <!-- typedef int (int*, int)* pipe2_f -->
+    <!-- typedef int (*)(int*, int) pipe2_f -->
     <typedef-decl name='pipe2_f' type-id='type-id-666' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1' id='type-id-667'/>
-    <!-- typedef int (int*)* pipe_f -->
+    <!-- typedef int (*)(int*) pipe_f -->
     <typedef-decl name='pipe_f' type-id='type-id-668' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1458' column='1' id='type-id-669'/>
-    <!-- typedef int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, int)* poll_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) poll_f -->
     <typedef-decl name='poll_f' type-id='type-id-670' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' id='type-id-671'/>
-    <!-- typedef int (void**, typedef __sanitizer::uptr, typedef __sanitizer::uptr)* posix_memalign_f -->
+    <!-- typedef int (*)(void**, __sanitizer::uptr, __sanitizer::uptr) posix_memalign_f -->
     <typedef-decl name='posix_memalign_f' type-id='type-id-672' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1' id='type-id-673'/>
-    <!-- typedef int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*)* ppoll_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) ppoll_f -->
     <typedef-decl name='ppoll_f' type-id='type-id-674' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' id='type-id-675'/>
-    <!-- typedef int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int)* prctl_f -->
+    <!-- typedef int (*)(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) prctl_f -->
     <typedef-decl name='prctl_f' type-id='type-id-676' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' id='type-id-677'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF64_T)* pread64_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T, OFF64_T) pread64_f -->
     <typedef-decl name='pread64_f' type-id='type-id-678' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' id='type-id-679'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* pread_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T, OFF_T) pread_f -->
     <typedef-decl name='pread_f' type-id='type-id-678' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' id='type-id-680'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* preadv64_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) preadv64_f -->
     <typedef-decl name='preadv64_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' id='type-id-682'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* preadv_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) preadv_f -->
     <typedef-decl name='preadv_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' id='type-id-683'/>
-    <!-- typedef int (void*, typedef SIZE_T, void*)* pthread_attr_getaffinity_np_f -->
+    <!-- typedef int (*)(void*, SIZE_T, void*) pthread_attr_getaffinity_np_f -->
     <typedef-decl name='pthread_attr_getaffinity_np_f' type-id='type-id-684' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1' id='type-id-685'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getdetachstate_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getdetachstate_f -->
     <typedef-decl name='pthread_attr_getdetachstate_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='44' column='1' id='type-id-686'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getguardsize_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getguardsize_f -->
     <typedef-decl name='pthread_attr_getguardsize_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2576' column='1' id='type-id-687'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getinheritsched_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getinheritsched_f -->
     <typedef-decl name='pthread_attr_getinheritsched_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1' id='type-id-688'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getschedparam_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getschedparam_f -->
     <typedef-decl name='pthread_attr_getschedparam_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2577' column='1' id='type-id-689'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getschedpolicy_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getschedpolicy_f -->
     <typedef-decl name='pthread_attr_getschedpolicy_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2578' column='1' id='type-id-690'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getscope_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getscope_f -->
     <typedef-decl name='pthread_attr_getscope_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2579' column='1' id='type-id-691'/>
-    <!-- typedef int (void*, void**, SIZE_T*)* pthread_attr_getstack_f -->
+    <!-- typedef int (*)(void*, void**, SIZE_T*) pthread_attr_getstack_f -->
     <typedef-decl name='pthread_attr_getstack_f' type-id='type-id-692' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1' id='type-id-693'/>
-    <!-- typedef int (void*, void*)* pthread_attr_getstacksize_f -->
+    <!-- typedef int (*)(void*, void*) pthread_attr_getstacksize_f -->
     <typedef-decl name='pthread_attr_getstacksize_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2580' column='1' id='type-id-694'/>
-    <!-- typedef int (void*)* pthread_barrier_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_barrier_destroy_f -->
     <typedef-decl name='pthread_barrier_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' id='type-id-695'/>
-    <!-- typedef int (void*, void*, unsigned int)* pthread_barrier_init_f -->
+    <!-- typedef int (*)(void*, void*, unsigned int) pthread_barrier_init_f -->
     <typedef-decl name='pthread_barrier_init_f' type-id='type-id-696' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' id='type-id-697'/>
-    <!-- typedef int (void*)* pthread_barrier_wait_f -->
+    <!-- typedef int (*)(void*) pthread_barrier_wait_f -->
     <typedef-decl name='pthread_barrier_wait_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' id='type-id-698'/>
-    <!-- typedef int (void*)* pthread_cond_broadcast_f -->
+    <!-- typedef int (*)(void*) pthread_cond_broadcast_f -->
     <typedef-decl name='pthread_cond_broadcast_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' id='type-id-699'/>
-    <!-- typedef int (void*)* pthread_cond_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_cond_destroy_f -->
     <typedef-decl name='pthread_cond_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' id='type-id-700'/>
-    <!-- typedef int (void*, void*)* pthread_cond_init_f -->
+    <!-- typedef int (*)(void*, void*) pthread_cond_init_f -->
     <typedef-decl name='pthread_cond_init_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2257' column='1' id='type-id-701'/>
-    <!-- typedef int (void*)* pthread_cond_signal_f -->
+    <!-- typedef int (*)(void*) pthread_cond_signal_f -->
     <typedef-decl name='pthread_cond_signal_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' id='type-id-702'/>
-    <!-- typedef int (void*, void*, void*)* pthread_cond_timedwait_f -->
+    <!-- typedef int (*)(void*, void*, void*) pthread_cond_timedwait_f -->
     <typedef-decl name='pthread_cond_timedwait_f' type-id='type-id-703' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1' id='type-id-704'/>
-    <!-- typedef int (void*, void*)* pthread_cond_wait_f -->
+    <!-- typedef int (*)(void*, void*) pthread_cond_wait_f -->
     <typedef-decl name='pthread_cond_wait_f' type-id='type-id-12' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2247' column='1' id='type-id-705'/>
-    <!-- typedef int (void*, void*, void* (void*)*, void*)* pthread_create_f -->
+    <!-- typedef int (*)(void*, void*, void* (*)(void*), void*) pthread_create_f -->
     <typedef-decl name='pthread_create_f' type-id='type-id-706' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1' id='type-id-707'/>
-    <!-- typedef int (void*)* pthread_detach_f -->
+    <!-- typedef int (*)(void*) pthread_detach_f -->
     <typedef-decl name='pthread_detach_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' id='type-id-708'/>
-    <!-- typedef int (typedef __sanitizer::uptr, int*, int*)* pthread_getschedparam_f -->
+    <!-- typedef int (*)(__sanitizer::uptr, int*, int*) pthread_getschedparam_f -->
     <typedef-decl name='pthread_getschedparam_f' type-id='type-id-709' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1' id='type-id-710'/>
-    <!-- typedef int (void*, void**)* pthread_join_f -->
+    <!-- typedef int (*)(void*, void**) pthread_join_f -->
     <typedef-decl name='pthread_join_f' type-id='type-id-711' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1' id='type-id-712'/>
-    <!-- typedef int (void*, int)* pthread_kill_f -->
+    <!-- typedef int (*)(void*, int) pthread_kill_f -->
     <typedef-decl name='pthread_kill_f' type-id='type-id-713' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' id='type-id-714'/>
-    <!-- typedef int (void*)* pthread_mutex_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_destroy_f -->
     <typedef-decl name='pthread_mutex_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' id='type-id-715'/>
-    <!-- typedef int (void*, void*)* pthread_mutex_init_f -->
+    <!-- typedef int (*)(void*, void*) pthread_mutex_init_f -->
     <typedef-decl name='pthread_mutex_init_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' id='type-id-716'/>
-    <!-- typedef int (void*)* pthread_mutex_lock_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_lock_f -->
     <typedef-decl name='pthread_mutex_lock_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' id='type-id-717'/>
-    <!-- typedef int (void*, void*)* pthread_mutex_timedlock_f -->
+    <!-- typedef int (*)(void*, void*) pthread_mutex_timedlock_f -->
     <typedef-decl name='pthread_mutex_timedlock_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='959' column='1' id='type-id-718'/>
-    <!-- typedef int (void*)* pthread_mutex_trylock_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_trylock_f -->
     <typedef-decl name='pthread_mutex_trylock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' id='type-id-719'/>
-    <!-- typedef int (void*)* pthread_mutex_unlock_f -->
+    <!-- typedef int (*)(void*) pthread_mutex_unlock_f -->
     <typedef-decl name='pthread_mutex_unlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2231' column='1' id='type-id-720'/>
-    <!-- typedef int (void*, void ()*)* pthread_once_f -->
+    <!-- typedef int (*)(void*, void (*)(void)) pthread_once_f -->
     <typedef-decl name='pthread_once_f' type-id='type-id-721' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' id='type-id-722'/>
-    <!-- typedef int (void*)* pthread_rwlock_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_destroy_f -->
     <typedef-decl name='pthread_rwlock_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' id='type-id-723'/>
-    <!-- typedef int (void*, void*)* pthread_rwlock_init_f -->
+    <!-- typedef int (*)(void*, void*) pthread_rwlock_init_f -->
     <typedef-decl name='pthread_rwlock_init_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1011' column='1' id='type-id-724'/>
-    <!-- typedef int (void*)* pthread_rwlock_rdlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_rdlock_f -->
     <typedef-decl name='pthread_rwlock_rdlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' id='type-id-725'/>
-    <!-- typedef int (void*, void*)* pthread_rwlock_timedrdlock_f -->
+    <!-- typedef int (*)(void*, void*) pthread_rwlock_timedrdlock_f -->
     <typedef-decl name='pthread_rwlock_timedrdlock_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' id='type-id-726'/>
-    <!-- typedef int (void*, void*)* pthread_rwlock_timedwrlock_f -->
+    <!-- typedef int (*)(void*, void*) pthread_rwlock_timedwrlock_f -->
     <typedef-decl name='pthread_rwlock_timedwrlock_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1074' column='1' id='type-id-727'/>
-    <!-- typedef int (void*)* pthread_rwlock_tryrdlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_tryrdlock_f -->
     <typedef-decl name='pthread_rwlock_tryrdlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' id='type-id-728'/>
-    <!-- typedef int (void*)* pthread_rwlock_trywrlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_trywrlock_f -->
     <typedef-decl name='pthread_rwlock_trywrlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' id='type-id-729'/>
-    <!-- typedef int (void*)* pthread_rwlock_unlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_unlock_f -->
     <typedef-decl name='pthread_rwlock_unlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' id='type-id-730'/>
-    <!-- typedef int (void*)* pthread_rwlock_wrlock_f -->
+    <!-- typedef int (*)(void*) pthread_rwlock_wrlock_f -->
     <typedef-decl name='pthread_rwlock_wrlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' id='type-id-731'/>
-    <!-- typedef int (typedef __sanitizer::uptr, const char*)* pthread_setname_np_f -->
+    <!-- typedef int (*)(__sanitizer::uptr, const char*) pthread_setname_np_f -->
     <typedef-decl name='pthread_setname_np_f' type-id='type-id-732' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2685' column='1' id='type-id-733'/>
-    <!-- typedef int (void*)* pthread_spin_destroy_f -->
+    <!-- typedef int (*)(void*) pthread_spin_destroy_f -->
     <typedef-decl name='pthread_spin_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' id='type-id-734'/>
-    <!-- typedef int (void*, int)* pthread_spin_init_f -->
+    <!-- typedef int (*)(void*, int) pthread_spin_init_f -->
     <typedef-decl name='pthread_spin_init_f' type-id='type-id-713' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' id='type-id-735'/>
-    <!-- typedef int (void*)* pthread_spin_lock_f -->
+    <!-- typedef int (*)(void*) pthread_spin_lock_f -->
     <typedef-decl name='pthread_spin_lock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' id='type-id-736'/>
-    <!-- typedef int (void*)* pthread_spin_trylock_f -->
+    <!-- typedef int (*)(void*) pthread_spin_trylock_f -->
     <typedef-decl name='pthread_spin_trylock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' id='type-id-737'/>
-    <!-- typedef int (void*)* pthread_spin_unlock_f -->
+    <!-- typedef int (*)(void*) pthread_spin_unlock_f -->
     <typedef-decl name='pthread_spin_unlock_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' id='type-id-738'/>
-    <!-- typedef typedef __sanitizer::uptr (int, int, void*, void*)* ptrace_f -->
+    <!-- typedef __sanitizer::uptr (*)(int, int, void*, void*) ptrace_f -->
     <typedef-decl name='ptrace_f' type-id='type-id-739' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' id='type-id-740'/>
-    <!-- typedef int (const char*)* puts_f -->
+    <!-- typedef int (*)(const char*) puts_f -->
     <typedef-decl name='puts_f' type-id='type-id-741' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' id='type-id-742'/>
-    <!-- typedef void* (typedef __sanitizer::uptr)* pvalloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr) pvalloc_f -->
     <typedef-decl name='pvalloc_f' type-id='type-id-619' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='780' column='1' id='type-id-743'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef OFF64_T, typedef OFF64_T)* pwrite64_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, OFF64_T, OFF64_T) pwrite64_f -->
     <typedef-decl name='pwrite64_f' type-id='type-id-744' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' id='type-id-745'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* pwrite_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T, OFF_T) pwrite_f -->
     <typedef-decl name='pwrite_f' type-id='type-id-678' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' id='type-id-746'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF64_T)* pwritev64_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) pwritev64_f -->
     <typedef-decl name='pwritev64_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' id='type-id-747'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* pwritev_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) pwritev_f -->
     <typedef-decl name='pwritev_f' type-id='type-id-681' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' id='type-id-748'/>
-    <!-- typedef int (int)* raise_f -->
+    <!-- typedef int (*)(int) raise_f -->
     <typedef-decl name='raise_f' type-id='type-id-415' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' id='type-id-749'/>
-    <!-- typedef int (void*, __sanitizer::u32*)* random_r_f -->
+    <!-- typedef int (*)(void*, __sanitizer::u32*) random_r_f -->
     <typedef-decl name='random_r_f' type-id='type-id-750' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1' id='type-id-751'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T)* read_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T) read_f -->
     <typedef-decl name='read_f' type-id='type-id-752' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' id='type-id-753'/>
-    <!-- typedef __sanitizer::__sanitizer_dirent64* (void*)* readdir64_f -->
+    <!-- typedef __sanitizer::__sanitizer_dirent64* (*)(void*) readdir64_f -->
     <typedef-decl name='readdir64_f' type-id='type-id-754' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1' id='type-id-755'/>
-    <!-- typedef int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**)* readdir64_r_f -->
+    <!-- typedef int (*)(void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) readdir64_r_f -->
     <typedef-decl name='readdir64_r_f' type-id='type-id-756' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1' id='type-id-757'/>
-    <!-- typedef __sanitizer::__sanitizer_dirent* (void*)* readdir_f -->
+    <!-- typedef __sanitizer::__sanitizer_dirent* (*)(void*) readdir_f -->
     <typedef-decl name='readdir_f' type-id='type-id-758' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1' id='type-id-759'/>
-    <!-- typedef int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**)* readdir_r_f -->
+    <!-- typedef int (*)(void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) readdir_r_f -->
     <typedef-decl name='readdir_r_f' type-id='type-id-760' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1' id='type-id-761'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* readv_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int) readv_f -->
     <typedef-decl name='readv_f' type-id='type-id-762' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' id='type-id-763'/>
-    <!-- typedef void* (void*, typedef __sanitizer::uptr)* realloc_f -->
+    <!-- typedef void* (*)(void*, __sanitizer::uptr) realloc_f -->
     <typedef-decl name='realloc_f' type-id='type-id-764' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='508' column='1' id='type-id-765'/>
-    <!-- typedef char* (const char*, char*)* realpath_f -->
+    <!-- typedef char* (*)(const char*, char*) realpath_f -->
     <typedef-decl name='realpath_f' type-id='type-id-766' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1' id='type-id-767'/>
-    <!-- typedef typedef long_t (int, void*, typedef long_t, int)* recv_f -->
+    <!-- typedef long_t (*)(int, void*, long_t, int) recv_f -->
     <typedef-decl name='recv_f' type-id='type-id-768' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' id='type-id-769'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int)* recvmsg_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_msghdr*, int) recvmsg_f -->
     <typedef-decl name='recvmsg_f' type-id='type-id-770' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' id='type-id-771'/>
-    <!-- typedef double (double, double, int*)* remquo_f -->
+    <!-- typedef double (*)(double, double, int*) remquo_f -->
     <typedef-decl name='remquo_f' type-id='type-id-772' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2727' column='1' id='type-id-773'/>
-    <!-- typedef float (float, float, int*)* remquof_f -->
+    <!-- typedef float (*)(float, float, int*) remquof_f -->
     <typedef-decl name='remquof_f' type-id='type-id-774' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2734' column='1' id='type-id-775'/>
-    <!-- typedef long double (long double, long double, int*)* remquol_f -->
+    <!-- typedef long double (*)(long double, long double, int*) remquol_f -->
     <typedef-decl name='remquol_f' type-id='type-id-776' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2741' column='1' id='type-id-777'/>
-    <!-- typedef int (char*)* rmdir_f -->
+    <!-- typedef int (*)(char*) rmdir_f -->
     <typedef-decl name='rmdir_f' type-id='type-id-778' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' id='type-id-779'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**)* scandir64_compar_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) scandir64_compar_f -->
     <typedef-decl name='scandir64_compar_f' type-id='type-id-780' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1943' column='1' id='type-id-781'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_dirent64***, typedef scandir64_filter_f, typedef scandir64_compar_f)* scandir64_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) scandir64_f -->
     <typedef-decl name='scandir64_f' type-id='type-id-782' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1' id='type-id-783'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent64*)* scandir64_filter_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent64*) scandir64_filter_f -->
     <typedef-decl name='scandir64_filter_f' type-id='type-id-784' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1942' column='1' id='type-id-785'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**)* scandir_compar_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) scandir_compar_f -->
     <typedef-decl name='scandir_compar_f' type-id='type-id-786' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1890' column='1' id='type-id-787'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_dirent***, typedef scandir_filter_f, typedef scandir_compar_f)* scandir_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) scandir_f -->
     <typedef-decl name='scandir_f' type-id='type-id-788' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1' id='type-id-789'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_dirent*)* scandir_filter_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_dirent*) scandir_filter_f -->
     <typedef-decl name='scandir_filter_f' type-id='type-id-790' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1889' column='1' id='type-id-791'/>
-    <!-- typedef int (const char*, variadic parameter type)* scanf_f -->
+    <!-- typedef int (*)(const char*, ...) scanf_f -->
     <typedef-decl name='scanf_f' type-id='type-id-424' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' id='type-id-792'/>
-    <!-- typedef int (int, typedef SIZE_T, void*)* sched_getaffinity_f -->
+    <!-- typedef int (*)(int, SIZE_T, void*) sched_getaffinity_f -->
     <typedef-decl name='sched_getaffinity_f' type-id='type-id-793' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' id='type-id-794'/>
-    <!-- typedef int (void*)* sem_destroy_f -->
+    <!-- typedef int (*)(void*) sem_destroy_f -->
     <typedef-decl name='sem_destroy_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' id='type-id-795'/>
-    <!-- typedef int (void*, int*)* sem_getvalue_f -->
+    <!-- typedef int (*)(void*, int*) sem_getvalue_f -->
     <typedef-decl name='sem_getvalue_f' type-id='type-id-796' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1' id='type-id-797'/>
-    <!-- typedef int (void*, int, unsigned int)* sem_init_f -->
+    <!-- typedef int (*)(void*, int, unsigned int) sem_init_f -->
     <typedef-decl name='sem_init_f' type-id='type-id-798' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' id='type-id-799'/>
-    <!-- typedef int (void*)* sem_post_f -->
+    <!-- typedef int (*)(void*) sem_post_f -->
     <typedef-decl name='sem_post_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' id='type-id-800'/>
-    <!-- typedef int (void*, void*)* sem_timedwait_f -->
+    <!-- typedef int (*)(void*, void*) sem_timedwait_f -->
     <typedef-decl name='sem_timedwait_f' type-id='type-id-12' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' id='type-id-801'/>
-    <!-- typedef int (void*)* sem_trywait_f -->
+    <!-- typedef int (*)(void*) sem_trywait_f -->
     <typedef-decl name='sem_trywait_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' id='type-id-802'/>
-    <!-- typedef int (void*)* sem_wait_f -->
+    <!-- typedef int (*)(void*) sem_wait_f -->
     <typedef-decl name='sem_wait_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' id='type-id-803'/>
-    <!-- typedef typedef long_t (int, void*, typedef long_t, int)* send_f -->
+    <!-- typedef long_t (*)(int, void*, long_t, int) send_f -->
     <typedef-decl name='send_f' type-id='type-id-768' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' id='type-id-804'/>
-    <!-- typedef typedef long_t (int, void*, int)* sendmsg_f -->
+    <!-- typedef long_t (*)(int, void*, int) sendmsg_f -->
     <typedef-decl name='sendmsg_f' type-id='type-id-805' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' id='type-id-806'/>
-    <!-- typedef int (int, void*, void*)* setitimer_f -->
+    <!-- typedef int (*)(int, void*, void*) setitimer_f -->
     <typedef-decl name='setitimer_f' type-id='type-id-807' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1' id='type-id-808'/>
-    <!-- typedef int (void*)* setjmp_f -->
+    <!-- typedef int (*)(void*) setjmp_f -->
     <typedef-decl name='setjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='454' column='1' id='type-id-809'/>
-    <!-- typedef char* (int, char*)* setlocale_f -->
+    <!-- typedef char* (*)(int, char*) setlocale_f -->
     <typedef-decl name='setlocale_f' type-id='type-id-810' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1' id='type-id-811'/>
-    <!-- typedef int (int, int, void*)* shmctl_f -->
+    <!-- typedef int (*)(int, int, void*) shmctl_f -->
     <typedef-decl name='shmctl_f' type-id='type-id-419' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1' id='type-id-812'/>
-    <!-- typedef int (int, sigaction_t*, sigaction_t*)* sigaction_f -->
+    <!-- typedef int (*)(int, sigaction_t*, sigaction_t*) sigaction_f -->
     <typedef-decl name='sigaction_f' type-id='type-id-813' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' id='type-id-814'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*)* sigemptyset_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*) sigemptyset_f -->
     <typedef-decl name='sigemptyset_f' type-id='type-id-815' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1' id='type-id-816'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*)* sigfillset_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*) sigfillset_f -->
     <typedef-decl name='sigfillset_f' type-id='type-id-815' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='53' column='1' id='type-id-817'/>
-    <!-- typedef void (int)* sighandler_t -->
+    <!-- typedef void (*)(int) sighandler_t -->
     <typedef-decl name='sighandler_t' type-id='type-id-231' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='87' column='1' id='type-id-402'/>
-    <!-- typedef void (__sanitizer::uptr*, int)* siglongjmp_f -->
+    <!-- typedef void (*)(__sanitizer::uptr*, int) siglongjmp_f -->
     <typedef-decl name='siglongjmp_f' type-id='type-id-613' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' id='type-id-818'/>
-    <!-- typedef typedef sighandler_t (int, typedef sighandler_t)* signal_f -->
+    <!-- typedef sighandler_t (*)(int, sighandler_t) signal_f -->
     <typedef-decl name='signal_f' type-id='type-id-819' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' id='type-id-820'/>
-    <!-- typedef int (int, void*, int)* signalfd_f -->
+    <!-- typedef int (*)(int, void*, int) signalfd_f -->
     <typedef-decl name='signalfd_f' type-id='type-id-821' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' id='type-id-822'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*)* sigpending_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*) sigpending_f -->
     <typedef-decl name='sigpending_f' type-id='type-id-815' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' id='type-id-823'/>
-    <!-- typedef int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*)* sigprocmask_f -->
+    <!-- typedef int (*)(int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) sigprocmask_f -->
     <typedef-decl name='sigprocmask_f' type-id='type-id-824' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1' id='type-id-825'/>
-    <!-- typedef int (void*)* sigsetjmp_f -->
+    <!-- typedef int (*)(void*) sigsetjmp_f -->
     <typedef-decl name='sigsetjmp_f' type-id='type-id-441' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='456' column='1' id='type-id-826'/>
-    <!-- typedef int (const __sanitizer::__sanitizer_sigset_t*)* sigsuspend_f -->
+    <!-- typedef int (*)(const __sanitizer::__sanitizer_sigset_t*) sigsuspend_f -->
     <typedef-decl name='sigsuspend_f' type-id='type-id-827' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' id='type-id-828'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*, void*, void*)* sigtimedwait_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*, void*, void*) sigtimedwait_f -->
     <typedef-decl name='sigtimedwait_f' type-id='type-id-829' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1' id='type-id-830'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*, int*)* sigwait_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*, int*) sigwait_f -->
     <typedef-decl name='sigwait_f' type-id='type-id-831' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1' id='type-id-832'/>
-    <!-- typedef int (__sanitizer::__sanitizer_sigset_t*, void*)* sigwaitinfo_f -->
+    <!-- typedef int (*)(__sanitizer::__sanitizer_sigset_t*, void*) sigwaitinfo_f -->
     <typedef-decl name='sigwaitinfo_f' type-id='type-id-833' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' id='type-id-834'/>
-    <!-- typedef void (double, double*, double*)* sincos_f -->
+    <!-- typedef void (*)(double, double*, double*) sincos_f -->
     <typedef-decl name='sincos_f' type-id='type-id-835' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' id='type-id-836'/>
-    <!-- typedef void (float, float*, float*)* sincosf_f -->
+    <!-- typedef void (*)(float, float*, float*) sincosf_f -->
     <typedef-decl name='sincosf_f' type-id='type-id-837' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' id='type-id-838'/>
-    <!-- typedef void (long double, long double*, long double*)* sincosl_f -->
+    <!-- typedef void (*)(long double, long double*, long double*) sincosl_f -->
     <typedef-decl name='sincosl_f' type-id='type-id-839' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1' id='type-id-840'/>
-    <!-- typedef unsigned int (unsigned int)* sleep_f -->
+    <!-- typedef unsigned int (*)(unsigned int) sleep_f -->
     <typedef-decl name='sleep_f' type-id='type-id-841' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' id='type-id-842'/>
-    <!-- typedef int (int, int, int)* socket_f -->
+    <!-- typedef int (*)(int, int, int) socket_f -->
     <typedef-decl name='socket_f' type-id='type-id-493' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1' id='type-id-843'/>
-    <!-- typedef int (int, int, int, int*)* socketpair_f -->
+    <!-- typedef int (*)(int, int, int, int*) socketpair_f -->
     <typedef-decl name='socketpair_f' type-id='type-id-844' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1' id='type-id-845'/>
-    <!-- typedef int (const char*, const char*, variadic parameter type)* sscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, ...) sscanf_f -->
     <typedef-decl name='sscanf_f' type-id='type-id-426' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' id='type-id-846'/>
-    <!-- typedef int (const char*, void*)* stat64_f -->
+    <!-- typedef int (*)(const char*, void*) stat64_f -->
     <typedef-decl name='stat64_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1232' column='1' id='type-id-847'/>
-    <!-- typedef int (const char*, void*)* stat_f -->
+    <!-- typedef int (*)(const char*, void*) stat_f -->
     <typedef-decl name='stat_f' type-id='type-id-587' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' id='type-id-848'/>
-    <!-- typedef int (char*, void*)* statfs64_f -->
+    <!-- typedef int (*)(char*, void*) statfs64_f -->
     <typedef-decl name='statfs64_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2362' column='1' id='type-id-850'/>
-    <!-- typedef int (char*, void*)* statfs_f -->
+    <!-- typedef int (*)(char*, void*) statfs_f -->
     <typedef-decl name='statfs_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2339' column='1' id='type-id-851'/>
-    <!-- typedef int (char*, void*)* statvfs64_f -->
+    <!-- typedef int (*)(char*, void*) statvfs64_f -->
     <typedef-decl name='statvfs64_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1' id='type-id-852'/>
-    <!-- typedef int (char*, void*)* statvfs_f -->
+    <!-- typedef int (*)(char*, void*) statvfs_f -->
     <typedef-decl name='statvfs_f' type-id='type-id-849' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2385' column='1' id='type-id-853'/>
-    <!-- typedef int (const char*, const char*)* strcasecmp_f -->
+    <!-- typedef int (*)(const char*, const char*) strcasecmp_f -->
     <typedef-decl name='strcasecmp_f' type-id='type-id-854' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1' id='type-id-855'/>
-    <!-- typedef char* (char*, int)* strchr_f -->
+    <!-- typedef char* (*)(char*, int) strchr_f -->
     <typedef-decl name='strchr_f' type-id='type-id-856' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='667' column='1' id='type-id-857'/>
-    <!-- typedef char* (char*, int)* strchrnul_f -->
+    <!-- typedef char* (*)(char*, int) strchrnul_f -->
     <typedef-decl name='strchrnul_f' type-id='type-id-856' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='675' column='1' id='type-id-858'/>
-    <!-- typedef int (const char*, const char*)* strcmp_f -->
+    <!-- typedef int (*)(const char*, const char*) strcmp_f -->
     <typedef-decl name='strcmp_f' type-id='type-id-854' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='82' column='1' id='type-id-859'/>
-    <!-- typedef char* (char*, const char*)* strcpy_f -->
+    <!-- typedef char* (*)(char*, const char*) strcpy_f -->
     <typedef-decl name='strcpy_f' type-id='type-id-860' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='689' column='1' id='type-id-861'/>
-    <!-- typedef char* (const char*)* strdup_f -->
+    <!-- typedef char* (*)(const char*) strdup_f -->
     <typedef-decl name='strdup_f' type-id='type-id-467' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='715' column='1' id='type-id-862'/>
-    <!-- typedef char* (int)* strerror_f -->
+    <!-- typedef char* (*)(int) strerror_f -->
     <typedef-decl name='strerror_f' type-id='type-id-542' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1' id='type-id-863'/>
-    <!-- typedef char* (int, char*, typedef SIZE_T)* strerror_r_f -->
+    <!-- typedef char* (*)(int, char*, SIZE_T) strerror_r_f -->
     <typedef-decl name='strerror_r_f' type-id='type-id-864' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' id='type-id-865'/>
-    <!-- typedef typedef __sanitizer::uptr (const char*)* strlen_f -->
+    <!-- typedef __sanitizer::uptr (*)(const char*) strlen_f -->
     <typedef-decl name='strlen_f' type-id='type-id-866' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' id='type-id-867'/>
-    <!-- typedef int (const char*, const char*, typedef SIZE_T)* strncasecmp_f -->
+    <!-- typedef int (*)(const char*, const char*, SIZE_T) strncasecmp_f -->
     <typedef-decl name='strncasecmp_f' type-id='type-id-868' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1' id='type-id-869'/>
-    <!-- typedef int (const char*, const char*, typedef __sanitizer::uptr)* strncmp_f -->
+    <!-- typedef int (*)(const char*, const char*, __sanitizer::uptr) strncmp_f -->
     <typedef-decl name='strncmp_f' type-id='type-id-868' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' id='type-id-870'/>
-    <!-- typedef char* (char*, char*, typedef __sanitizer::uptr)* strncpy_f -->
+    <!-- typedef char* (*)(char*, char*, __sanitizer::uptr) strncpy_f -->
     <typedef-decl name='strncpy_f' type-id='type-id-871' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1' id='type-id-872'/>
-    <!-- typedef char* (char*, char*, __sanitizer::__sanitizer_tm*)* strptime_f -->
+    <!-- typedef char* (*)(char*, char*, __sanitizer::__sanitizer_tm*) strptime_f -->
     <typedef-decl name='strptime_f' type-id='type-id-873' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1' id='type-id-874'/>
-    <!-- typedef char* (char*, int)* strrchr_f -->
+    <!-- typedef char* (*)(char*, int) strrchr_f -->
     <typedef-decl name='strrchr_f' type-id='type-id-856' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' id='type-id-875'/>
-    <!-- typedef const char* (const char*, const char*)* strstr_f -->
+    <!-- typedef const char* (*)(const char*, const char*) strstr_f -->
     <typedef-decl name='strstr_f' type-id='type-id-876' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='705' column='1' id='type-id-877'/>
-    <!-- typedef typedef INTMAX_T (const char*, char**, int)* strtoimax_f -->
+    <!-- typedef INTMAX_T (*)(const char*, char**, int) strtoimax_f -->
     <typedef-decl name='strtoimax_f' type-id='type-id-878' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' id='type-id-879'/>
-    <!-- typedef typedef INTMAX_T (const char*, char**, int)* strtoumax_f -->
+    <!-- typedef INTMAX_T (*)(const char*, char**, int) strtoumax_f -->
     <typedef-decl name='strtoumax_f' type-id='type-id-878' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' id='type-id-880'/>
-    <!-- typedef int (void*)* sysinfo_f -->
+    <!-- typedef int (*)(void*) sysinfo_f -->
     <typedef-decl name='sysinfo_f' type-id='type-id-441' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' id='type-id-881'/>
-    <!-- typedef int (int, void*)* tcgetattr_f -->
+    <!-- typedef int (*)(int, void*) tcgetattr_f -->
     <typedef-decl name='tcgetattr_f' type-id='type-id-534' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1' id='type-id-882'/>
-    <!-- typedef char* (char*, char*)* tempnam_f -->
+    <!-- typedef char* (*)(char*, char*) tempnam_f -->
     <typedef-decl name='tempnam_f' type-id='type-id-883' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1' id='type-id-884'/>
-    <!-- typedef char* (const char*)* textdomain_f -->
+    <!-- typedef char* (*)(const char*) textdomain_f -->
     <typedef-decl name='textdomain_f' type-id='type-id-467' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' id='type-id-885'/>
-    <!-- typedef unsigned long int (unsigned long int*)* time_f -->
+    <!-- typedef unsigned long int (*)(unsigned long int*) time_f -->
     <typedef-decl name='time_f' type-id='type-id-886' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='432' column='1' id='type-id-887'/>
-    <!-- typedef typedef __sanitizer::__sanitizer_clock_t (void*)* times_f -->
+    <!-- typedef __sanitizer::__sanitizer_clock_t (*)(void*) times_f -->
     <typedef-decl name='times_f' type-id='type-id-888' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' id='type-id-889'/>
-    <!-- typedef char* (char*)* tmpnam_f -->
+    <!-- typedef char* (*)(char*) tmpnam_f -->
     <typedef-decl name='tmpnam_f' type-id='type-id-890' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2639' column='1' id='type-id-891'/>
-    <!-- typedef char* (char*)* tmpnam_r_f -->
+    <!-- typedef char* (*)(char*) tmpnam_r_f -->
     <typedef-decl name='tmpnam_r_f' type-id='type-id-890' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1' id='type-id-892'/>
-    <!-- typedef int (char*)* unlink_f -->
+    <!-- typedef int (*)(char*) unlink_f -->
     <typedef-decl name='unlink_f' type-id='type-id-778' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' id='type-id-893'/>
-    <!-- typedef int (typedef long_t)* usleep_f -->
+    <!-- typedef int (*)(long_t) usleep_f -->
     <typedef-decl name='usleep_f' type-id='type-id-894' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' id='type-id-895'/>
-    <!-- typedef void* (typedef __sanitizer::uptr)* valloc_f -->
+    <!-- typedef void* (*)(__sanitizer::uptr) valloc_f -->
     <typedef-decl name='valloc_f' type-id='type-id-619' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='775' column='1' id='type-id-896'/>
-    <!-- typedef int (void*, const char*, typedef __va_list_tag __va_list_tag*)* vfscanf_f -->
+    <!-- typedef int (*)(void*, const char*, typedef __va_list_tag __va_list_tag*) vfscanf_f -->
     <typedef-decl name='vfscanf_f' type-id='type-id-428' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' id='type-id-897'/>
-    <!-- typedef int (const char*, typedef __va_list_tag __va_list_tag*)* vscanf_f -->
+    <!-- typedef int (*)(const char*, typedef __va_list_tag __va_list_tag*) vscanf_f -->
     <typedef-decl name='vscanf_f' type-id='type-id-430' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' id='type-id-898'/>
-    <!-- typedef int (const char*, const char*, typedef __va_list_tag __va_list_tag*)* vsscanf_f -->
+    <!-- typedef int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) vsscanf_f -->
     <typedef-decl name='vsscanf_f' type-id='type-id-432' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' id='type-id-899'/>
-    <!-- typedef int (int*, int, void*)* wait3_f -->
+    <!-- typedef int (*)(int*, int, void*) wait3_f -->
     <typedef-decl name='wait3_f' type-id='type-id-900' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' id='type-id-901'/>
-    <!-- typedef int (int, int*, int, void*)* wait4_f -->
+    <!-- typedef int (*)(int, int*, int, void*) wait4_f -->
     <typedef-decl name='wait4_f' type-id='type-id-902' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' id='type-id-903'/>
-    <!-- typedef int (int*)* wait_f -->
+    <!-- typedef int (*)(int*) wait_f -->
     <typedef-decl name='wait_f' type-id='type-id-668' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1' id='type-id-904'/>
-    <!-- typedef int (int, int, void*, int)* waitid_f -->
+    <!-- typedef int (*)(int, int, void*, int) waitid_f -->
     <typedef-decl name='waitid_f' type-id='type-id-905' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' id='type-id-906'/>
-    <!-- typedef int (int, int*, int)* waitpid_f -->
+    <!-- typedef int (*)(int, int*, int) waitpid_f -->
     <typedef-decl name='waitpid_f' type-id='type-id-907' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' id='type-id-908'/>
-    <!-- typedef typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* wcsnrtombs_f -->
+    <!-- typedef SIZE_T (*)(char*, const wchar_t**, SIZE_T, SIZE_T, void*) wcsnrtombs_f -->
     <typedef-decl name='wcsnrtombs_f' type-id='type-id-909' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' id='type-id-910'/>
-    <!-- typedef typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* wcsrtombs_f -->
+    <!-- typedef SIZE_T (*)(char*, const wchar_t**, SIZE_T, void*) wcsrtombs_f -->
     <typedef-decl name='wcsrtombs_f' type-id='type-id-911' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' id='type-id-912'/>
-    <!-- typedef typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* wcstombs_f -->
+    <!-- typedef SIZE_T (*)(char*, const wchar_t*, SIZE_T) wcstombs_f -->
     <typedef-decl name='wcstombs_f' type-id='type-id-913' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' id='type-id-914'/>
-    <!-- typedef int (char*, __sanitizer::__sanitizer_wordexp_t*, int)* wordexp_f -->
+    <!-- typedef int (*)(char*, __sanitizer::__sanitizer_wordexp_t*, int) wordexp_f -->
     <typedef-decl name='wordexp_f' type-id='type-id-915' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1' id='type-id-916'/>
-    <!-- typedef typedef SSIZE_T (int, void*, typedef SIZE_T)* write_f -->
+    <!-- typedef SSIZE_T (*)(int, void*, SIZE_T) write_f -->
     <typedef-decl name='write_f' type-id='type-id-752' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' id='type-id-917'/>
-    <!-- typedef typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* writev_f -->
+    <!-- typedef SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int) writev_f -->
     <typedef-decl name='writev_f' type-id='type-id-762' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' id='type-id-918'/>
     <!-- unsigned char[6] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='48' id='type-id-919'>
@@ -11734,7 +11734,7 @@ 
       <!-- <anonymous range>[16] -->
       <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-46' id='type-id-923'/>
     </array-type-def>
-    <!-- void ()*[128] -->
+    <!-- void (*[128])(void) -->
     <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='8192' id='type-id-373'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' lower-bound='0' upper-bound='127' type-id='type-id-46' id='type-id-361'/>
@@ -11745,8 +11745,42 @@ 
     <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-374'/>
     <!-- BlockingCall* -->
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-386'/>
+    <!-- INTMAX_T (*)(const char*, char**, int) -->
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-878'/>
+    <!-- SIZE_T (*)(char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-909'/>
+    <!-- SIZE_T (*)(char*, const wchar_t**, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-911'/>
+    <!-- SIZE_T (*)(char*, const wchar_t*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-913'/>
+    <!-- SIZE_T (*)(int, char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-476'/>
+    <!-- SIZE_T (*)(void*, char**, SIZE_T*, char**, SIZE_T*) -->
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-585'/>
+    <!-- SIZE_T (*)(wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-623'/>
+    <!-- SIZE_T (*)(wchar_t*, const char**, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-625'/>
+    <!-- SIZE_T (*)(wchar_t*, const char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-627'/>
     <!-- SIZE_T* -->
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-928'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-937'/>
+    <!-- SSIZE_T (*)(char**, SIZE_T*, int, void*) -->
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-548'/>
+    <!-- SSIZE_T (*)(char**, SIZE_T*, void*) -->
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-569'/>
+    <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int) -->
+    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-762'/>
+    <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-681'/>
+    <!-- SSIZE_T (*)(int, __sanitizer::__sanitizer_msghdr*, int) -->
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-770'/>
+    <!-- SSIZE_T (*)(int, void*, OFF64_T, OFF64_T) -->
+    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-744'/>
+    <!-- SSIZE_T (*)(int, void*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-752'/>
+    <!-- SSIZE_T (*)(int, void*, SIZE_T, OFF_T) -->
+    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-678'/>
     <!-- ScopedInterceptor* -->
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-377'/>
     <!-- ScopedSyscall* -->
@@ -11754,575 +11788,541 @@ 
     <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression*>* -->
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-190'/>
     <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>* -->
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
     <!-- __sanitizer::LibIgnore* -->
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
     <!-- __sanitizer::Suppression& -->
-    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
     <!-- __sanitizer::Suppression** -->
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-189'/>
     <!-- __sanitizer::SuppressionContext* -->
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
+    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
     <!-- __sanitizer::__sanitizer___kernel_fd_set* -->
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-939'/>
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
     <!-- __sanitizer::__sanitizer___kernel_gid_t* -->
-    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-941'/>
+    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
     <!-- __sanitizer::__sanitizer___kernel_loff_t* -->
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-960'/>
     <!-- __sanitizer::__sanitizer___kernel_off_t* -->
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-945'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
     <!-- __sanitizer::__sanitizer___kernel_old_gid_t* -->
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-964'/>
     <!-- __sanitizer::__sanitizer___kernel_old_uid_t* -->
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-966'/>
     <!-- __sanitizer::__sanitizer___sysctl_args* -->
-    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
+    <!-- __sanitizer::__sanitizer_clock_t (*)(void*) -->
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-888'/>
     <!-- __sanitizer::__sanitizer_dirent* -->
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-953'/>
-    <!-- __sanitizer::__sanitizer_dirent* (void*)* -->
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-758'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-971'/>
+    <!-- __sanitizer::__sanitizer_dirent* (*)(void*) -->
+    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-758'/>
     <!-- __sanitizer::__sanitizer_dirent** -->
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-973'/>
     <!-- __sanitizer::__sanitizer_dirent*** -->
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
     <!-- __sanitizer::__sanitizer_dirent64* -->
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
-    <!-- __sanitizer::__sanitizer_dirent64* (void*)* -->
-    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-754'/>
+    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
+    <!-- __sanitizer::__sanitizer_dirent64* (*)(void*) -->
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-754'/>
     <!-- __sanitizer::__sanitizer_dirent64** -->
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-978'/>
     <!-- __sanitizer::__sanitizer_dirent64*** -->
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
     <!-- __sanitizer::__sanitizer_ether_addr* -->
-    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-963'/>
-    <!-- __sanitizer::__sanitizer_ether_addr* (char*)* -->
-    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-502'/>
-    <!-- __sanitizer::__sanitizer_ether_addr* (char*, __sanitizer::__sanitizer_ether_addr*)* -->
-    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-504'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <!-- __sanitizer::__sanitizer_ether_addr* (*)(char*) -->
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-502'/>
+    <!-- __sanitizer::__sanitizer_ether_addr* (*)(char*, __sanitizer::__sanitizer_ether_addr*) -->
+    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-504'/>
     <!-- __sanitizer::__sanitizer_hostent* -->
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
-    <!-- __sanitizer::__sanitizer_hostent* (char*)* -->
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-560'/>
-    <!-- __sanitizer::__sanitizer_hostent* (char*, int)* -->
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-556'/>
-    <!-- __sanitizer::__sanitizer_hostent* (int)* -->
-    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-564'/>
-    <!-- __sanitizer::__sanitizer_hostent* (void*, int, int)* -->
-    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-552'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-985'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(char*) -->
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-560'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(char*, int) -->
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-556'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(int) -->
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-564'/>
+    <!-- __sanitizer::__sanitizer_hostent* (*)(void*, int, int) -->
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-552'/>
     <!-- __sanitizer::__sanitizer_hostent** -->
-    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-990'/>
     <!-- __sanitizer::__sanitizer_io_event* -->
-    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-992'/>
     <!-- __sanitizer::__sanitizer_iocb* -->
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-994'/>
     <!-- __sanitizer::__sanitizer_iocb** -->
-    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
     <!-- __sanitizer::__sanitizer_iovec* -->
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
     <!-- __sanitizer::__sanitizer_kernel_sigset_t* -->
-    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-980'/>
+    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-998'/>
     <!-- __sanitizer::__sanitizer_mntent* -->
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-982'/>
-    <!-- __sanitizer::__sanitizer_mntent* (void*)* -->
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-571'/>
-    <!-- __sanitizer::__sanitizer_mntent* (void*, __sanitizer::__sanitizer_mntent*, char*, int)* -->
-    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-573'/>
+    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
+    <!-- __sanitizer::__sanitizer_mntent* (*)(void*) -->
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-571'/>
+    <!-- __sanitizer::__sanitizer_mntent* (*)(void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
+    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-573'/>
     <!-- __sanitizer::__sanitizer_msghdr* -->
-    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-986'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
     <!-- __sanitizer::__sanitizer_perf_event_attr* -->
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
     <!-- __sanitizer::__sanitizer_pollfd* -->
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
     <!-- __sanitizer::__sanitizer_sigset_t* -->
-    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-1009'/>
     <!-- __sanitizer::__sanitizer_tm* -->
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
-    <!-- __sanitizer::__sanitizer_tm* (unsigned long int*)* -->
-    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-581'/>
-    <!-- __sanitizer::__sanitizer_tm* (unsigned long int*, void*)* -->
-    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
+    <!-- __sanitizer::__sanitizer_tm* (*)(unsigned long int*) -->
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-581'/>
+    <!-- __sanitizer::__sanitizer_tm* (*)(unsigned long int*, void*) -->
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-583'/>
     <!-- __sanitizer::__sanitizer_wordexp_t* -->
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1015'/>
     <!-- __sanitizer::atomic_uint32_t* -->
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
     <!-- __sanitizer::atomic_uint32_t::Type* -->
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-1000'/>
+    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-1018'/>
     <!-- __sanitizer::u32* -->
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1001'/>
+    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1019'/>
+    <!-- __sanitizer::uptr (*)(const char*) -->
+    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-866'/>
+    <!-- __sanitizer::uptr (*)(int, int, void*, void*) -->
+    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-739'/>
+    <!-- __sanitizer::uptr (*)(void*) -->
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-621'/>
+    <!-- __sanitizer::uptr (*)(void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-522'/>
     <!-- __tsan::ThreadState* const -->
     <qualified-type-def type-id='type-id-354' const='yes' id='type-id-376'/>
-    <!-- char* (__sanitizer::__sanitizer_ether_addr*)* -->
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-510'/>
-    <!-- char* (__sanitizer::__sanitizer_ether_addr*, char*)* -->
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-512'/>
-    <!-- char* (__sanitizer::__sanitizer_tm*)* -->
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-454'/>
-    <!-- char* (__sanitizer::__sanitizer_tm*, char*)* -->
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-456'/>
-    <!-- char* (char*)* -->
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-890'/>
-    <!-- char* (char*, char*)* -->
-    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-883'/>
-    <!-- char* (char*, char*, __sanitizer::__sanitizer_tm*)* -->
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-873'/>
-    <!-- char* (char*, char*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-871'/>
-    <!-- char* (char*, const char*)* -->
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-860'/>
-    <!-- char* (char*, int)* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-856'/>
-    <!-- char* (char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-546'/>
-    <!-- char* (const char*)* -->
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-467'/>
-    <!-- char* (const char*, char*)* -->
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-766'/>
-    <!-- char* (int)* -->
-    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-542'/>
-    <!-- char* (int, char*)* -->
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-810'/>
-    <!-- char* (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-864'/>
-    <!-- char* (int, void*, char*, typedef __sanitizer::u32)* -->
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-589'/>
-    <!-- char* (unsigned long int*)* -->
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-482'/>
-    <!-- char* (unsigned long int*, char*)* -->
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-484'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_ether_addr*) -->
+    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-510'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_ether_addr*, char*) -->
+    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-512'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_tm*) -->
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-454'/>
+    <!-- char* (*)(__sanitizer::__sanitizer_tm*, char*) -->
+    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-456'/>
+    <!-- char* (*)(char*) -->
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-890'/>
+    <!-- char* (*)(char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-546'/>
+    <!-- char* (*)(char*, char*) -->
+    <pointer-type-def type-id='type-id-1030' size-in-bits='64' id='type-id-883'/>
+    <!-- char* (*)(char*, char*, __sanitizer::__sanitizer_tm*) -->
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-873'/>
+    <!-- char* (*)(char*, char*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-871'/>
+    <!-- char* (*)(char*, const char*) -->
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-860'/>
+    <!-- char* (*)(char*, int) -->
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-856'/>
+    <!-- char* (*)(const char*) -->
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-467'/>
+    <!-- char* (*)(const char*, char*) -->
+    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-766'/>
+    <!-- char* (*)(int) -->
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-542'/>
+    <!-- char* (*)(int, char*) -->
+    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-810'/>
+    <!-- char* (*)(int, char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-864'/>
+    <!-- char* (*)(int, void*, char*, __sanitizer::u32) -->
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-589'/>
+    <!-- char* (*)(unsigned long int*) -->
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-482'/>
+    <!-- char* (*)(unsigned long int*, char*) -->
+    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-484'/>
     <!-- char** -->
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-1021'/>
-    <!-- char** (void**, int)* -->
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-1043'/>
+    <!-- char** (*)(void**, int) -->
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-462'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression> -->
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1023'/>
+    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1045'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression>* -->
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1025'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1047'/>
     <!-- const __sanitizer::LibIgnore -->
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1026'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1048'/>
     <!-- const __sanitizer::LibIgnore& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-1049'/>
     <!-- const __sanitizer::LibIgnore* -->
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1050'/>
     <!-- const __sanitizer::Suppression -->
-    <qualified-type-def type-id='type-id-933' const='yes' id='type-id-1029'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-1051'/>
     <!-- const __sanitizer::Suppression& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
     <!-- const __sanitizer::Suppression* -->
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1031'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
     <!-- const __sanitizer::SuppressionContext -->
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1032'/>
+    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1054'/>
     <!-- const __sanitizer::SuppressionContext& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1033'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
     <!-- const __sanitizer::SuppressionContext* -->
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1034'/>
+    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1056'/>
     <!-- const __sanitizer::__sanitizer_dirent -->
-    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1035'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1057'/>
     <!-- const __sanitizer::__sanitizer_dirent* -->
-    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
+    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
     <!-- const __sanitizer::__sanitizer_dirent** -->
-    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
     <!-- const __sanitizer::__sanitizer_dirent64 -->
-    <qualified-type-def type-id='type-id-957' const='yes' id='type-id-1038'/>
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1060'/>
     <!-- const __sanitizer::__sanitizer_dirent64* -->
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1039'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
     <!-- const __sanitizer::__sanitizer_dirent64** -->
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
+    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
     <!-- const __sanitizer::__sanitizer_iovec -->
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1063'/>
     <!-- const __sanitizer::__sanitizer_iovec* -->
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
     <!-- const __sanitizer::__sanitizer_sigset_t -->
-    <qualified-type-def type-id='type-id-404' const='yes' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-404' const='yes' id='type-id-1065'/>
     <!-- const __sanitizer::__sanitizer_sigset_t* -->
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
-    <!-- const char* (const char*, const char*)* -->
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-876'/>
+    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-1066'/>
+    <!-- const char* (*)(const char*, const char*) -->
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-876'/>
     <!-- const ioctl_desc -->
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-1046'/>
+    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-1068'/>
     <!-- const ioctl_desc& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-392'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1068' size-in-bits='64' id='type-id-392'/>
     <!-- const ioctl_desc_compare -->
-    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-1047'/>
+    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-1069'/>
     <!-- const ioctl_desc_compare* -->
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-391'/>
     <!-- const kernel_sigset_t -->
-    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1048'/>
+    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1070'/>
     <!-- const std::nothrow_t -->
-    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1050'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1072'/>
     <!-- const std::nothrow_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
     <!-- const volatile __sanitizer::atomic_uint32_t -->
-    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1053'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1075'/>
     <!-- const volatile __sanitizer::atomic_uint32_t* -->
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-234'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1076'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
     <!-- const wchar_t** -->
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1056'/>
-    <!-- double (double)* -->
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-600'/>
-    <!-- double (double, double*)* -->
-    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-647'/>
-    <!-- double (double, double, int*)* -->
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-772'/>
-    <!-- double (double, int*)* -->
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
+    <!-- double (*)(double) -->
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-600'/>
+    <!-- double (*)(double, double*) -->
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-647'/>
+    <!-- double (*)(double, double, int*) -->
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-772'/>
+    <!-- double (*)(double, int*) -->
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-527'/>
     <!-- double* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1061'/>
-    <!-- float (float)* -->
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-603'/>
-    <!-- float (float, float*)* -->
-    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-649'/>
-    <!-- float (float, float, int*)* -->
-    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-774'/>
-    <!-- float (float, int*)* -->
-    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1083'/>
+    <!-- float (*)(float) -->
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-603'/>
+    <!-- float (*)(float, float*) -->
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-649'/>
+    <!-- float (*)(float, float, int*) -->
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-774'/>
+    <!-- float (*)(float, int*) -->
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-529'/>
     <!-- float* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1066'/>
-    <!-- int ()* -->
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-654'/>
-    <!-- int (__sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-566'/>
-    <!-- int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, int)* -->
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-670'/>
-    <!-- int (__sanitizer::__sanitizer_pollfd*, typedef __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-674'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-815'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*, int*)* -->
-    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-831'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*, void*)* -->
-    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-833'/>
-    <!-- int (__sanitizer::__sanitizer_sigset_t*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-829'/>
-    <!-- int (char*)* -->
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-778'/>
-    <!-- int (char*, __sanitizer::__sanitizer_dirent***, typedef scandir_filter_f, typedef scandir_compar_f)* -->
-    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-788'/>
-    <!-- int (char*, __sanitizer::__sanitizer_dirent64***, typedef scandir64_filter_f, typedef scandir64_compar_f)* -->
-    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-782'/>
-    <!-- int (char*, __sanitizer::__sanitizer_ether_addr*)* -->
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-506'/>
-    <!-- int (char*, __sanitizer::__sanitizer_ether_addr*, char*)* -->
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-508'/>
-    <!-- int (char*, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-562'/>
-    <!-- int (char*, __sanitizer::__sanitizer_wordexp_t*, int)* -->
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-915'/>
-    <!-- int (char*, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-558'/>
-    <!-- int (char*, typedef __sanitizer::u32)* -->
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-592'/>
-    <!-- int (char*, void*)* -->
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-849'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent*)* -->
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-790'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**)* -->
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-786'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent64*)* -->
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-784'/>
-    <!-- int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**)* -->
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-780'/>
-    <!-- int (const __sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-827'/>
-    <!-- int (const char*)* -->
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-741'/>
-    <!-- int (const char*, const char*)* -->
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-854'/>
-    <!-- int (const char*, const char*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-868'/>
-    <!-- int (const char*, const char*, typedef __va_list_tag __va_list_tag*)* -->
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-432'/>
-    <!-- int (const char*, const char*, variadic parameter type)* -->
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-426'/>
-    <!-- int (const char*, int)* -->
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-479'/>
-    <!-- int (const char*, int, int)* -->
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-661'/>
-    <!-- int (const char*, typedef __va_list_tag __va_list_tag*)* -->
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-430'/>
-    <!-- int (const char*, variadic parameter type)* -->
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-424'/>
-    <!-- int (const char*, void*)* -->
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-587'/>
-    <!-- int (int)* -->
-    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-415'/>
-    <!-- int (int*)* -->
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-668'/>
-    <!-- int (int*, int)* -->
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-666'/>
-    <!-- int (int*, int, void*)* -->
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-900'/>
-    <!-- int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*)* -->
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-824'/>
-    <!-- int (int, __sanitizer::u32*)* -->
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-550'/>
-    <!-- int (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-443'/>
-    <!-- int (int, const char*, void*)* -->
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-436'/>
-    <!-- int (int, int)* -->
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-491'/>
-    <!-- int (int, int*, int)* -->
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-907'/>
-    <!-- int (int, int*, int, void*)* -->
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-902'/>
-    <!-- int (int, int, int)* -->
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-493'/>
-    <!-- int (int, int, int, int*)* -->
-    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-844'/>
-    <!-- int (int, int, int, void*)* -->
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-498'/>
-    <!-- int (int, int, int, void*, int*)* -->
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-578'/>
-    <!-- int (int, int, void*)* -->
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-419'/>
-    <!-- int (int, int, void*, int)* -->
-    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-905'/>
-    <!-- int (int, sigaction_t*, sigaction_t*)* -->
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-813'/>
-    <!-- int (int, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-793'/>
-    <!-- int (int, unsigned int, void*)* -->
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-596'/>
-    <!-- int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int)* -->
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-676'/>
-    <!-- int (int, void*)* -->
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-534'/>
-    <!-- int (int, void*, int)* -->
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-821'/>
-    <!-- int (int, void*, int*)* -->
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-576'/>
-    <!-- int (int, void*, int, int)* -->
-    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-500'/>
-    <!-- int (int, void*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-464'/>
-    <!-- int (int, void*, unsigned int*)* -->
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-452'/>
-    <!-- int (int, void*, unsigned int*, int)* -->
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-450'/>
-    <!-- int (int, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-807'/>
-    <!-- int (typedef __sanitizer::u32, void*)* -->
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-471'/>
-    <!-- int (typedef __sanitizer::uptr, const char*)* -->
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-732'/>
-    <!-- int (typedef __sanitizer::uptr, int*, int*)* -->
-    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-709'/>
-    <!-- int (typedef long_t)* -->
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-894'/>
-    <!-- int (unsigned int, int)* -->
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-515'/>
-    <!-- int (void ()*)* -->
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-458'/>
-    <!-- int (void (int, void*)*, void*)* -->
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-659'/>
-    <!-- int (void (void*)*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-417'/>
-    <!-- int (void*)* -->
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1088'/>
+    <!-- int (*)(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-566'/>
+    <!-- int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-670'/>
+    <!-- int (*)(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-674'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-815'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*, int*) -->
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-831'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*, void*) -->
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-833'/>
+    <!-- int (*)(__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
+    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-829'/>
+    <!-- int (*)(__sanitizer::u32, void*) -->
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-471'/>
+    <!-- int (*)(__sanitizer::uptr, const char*) -->
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-732'/>
+    <!-- int (*)(__sanitizer::uptr, int*, int*) -->
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-709'/>
+    <!-- int (*)(char*) -->
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-778'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) -->
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-788'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) -->
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-782'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_ether_addr*) -->
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-506'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_ether_addr*, char*) -->
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-508'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-562'/>
+    <!-- int (*)(char*, __sanitizer::__sanitizer_wordexp_t*, int) -->
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-915'/>
+    <!-- int (*)(char*, __sanitizer::u32) -->
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-592'/>
+    <!-- int (*)(char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-558'/>
+    <!-- int (*)(char*, void*) -->
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-849'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent*) -->
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-790'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) -->
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-786'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent64*) -->
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-784'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) -->
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-780'/>
+    <!-- int (*)(const __sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-827'/>
+    <!-- int (*)(const char*) -->
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-741'/>
+    <!-- int (*)(const char*, ...) -->
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-424'/>
+    <!-- int (*)(const char*, const char*) -->
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-854'/>
+    <!-- int (*)(const char*, const char*, ...) -->
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-426'/>
+    <!-- int (*)(const char*, const char*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-868'/>
+    <!-- int (*)(const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-432'/>
+    <!-- int (*)(const char*, int) -->
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-479'/>
+    <!-- int (*)(const char*, int, int) -->
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-661'/>
+    <!-- int (*)(const char*, typedef __va_list_tag __va_list_tag*) -->
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-430'/>
+    <!-- int (*)(const char*, void*) -->
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-587'/>
+    <!-- int (*)(int) -->
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-415'/>
+    <!-- int (*)(int*) -->
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-668'/>
+    <!-- int (*)(int*, int) -->
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-666'/>
+    <!-- int (*)(int*, int, void*) -->
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-900'/>
+    <!-- int (*)(int, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-793'/>
+    <!-- int (*)(int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-824'/>
+    <!-- int (*)(int, __sanitizer::u32*) -->
+    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-550'/>
+    <!-- int (*)(int, char*, SIZE_T) -->
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-443'/>
+    <!-- int (*)(int, const char*, void*) -->
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-436'/>
+    <!-- int (*)(int, int) -->
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-491'/>
+    <!-- int (*)(int, int*, int) -->
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-907'/>
+    <!-- int (*)(int, int*, int, void*) -->
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-902'/>
+    <!-- int (*)(int, int, int) -->
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-493'/>
+    <!-- int (*)(int, int, int, int*) -->
+    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-844'/>
+    <!-- int (*)(int, int, int, void*) -->
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-498'/>
+    <!-- int (*)(int, int, int, void*, int*) -->
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-578'/>
+    <!-- int (*)(int, int, void*) -->
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-419'/>
+    <!-- int (*)(int, int, void*, int) -->
+    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-905'/>
+    <!-- int (*)(int, sigaction_t*, sigaction_t*) -->
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-813'/>
+    <!-- int (*)(int, unsigned int, void*) -->
+    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-596'/>
+    <!-- int (*)(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-676'/>
+    <!-- int (*)(int, void*) -->
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-534'/>
+    <!-- int (*)(int, void*, int) -->
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-821'/>
+    <!-- int (*)(int, void*, int*) -->
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-576'/>
+    <!-- int (*)(int, void*, int, int) -->
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-500'/>
+    <!-- int (*)(int, void*, unsigned int) -->
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-464'/>
+    <!-- int (*)(int, void*, unsigned int*) -->
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-452'/>
+    <!-- int (*)(int, void*, unsigned int*, int) -->
+    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-450'/>
+    <!-- int (*)(int, void*, void*) -->
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-807'/>
+    <!-- int (*)(long_t) -->
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-894'/>
+    <!-- int (*)(unsigned int, int) -->
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-515'/>
+    <!-- int (*)(void (*)(int, void*), void*) -->
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-659'/>
+    <!-- int (*)(void (*)(void)) -->
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-458'/>
+    <!-- int (*)(void (*)(void*), void*, void*) -->
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-417'/>
+    <!-- int (*)(void) -->
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-654'/>
+    <!-- int (*)(void*) -->
     <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-441'/>
-    <!-- int (void**, int)* -->
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-460'/>
-    <!-- int (void**, typedef __sanitizer::uptr, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-672'/>
-    <!-- int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**)* -->
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-760'/>
-    <!-- int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**)* -->
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-756'/>
-    <!-- int (void*, __sanitizer::u32*)* -->
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-750'/>
-    <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*)* -->
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-428'/>
-    <!-- int (void*, const char*, variadic parameter type)* -->
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-422'/>
-    <!-- int (void*, double*)* -->
-    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-489'/>
-    <!-- int (void*, int)* -->
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-713'/>
-    <!-- int (void*, int*)* -->
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-796'/>
-    <!-- int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, typedef SIZE_T, __sanitizer::__sanitizer_hostent**, int*)* -->
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-554'/>
-    <!-- int (void*, int, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-798'/>
-    <!-- int (void*, long int*)* -->
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-615'/>
-    <!-- int (void*, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-684'/>
-    <!-- int (void*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-640'/>
-    <!-- int (void*, typedef long_t)* -->
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-656'/>
-    <!-- int (void*, void ()*)* -->
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-721'/>
-    <!-- int (void*, void*)* -->
+    <!-- int (*)(void**, __sanitizer::uptr, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-672'/>
+    <!-- int (*)(void**, int) -->
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-460'/>
+    <!-- int (*)(void*, SIZE_T, void*) -->
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-684'/>
+    <!-- int (*)(void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-760'/>
+    <!-- int (*)(void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-756'/>
+    <!-- int (*)(void*, __sanitizer::u32*) -->
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-750'/>
+    <!-- int (*)(void*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-640'/>
+    <!-- int (*)(void*, const char*, ...) -->
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-422'/>
+    <!-- int (*)(void*, const char*, typedef __va_list_tag __va_list_tag*) -->
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-428'/>
+    <!-- int (*)(void*, double*) -->
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-489'/>
+    <!-- int (*)(void*, int) -->
+    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-713'/>
+    <!-- int (*)(void*, int*) -->
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-796'/>
+    <!-- int (*)(void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-554'/>
+    <!-- int (*)(void*, int, unsigned int) -->
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-798'/>
+    <!-- int (*)(void*, long int*) -->
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-615'/>
+    <!-- int (*)(void*, long_t) -->
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-656'/>
+    <!-- int (*)(void*, void (*)(void)) -->
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-721'/>
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-12'/>
-    <!-- int (void*, void**)* -->
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-711'/>
-    <!-- int (void*, void**, SIZE_T*)* -->
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-692'/>
-    <!-- int (void*, void*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-632'/>
-    <!-- int (void*, void*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-696'/>
-    <!-- int (void*, void*, void* (void*)*, void*)* -->
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-706'/>
-    <!-- int (void*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-703'/>
-    <!-- int (void*, void*, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-544'/>
+    <!-- int (*)(void*, void**) -->
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-711'/>
+    <!-- int (*)(void*, void**, SIZE_T*) -->
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-692'/>
+    <!-- int (*)(void*, void*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-632'/>
+    <!-- int (*)(void*, void*, unsigned int) -->
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-696'/>
+    <!-- int (*)(void*, void*, void* (*)(void*), void*) -->
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-706'/>
+    <!-- int (*)(void*, void*, void*) -->
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-703'/>
+    <!-- int (*)(void*, void*, void*, void*) -->
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-544'/>
     <!-- ioctl_desc& -->
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1161'/>
-    <!-- ioctl_desc[500]* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1162'/>
-    <!-- long double (long double)* -->
-    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-606'/>
-    <!-- long double (long double, int*)* -->
-    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-531'/>
-    <!-- long double (long double, long double*)* -->
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-651'/>
-    <!-- long double (long double, long double, int*)* -->
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-776'/>
+    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1183'/>
+    <!-- ioctl_desc(*)[500] -->
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1184'/>
+    <!-- long double (*)(long double) -->
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-606'/>
+    <!-- long double (*)(long double, int*) -->
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-531'/>
+    <!-- long double (*)(long double, long double*) -->
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-651'/>
+    <!-- long double (*)(long double, long double, int*) -->
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-776'/>
     <!-- long double* -->
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1167'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1189'/>
     <!-- long int* -->
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-1168'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-1190'/>
+    <!-- long_t (*)(int, void*, int) -->
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-805'/>
+    <!-- long_t (*)(int, void*, long_t, int) -->
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-768'/>
     <!-- my_siginfo_t* -->
-    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1193'/>
     <!-- sanitizer_kernel_iovec* -->
     <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-398'/>
     <!-- sanitizer_kernel_mmsghdr* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-1170'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-1194'/>
     <!-- sanitizer_kernel_msghdr* -->
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1171'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1195'/>
     <!-- sanitizer_kernel_sockaddr* -->
-    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1196'/>
     <!-- sigaction_t* -->
-    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1173'/>
-    <!-- typedef INTMAX_T (const char*, char**, int)* -->
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-878'/>
-    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-909'/>
-    <!-- typedef SIZE_T (char*, const wchar_t**, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-911'/>
-    <!-- typedef SIZE_T (char*, const wchar_t*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-913'/>
-    <!-- typedef SIZE_T (int, char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-476'/>
-    <!-- typedef SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*)* -->
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-585'/>
-    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-623'/>
-    <!-- typedef SIZE_T (wchar_t*, const char**, typedef SIZE_T, void*)* -->
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-625'/>
-    <!-- typedef SIZE_T (wchar_t*, const char*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-627'/>
-    <!-- typedef SSIZE_T (char**, SIZE_T*, int, void*)* -->
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-548'/>
-    <!-- typedef SSIZE_T (char**, SIZE_T*, void*)* -->
-    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-569'/>
-    <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int)* -->
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-762'/>
-    <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, typedef OFF_T)* -->
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-681'/>
-    <!-- typedef SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int)* -->
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-770'/>
-    <!-- typedef SSIZE_T (int, void*, typedef OFF64_T, typedef OFF64_T)* -->
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-744'/>
-    <!-- typedef SSIZE_T (int, void*, typedef SIZE_T)* -->
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-752'/>
-    <!-- typedef SSIZE_T (int, void*, typedef SIZE_T, typedef OFF_T)* -->
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-678'/>
-    <!-- typedef __sanitizer::__sanitizer_clock_t (void*)* -->
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-888'/>
-    <!-- typedef __sanitizer::uptr (const char*)* -->
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-866'/>
-    <!-- typedef __sanitizer::uptr (int, int, void*, void*)* -->
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-739'/>
-    <!-- typedef __sanitizer::uptr (void*)* -->
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-621'/>
-    <!-- typedef __sanitizer::uptr (void*, typedef __sanitizer::uptr, typedef __sanitizer::uptr, void*)* -->
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1197'/>
+    <!-- sighandler_t (*)(int, sighandler_t) -->
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-819'/>
     <!-- typedef __va_list_tag __va_list_tag* -->
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1196'/>
-    <!-- typedef long_t (int, void*, int)* -->
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-805'/>
-    <!-- typedef long_t (int, void*, typedef long_t, int)* -->
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-768'/>
-    <!-- typedef sighandler_t (int, typedef sighandler_t)* -->
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-819'/>
-    <!-- unsigned int (unsigned int)* -->
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1199'/>
+    <!-- unsigned int (*)(unsigned int) -->
     <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-841'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-178'/>
-    <!-- unsigned long int (unsigned long int*)* -->
+    <!-- unsigned long int (*)(unsigned long int*) -->
     <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-886'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-137'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-144'/>
-    <!-- void (__sanitizer::uptr*, int)* -->
+    <!-- void (*)(__sanitizer::uptr*, int) -->
     <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-613'/>
-    <!-- void (double, double*, double*)* -->
+    <!-- void (*)(double, double*, double*) -->
     <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-835'/>
-    <!-- void (float, float*, float*)* -->
+    <!-- void (*)(float, float*, float*) -->
     <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-837'/>
-    <!-- void (int)* -->
+    <!-- void (*)(int) -->
     <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-231'/>
-    <!-- void (int, my_siginfo_t*, void*)* -->
+    <!-- void (*)(int, my_siginfo_t*, void*) -->
     <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-403'/>
-    <!-- void (int, void*)* -->
+    <!-- void (*)(int, void*) -->
     <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
-    <!-- void (long double, long double*, long double*)* -->
+    <!-- void (*)(long double, long double*, long double*) -->
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-839'/>
-    <!-- void (void*, bool)* -->
+    <!-- void (*)(void) -->
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-144'/>
+    <!-- void (*)(void*, bool) -->
     <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-439'/>
-    <!-- void* (char*)* -->
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-664'/>
-    <!-- void* (char*, char*)* -->
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-519'/>
-    <!-- void* (char*, char*, void*)* -->
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-525'/>
-    <!-- void* (char*, int, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-637'/>
-    <!-- void* (const char*, int)* -->
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-487'/>
-    <!-- void* (typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-619'/>
-    <!-- void* (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-434'/>
-    <!-- void* (void*)* -->
+    <!-- void* (*)(__sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-619'/>
+    <!-- void* (*)(__sanitizer::uptr, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-434'/>
+    <!-- void* (*)(char*) -->
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-664'/>
+    <!-- void* (*)(char*, char*) -->
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-519'/>
+    <!-- void* (*)(char*, char*, void*) -->
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-525'/>
+    <!-- void* (*)(char*, int, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-637'/>
+    <!-- void* (*)(const char*, int) -->
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-487'/>
+    <!-- void* (*)(void*) -->
     <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
-    <!-- void* (void*, int, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-630'/>
-    <!-- void* (void*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-764'/>
-    <!-- void* (void*, typedef long_t, int, int, int, typedef __sanitizer::u64)* -->
+    <!-- void* (*)(void*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-764'/>
+    <!-- void* (*)(void*, int, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-630'/>
+    <!-- void* (*)(void*, long_t, int, int, int, __sanitizer::u64) -->
     <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-643'/>
-    <!-- void* (void*, typedef long_t, int, int, int, unsigned int)* -->
+    <!-- void* (*)(void*, long_t, int, int, int, unsigned int) -->
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-645'/>
-    <!-- void* (void*, void*, typedef __sanitizer::uptr)* -->
+    <!-- void* (*)(void*, void*, __sanitizer::uptr) -->
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-634'/>
     <!-- volatile __sanitizer::atomic_uint32_t -->
-    <qualified-type-def type-id='type-id-998' volatile='yes' id='type-id-1052'/>
+    <qualified-type-def type-id='type-id-1016' volatile='yes' id='type-id-1074'/>
     <!-- volatile __sanitizer::atomic_uint32_t* -->
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-236'/>
     <!-- volatile __sanitizer::atomic_uint32_t::Type -->
     <qualified-type-def type-id='type-id-235' volatile='yes' id='type-id-1224'/>
     <!-- wchar_t* -->
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-1225'/>
     <!-- const kernel_sigset_t* -->
-    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1226'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-1226'/>
     <!-- kernel_sigset_t* -->
     <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1227'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- struct std::nothrow_t -->
-      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='108' column='1' id='type-id-1049'/>
+      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='108' column='1' id='type-id-1071'/>
     </namespace-decl>
     <!-- namespace __interception -->
     <namespace-decl name='__interception'>
@@ -13069,7 +13069,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -13080,7 +13080,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <!-- parameter of type 'typedef OFF_T' -->
@@ -13093,7 +13093,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -13143,7 +13143,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -13154,7 +13154,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'typedef OFF_T' -->
@@ -13167,7 +13167,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-997' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -13202,7 +13202,7 @@ 
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_localtime_r(unsigned long int*, void*) -->
     <function-decl name='__interceptor_localtime_r' mangled-name='__interceptor_localtime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_localtime_r'>
@@ -13211,14 +13211,14 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_gmtime(unsigned long int*) -->
     <function-decl name='__interceptor_gmtime' mangled-name='__interceptor_gmtime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gmtime'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_tm* __interceptor_gmtime_r(unsigned long int*, void*) -->
     <function-decl name='__interceptor_gmtime_r' mangled-name='__interceptor_gmtime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gmtime_r'>
@@ -13227,7 +13227,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <!-- char* __interceptor_ctime(unsigned long int*) -->
     <function-decl name='__interceptor_ctime' mangled-name='__interceptor_ctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ctime'>
@@ -13248,14 +13248,14 @@ 
     <!-- char* __interceptor_asctime(__sanitizer::__sanitizer_tm*) -->
     <function-decl name='__interceptor_asctime' mangled-name='__interceptor_asctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_asctime'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1'/>
+      <parameter type-id='type-id-1011' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
     <!-- char* __interceptor_asctime_r(__sanitizer::__sanitizer_tm*, char*) -->
     <function-decl name='__interceptor_asctime_r' mangled-name='__interceptor_asctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_asctime_r'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
+      <parameter type-id='type-id-1011' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
       <!-- char* -->
@@ -13268,7 +13268,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
+      <parameter type-id='type-id-1011' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -13277,7 +13277,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13288,7 +13288,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13299,7 +13299,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13308,7 +13308,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13319,7 +13319,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13330,7 +13330,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
+      <parameter type-id='type-id-1199' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13563,7 +13563,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostbyaddr(void*, int, int) -->
     <function-decl name='__interceptor_gethostbyaddr' mangled-name='__interceptor_gethostbyaddr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyaddr'>
@@ -13574,14 +13574,14 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostent(int) -->
     <function-decl name='__interceptor_gethostent' mangled-name='__interceptor_gethostent' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostbyname2(char*, int) -->
     <function-decl name='__interceptor_gethostbyname2' mangled-name='__interceptor_gethostbyname2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2'>
@@ -13590,18 +13590,18 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <!-- int __interceptor_gethostent_r(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-decl name='__interceptor_gethostent_r' mangled-name='__interceptor_gethostent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent_r'>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- int -->
@@ -13616,13 +13616,13 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- int -->
@@ -13633,13 +13633,13 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- int -->
@@ -13652,13 +13652,13 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
+      <parameter type-id='type-id-985' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
+      <parameter type-id='type-id-990' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- int -->
@@ -13708,7 +13708,7 @@ 
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
+      <parameter type-id='type-id-1083' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
       <!-- double -->
       <return type-id='type-id-378'/>
     </function-decl>
@@ -13717,7 +13717,7 @@ 
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
+      <parameter type-id='type-id-1088' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-decl>
@@ -13726,7 +13726,7 @@ 
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
+      <parameter type-id='type-id-1189' name='iptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
       <!-- long double -->
       <return type-id='type-id-383'/>
     </function-decl>
@@ -13735,7 +13735,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
-      <parameter type-id='type-id-986' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
+      <parameter type-id='type-id-1004' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -13764,16 +13764,16 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1'/>
       <!-- __sanitizer::__sanitizer_dirent* -->
-      <return type-id='type-id-953'/>
+      <return type-id='type-id-971'/>
     </function-decl>
     <!-- int __interceptor_readdir_r(void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
     <function-decl name='__interceptor_readdir_r' mangled-name='__interceptor_readdir_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent*' -->
-      <parameter type-id='type-id-953' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
+      <parameter type-id='type-id-971' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-955' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
+      <parameter type-id='type-id-973' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13782,16 +13782,16 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1'/>
       <!-- __sanitizer::__sanitizer_dirent64* -->
-      <return type-id='type-id-958'/>
+      <return type-id='type-id-976'/>
     </function-decl>
     <!-- int __interceptor_readdir64_r(void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
     <function-decl name='__interceptor_readdir64_r' mangled-name='__interceptor_readdir64_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir64_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64*' -->
-      <parameter type-id='type-id-958' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
+      <parameter type-id='type-id-976' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-960' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
+      <parameter type-id='type-id-978' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -13838,7 +13838,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
+      <parameter type-id='type-id-1043' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <!-- typedef INTMAX_T -->
@@ -13849,7 +13849,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
+      <parameter type-id='type-id-1043' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- typedef INTMAX_T -->
@@ -13899,7 +13899,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-1055' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
+      <parameter type-id='type-id-1077' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <!-- typedef SIZE_T -->
@@ -13910,7 +13910,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
+      <parameter type-id='type-id-1078' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -13923,7 +13923,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
+      <parameter type-id='type-id-1078' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='nms' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -14014,7 +14014,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent***' -->
-      <parameter type-id='type-id-956' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
+      <parameter type-id='type-id-974' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- parameter of type 'typedef scandir_filter_f' -->
       <parameter type-id='type-id-791' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- parameter of type 'typedef scandir_compar_f' -->
@@ -14027,7 +14027,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64***' -->
-      <parameter type-id='type-id-961' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
+      <parameter type-id='type-id-979' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- parameter of type 'typedef scandir64_filter_f' -->
       <parameter type-id='type-id-785' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- parameter of type 'typedef scandir64_compar_f' -->
@@ -14040,14 +14040,14 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='lst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
+      <parameter type-id='type-id-1019' name='lst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_poll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
     <function-decl name='__interceptor_poll' mangled-name='__interceptor_poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_poll'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
+      <parameter type-id='type-id-1008' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <!-- parameter of type 'int' -->
@@ -14058,13 +14058,13 @@ 
     <!-- int __interceptor_ppoll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_ppoll' mangled-name='__interceptor_ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ppoll'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
+      <parameter type-id='type-id-1008' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout_ts' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
+      <parameter type-id='type-id-1009' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14073,7 +14073,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_wordexp_t*' -->
-      <parameter type-id='type-id-997' name='p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
+      <parameter type-id='type-id-1015' name='p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- int -->
@@ -14082,7 +14082,7 @@ 
     <!-- int __interceptor_sigwait(__sanitizer::__sanitizer_sigset_t*, int*) -->
     <function-decl name='__interceptor_sigwait' mangled-name='__interceptor_sigwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwait'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='sig' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <!-- int -->
@@ -14091,7 +14091,7 @@ 
     <!-- int __interceptor_sigwaitinfo(__sanitizer::__sanitizer_sigset_t*, void*) -->
     <function-decl name='__interceptor_sigwaitinfo' mangled-name='__interceptor_sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwaitinfo'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <!-- int -->
@@ -14100,7 +14100,7 @@ 
     <!-- int __interceptor_sigtimedwait(__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
     <function-decl name='__interceptor_sigtimedwait' mangled-name='__interceptor_sigtimedwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigtimedwait'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -14111,21 +14111,21 @@ 
     <!-- int __interceptor_sigemptyset(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigemptyset' mangled-name='__interceptor_sigemptyset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigemptyset'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sigfillset(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigfillset' mangled-name='__interceptor_sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigfillset'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- int __interceptor_sigpending(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigpending' mangled-name='__interceptor_sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigpending'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14134,9 +14134,9 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
+      <parameter type-id='type-id-1009' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
+      <parameter type-id='type-id-1009' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14156,7 +14156,7 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
       <!-- char** -->
-      <return type-id='type-id-1021'/>
+      <return type-id='type-id-1043'/>
     </function-decl>
     <!-- void __interceptor__exit(int) -->
     <function-decl name='__interceptor__exit' mangled-name='__interceptor__exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__exit'>
@@ -14216,20 +14216,20 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_mntent* __interceptor_getmntent_r(void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
     <function-decl name='__interceptor_getmntent_r' mangled-name='__interceptor_getmntent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getmntent_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_mntent*' -->
-      <parameter type-id='type-id-982' name='mntbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
+      <parameter type-id='type-id-1000' name='mntbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-decl>
     <!-- int __interceptor_statfs(char*, void*) -->
     <function-decl name='__interceptor_statfs' mangled-name='__interceptor_statfs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_statfs'>
@@ -14315,7 +14315,7 @@ 
     <!-- char* __interceptor_ether_ntoa(__sanitizer::__sanitizer_ether_addr*) -->
     <function-decl name='__interceptor_ether_ntoa' mangled-name='__interceptor_ether_ntoa' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntoa'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -14324,14 +14324,14 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-decl>
     <!-- int __interceptor_ether_ntohost(char*, __sanitizer::__sanitizer_ether_addr*) -->
     <function-decl name='__interceptor_ether_ntohost' mangled-name='__interceptor_ether_ntohost' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntohost'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14340,7 +14340,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14349,7 +14349,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <!-- int -->
@@ -14358,7 +14358,7 @@ 
     <!-- char* __interceptor_ether_ntoa_r(__sanitizer::__sanitizer_ether_addr*, char*) -->
     <function-decl name='__interceptor_ether_ntoa_r' mangled-name='__interceptor_ether_ntoa_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntoa_r'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
       <!-- char* -->
@@ -14369,9 +14369,9 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-decl>
     <!-- int __interceptor_shmctl(int, int, void*) -->
     <function-decl name='__interceptor_shmctl' mangled-name='__interceptor_shmctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_shmctl'>
@@ -14389,7 +14389,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
+      <parameter type-id='type-id-1019' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14454,7 +14454,7 @@ 
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
+      <parameter type-id='type-id-937' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14515,9 +14515,9 @@ 
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
+      <parameter type-id='type-id-1083' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
+      <parameter type-id='type-id-1083' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -14526,9 +14526,9 @@ 
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
+      <parameter type-id='type-id-1088' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
+      <parameter type-id='type-id-1088' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -14537,9 +14537,9 @@ 
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
+      <parameter type-id='type-id-1189' name='sin' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
+      <parameter type-id='type-id-1189' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -14629,7 +14629,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
+      <parameter type-id='type-id-1083' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -14638,16 +14638,16 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <!-- parameter of type 'long int*' -->
-      <parameter type-id='type-id-1168' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
+      <parameter type-id='type-id-1190' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_getline(char**, SIZE_T*, void*) -->
     <function-decl name='__interceptor_getline' mangled-name='__interceptor_getline' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getline'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
+      <parameter type-id='type-id-1043' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
+      <parameter type-id='type-id-937' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -14656,9 +14656,9 @@ 
     <!-- SSIZE_T __interceptor_getdelim(char**, SIZE_T*, int, void*) -->
     <function-decl name='__interceptor_getdelim' mangled-name='__interceptor_getdelim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getdelim'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
+      <parameter type-id='type-id-1043' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
+      <parameter type-id='type-id-937' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='delim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -14671,13 +14671,13 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='cd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='inbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-1043' name='inbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='inbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-937' name='inbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='outbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-1043' name='outbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='outbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
+      <parameter type-id='type-id-937' name='outbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-decl>
@@ -14693,7 +14693,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_msghdr*' -->
-      <parameter type-id='type-id-1171' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
+      <parameter type-id='type-id-1195' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <!-- void -->
@@ -14706,7 +14706,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_msghdr*' -->
-      <parameter type-id='type-id-1171' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
+      <parameter type-id='type-id-1195' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='158' column='1'/>
       <!-- void -->
@@ -14717,7 +14717,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_mmsghdr*' -->
-      <parameter type-id='type-id-1170' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
+      <parameter type-id='type-id-1194' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -14734,7 +14734,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_mmsghdr*' -->
-      <parameter type-id='type-id-1170' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
+      <parameter type-id='type-id-1194' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -15100,7 +15100,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='326' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_gid_t*' -->
-      <parameter type-id='type-id-941' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='327' column='1'/>
+      <parameter type-id='type-id-958' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='327' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -15293,7 +15293,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_gid_t*' -->
-      <parameter type-id='type-id-941' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
+      <parameter type-id='type-id-958' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -15304,7 +15304,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='377' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_gid_t*' -->
-      <parameter type-id='type-id-941' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='378' column='1'/>
+      <parameter type-id='type-id-958' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='378' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17913,7 +17913,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1288' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
+      <parameter type-id='type-id-992' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
       <!-- void -->
@@ -17930,7 +17930,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1293' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
+      <parameter type-id='type-id-992' name='ioevpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
       <!-- void -->
@@ -17943,7 +17943,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb**' -->
-      <parameter type-id='type-id-977' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
+      <parameter type-id='type-id-995' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17956,7 +17956,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1335' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb**' -->
-      <parameter type-id='type-id-977' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1336' column='1'/>
+      <parameter type-id='type-id-995' name='iocbpp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1336' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17965,9 +17965,9 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb*' -->
-      <parameter type-id='type-id-976' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
+      <parameter type-id='type-id-994' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1339' column='1'/>
+      <parameter type-id='type-id-992' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1339' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17978,9 +17978,9 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iocb*' -->
-      <parameter type-id='type-id-976' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
+      <parameter type-id='type-id-994' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_io_event*' -->
-      <parameter type-id='type-id-974' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1343' column='1'/>
+      <parameter type-id='type-id-992' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1343' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18006,7 +18006,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='in_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1357' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_off_t*' -->
-      <parameter type-id='type-id-945' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
+      <parameter type-id='type-id-962' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
       <!-- void -->
@@ -18034,7 +18034,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='in_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1366' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_loff_t*' -->
-      <parameter type-id='type-id-943' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
+      <parameter type-id='type-id-960' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
       <!-- void -->
@@ -18412,11 +18412,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_uid_t*' -->
-      <parameter type-id='type-id-949' name='ruid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
+      <parameter type-id='type-id-966' name='ruid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_uid_t*' -->
-      <parameter type-id='type-id-949' name='euid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1482' column='1'/>
+      <parameter type-id='type-id-966' name='euid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1482' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_uid_t*' -->
-      <parameter type-id='type-id-949' name='suid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1483' column='1'/>
+      <parameter type-id='type-id-966' name='suid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1483' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18460,11 +18460,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='rgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
+      <parameter type-id='type-id-964' name='rgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='egid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1498' column='1'/>
+      <parameter type-id='type-id-964' name='egid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1498' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='sgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1499' column='1'/>
+      <parameter type-id='type-id-964' name='sgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1499' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18505,7 +18505,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1515' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1516' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1516' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18516,7 +18516,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1518' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1519' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1519' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18525,7 +18525,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1525' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1526' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1526' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18536,7 +18536,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1530' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_old_gid_t*' -->
-      <parameter type-id='type-id-947' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1531' column='1'/>
+      <parameter type-id='type-id-964' name='grouplist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1531' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -18689,7 +18689,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <!-- void -->
@@ -18702,7 +18702,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1588' column='1'/>
       <!-- void -->
@@ -18737,7 +18737,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <!-- void -->
@@ -18750,7 +18750,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1603' column='1'/>
       <!-- void -->
@@ -18817,7 +18817,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18834,7 +18834,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18849,7 +18849,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -18866,7 +18866,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
+      <parameter type-id='type-id-1064' name='vec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1657' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19133,7 +19133,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <!-- void -->
@@ -19146,7 +19146,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1761' column='1'/>
       <!-- void -->
@@ -19157,7 +19157,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <!-- void -->
@@ -19170,7 +19170,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1770' column='1'/>
       <!-- void -->
@@ -19181,7 +19181,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <!-- void -->
@@ -19194,7 +19194,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1779' column='1'/>
       <!-- void -->
@@ -19205,7 +19205,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19220,7 +19220,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19233,7 +19233,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1798' column='1'/>
       <!-- void -->
@@ -19246,7 +19246,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1801' column='1'/>
       <!-- void -->
@@ -19257,7 +19257,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1809' column='1'/>
       <!-- void -->
@@ -19270,7 +19270,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
+      <parameter type-id='type-id-1196' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1812' column='1'/>
       <!-- void -->
@@ -19315,7 +19315,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <!-- void -->
@@ -19334,7 +19334,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <!-- void -->
@@ -19429,7 +19429,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <!-- void -->
@@ -19448,7 +19448,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <!-- parameter of type 'sanitizer_kernel_sockaddr*' -->
-      <parameter type-id='type-id-1172' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
+      <parameter type-id='type-id-1196' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <!-- void -->
@@ -19562,7 +19562,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='ufds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
+      <parameter type-id='type-id-1008' name='ufds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -19575,11 +19575,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
+      <parameter type-id='type-id-956' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1905' column='1'/>
+      <parameter type-id='type-id-956' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1905' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
+      <parameter type-id='type-id-956' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tvp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
       <!-- void -->
@@ -19592,11 +19592,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
+      <parameter type-id='type-id-956' name='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1909' column='1'/>
+      <parameter type-id='type-id-956' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1909' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
+      <parameter type-id='type-id-956' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tvp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
       <!-- void -->
@@ -20585,7 +20585,7 @@ 
     <!-- void __sanitizer_syscall_pre_impl_sysctl(__sanitizer::__sanitizer___sysctl_args*) -->
     <function-decl name='__sanitizer_syscall_pre_impl_sysctl' mangled-name='__sanitizer_syscall_pre_impl_sysctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_sysctl'>
       <!-- parameter of type '__sanitizer::__sanitizer___sysctl_args*' -->
-      <parameter type-id='type-id-951' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2242' column='1'/>
+      <parameter type-id='type-id-968' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2242' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -20594,7 +20594,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___sysctl_args*' -->
-      <parameter type-id='type-id-951' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
+      <parameter type-id='type-id-968' name='args' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -21595,7 +21595,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
+      <parameter type-id='type-id-1064' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr_segs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -21610,7 +21610,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
+      <parameter type-id='type-id-1064' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='nr_segs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2641' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -21899,11 +21899,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
+      <parameter type-id='type-id-956' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2727' column='1'/>
+      <parameter type-id='type-id-956' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2727' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
+      <parameter type-id='type-id-956' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21918,11 +21918,11 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
+      <parameter type-id='type-id-956' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2732' column='1'/>
+      <parameter type-id='type-id-956' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2732' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer___kernel_fd_set*' -->
-      <parameter type-id='type-id-939' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
+      <parameter type-id='type-id-956' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21933,7 +21933,7 @@ 
     <!-- void __sanitizer_syscall_pre_impl_ppoll(__sanitizer::__sanitizer_pollfd*, long int, void*, const kernel_sigset_t*, long int) -->
     <function-decl name='__sanitizer_syscall_pre_impl_ppoll' mangled-name='__sanitizer_syscall_pre_impl_ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_ppoll'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
+      <parameter type-id='type-id-1008' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21950,7 +21950,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
+      <parameter type-id='type-id-1008' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -21981,7 +21981,7 @@ 
     <!-- void __sanitizer_syscall_pre_impl_perf_event_open(__sanitizer::__sanitizer_perf_event_attr*, long int, long int, long int, long int) -->
     <function-decl name='__sanitizer_syscall_pre_impl_perf_event_open' mangled-name='__sanitizer_syscall_pre_impl_perf_event_open' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_perf_event_open'>
       <!-- parameter of type '__sanitizer::__sanitizer_perf_event_attr*' -->
-      <parameter type-id='type-id-988' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
+      <parameter type-id='type-id-1006' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -21998,7 +21998,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_perf_event_attr*' -->
-      <parameter type-id='type-id-988' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
+      <parameter type-id='type-id-1006' name='attr_uptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2766' column='1'/>
       <!-- parameter of type 'long int' -->
@@ -22143,7 +22143,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2794' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22162,7 +22162,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2797' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22179,7 +22179,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2806' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22198,7 +22198,7 @@ 
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2809' column='1'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-1042' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
+      <parameter type-id='type-id-1064' name='lvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
       <!-- parameter of type 'long int' -->
       <parameter type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -22237,10 +22237,10 @@ 
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::InternalMmapVector<__sanitizer::Suppression> -->
-      <class-decl name='InternalMmapVector&lt;__sanitizer::Suppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-929'>
+      <class-decl name='InternalMmapVector&lt;__sanitizer::Suppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-946'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::Suppression* __sanitizer::InternalMmapVector<__sanitizer::Suppression>::data_ -->
-          <var-decl name='data_' type-id='type-id-935' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
+          <var-decl name='data_' type-id='type-id-952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __sanitizer::InternalMmapVector<__sanitizer::Suppression>::capacity_ -->
@@ -22254,7 +22254,7 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(__sanitizer::uptr) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22265,7 +22265,7 @@ 
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>::~InternalMmapVector(int) -->
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <!-- void -->
@@ -22276,9 +22276,9 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&' -->
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22287,7 +22287,7 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(__sanitizer::uptr) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22298,7 +22298,7 @@ 
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>::~InternalMmapVector(int) -->
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <!-- void -->
@@ -22309,9 +22309,9 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&' -->
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22320,7 +22320,7 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(__sanitizer::uptr) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22331,7 +22331,7 @@ 
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>::~InternalMmapVector(int) -->
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <!-- void -->
@@ -22342,9 +22342,9 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::InternalMmapVector(const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&) -->
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>&' -->
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-1046'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22353,7 +22353,7 @@ 
           <!-- __sanitizer::uptr __sanitizer::InternalMmapVector<__sanitizer::Suppression>::size() -->
           <function-decl name='size' mangled-name='_ZNK11__sanitizer18InternalMmapVectorINS_11SuppressionEE4sizeEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-1047' is-artificial='yes'/>
             <!-- typedef __sanitizer::uptr -->
             <return type-id='type-id-2'/>
           </function-decl>
@@ -22362,29 +22362,29 @@ 
           <!-- __sanitizer::Suppression& __sanitizer::InternalMmapVector<__sanitizer::Suppression>::operator[](__sanitizer::uptr) -->
           <function-decl name='operator[]' mangled-name='_ZN11__sanitizer18InternalMmapVectorINS_11SuppressionEEixEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- __sanitizer::Suppression& -->
-            <return type-id='type-id-934'/>
+            <return type-id='type-id-951'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <!-- const __sanitizer::Suppression& __sanitizer::InternalMmapVector<__sanitizer::Suppression>::operator[](__sanitizer::uptr) -->
           <function-decl name='operator[]' mangled-name='_ZNK11__sanitizer18InternalMmapVectorINS_11SuppressionEEixEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-1047' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- const __sanitizer::Suppression& -->
-            <return type-id='type-id-1030'/>
+            <return type-id='type-id-1052'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::Resize(__sanitizer::uptr) -->
           <function-decl name='Resize' mangled-name='_ZN11__sanitizer18InternalMmapVectorINS_11SuppressionEE6ResizeEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- void -->
@@ -22395,16 +22395,16 @@ 
           <!-- void __sanitizer::InternalMmapVector<__sanitizer::Suppression>::push_back(const __sanitizer::Suppression&) -->
           <function-decl name='push_back' mangled-name='_ZN11__sanitizer18InternalMmapVectorINS_11SuppressionEE9push_backERKS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression>*' -->
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::Suppression&' -->
-            <parameter type-id='type-id-1030'/>
+            <parameter type-id='type-id-1052'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class __sanitizer::LibIgnore -->
-      <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-931'>
+      <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-948'>
         <member-type access='private'>
           <!-- struct __sanitizer::LibIgnore::Lib -->
           <class-decl name='Lib' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='43' column='1' id='type-id-362'>
@@ -22467,7 +22467,7 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(LinkerInitialized) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'enum LinkerInitialized' -->
             <parameter type-id='type-id-1232'/>
             <!-- void -->
@@ -22478,9 +22478,9 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(const __sanitizer::LibIgnore&) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::LibIgnore&' -->
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-1049'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22489,7 +22489,7 @@ 
           <!-- bool __sanitizer::LibIgnore::IsIgnored(__sanitizer::uptr) -->
           <function-decl name='IsIgnored' mangled-name='_ZNK11__sanitizer9LibIgnore9IsIgnoredEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- bool -->
@@ -22500,7 +22500,7 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(LinkerInitialized) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'enum LinkerInitialized' -->
             <parameter type-id='type-id-1232'/>
             <!-- void -->
@@ -22511,9 +22511,9 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(const __sanitizer::LibIgnore&) -->
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::LibIgnore&' -->
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-1049'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22522,7 +22522,7 @@ 
           <!-- __sanitizer::LibIgnore::LibIgnore(LinkerInitialized) -->
           <function-decl name='LibIgnore' mangled-name='_ZN11__sanitizer9LibIgnoreC2E17LinkerInitialized' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'enum LinkerInitialized' -->
             <parameter type-id='type-id-1232'/>
             <!-- void -->
@@ -22533,9 +22533,9 @@ 
           <!-- void __sanitizer::LibIgnore::Init(const __sanitizer::SuppressionContext&) -->
           <function-decl name='Init' mangled-name='_ZN11__sanitizer9LibIgnore4InitERKNS_18SuppressionContextE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const __sanitizer::SuppressionContext&' -->
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1055'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22544,7 +22544,7 @@ 
           <!-- void __sanitizer::LibIgnore::OnLibraryLoaded(const char*) -->
           <function-decl name='OnLibraryLoaded' mangled-name='_ZN11__sanitizer9LibIgnore15OnLibraryLoadedEPKc' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='34' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-4'/>
             <!-- void -->
@@ -22555,17 +22555,17 @@ 
           <!-- void __sanitizer::LibIgnore::OnLibraryUnloaded() -->
           <function-decl name='OnLibraryUnloaded' mangled-name='_ZN11__sanitizer9LibIgnore17OnLibraryUnloadedEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::LibIgnore*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class __sanitizer::SuppressionContext -->
-      <class-decl name='SuppressionContext' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='37' column='1' id='type-id-936'>
+      <class-decl name='SuppressionContext' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='37' column='1' id='type-id-953'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression> __sanitizer::SuppressionContext::suppressions_ -->
-          <var-decl name='suppressions_' type-id='type-id-929' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='47' column='1'/>
+          <var-decl name='suppressions_' type-id='type-id-946' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='47' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
           <!-- bool __sanitizer::SuppressionContext::can_parse_ -->
@@ -22575,7 +22575,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22584,7 +22584,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22593,7 +22593,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22602,7 +22602,7 @@ 
           <!-- __sanitizer::SuppressionContext::SuppressionContext() -->
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-27'/>
           </function-decl>
@@ -22611,7 +22611,7 @@ 
           <!-- bool __sanitizer::SuppressionContext::Match(const char*, __sanitizer::SuppressionType, __sanitizer::Suppression**) -->
           <function-decl name='Match' mangled-name='_ZN11__sanitizer18SuppressionContext5MatchEPKcNS_15SuppressionTypeEPPNS_11SuppressionE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'enum __sanitizer::SuppressionType' -->
@@ -22626,7 +22626,7 @@ 
           <!-- void __sanitizer::SuppressionContext::Parse(const char*) -->
           <function-decl name='Parse' mangled-name='_ZN11__sanitizer18SuppressionContext5ParseEPKc' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-4'/>
             <!-- void -->
@@ -22637,7 +22637,7 @@ 
           <!-- __sanitizer::uptr __sanitizer::SuppressionContext::SuppressionCount() -->
           <function-decl name='SuppressionCount' mangled-name='_ZNK11__sanitizer18SuppressionContext16SuppressionCountEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- typedef __sanitizer::uptr -->
             <return type-id='type-id-2'/>
           </function-decl>
@@ -22646,18 +22646,18 @@ 
           <!-- const __sanitizer::Suppression* __sanitizer::SuppressionContext::SuppressionAt(__sanitizer::uptr) -->
           <function-decl name='SuppressionAt' mangled-name='_ZNK11__sanitizer18SuppressionContext13SuppressionAtEm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-2'/>
             <!-- const __sanitizer::Suppression* -->
-            <return type-id='type-id-1031'/>
+            <return type-id='type-id-1053'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- void __sanitizer::SuppressionContext::GetMatched(__sanitizer::InternalMmapVector<__sanitizer::Suppression*>*) -->
           <function-decl name='GetMatched' mangled-name='_ZN11__sanitizer18SuppressionContext10GetMatchedEPNS_18InternalMmapVectorIPNS_11SuppressionEEE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::SuppressionContext*' -->
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <!-- parameter of type '__sanitizer::InternalMmapVector<__sanitizer::Suppression*>*' -->
             <parameter type-id='type-id-190'/>
             <!-- void -->
@@ -22666,14 +22666,14 @@ 
         </member-function>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer___kernel_fd_set -->
-      <class-decl name='__sanitizer___kernel_fd_set' size-in-bits='1024' is-struct='yes' naming-typedef-id='type-id-938' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='379' column='1' id='type-id-1233'>
+      <class-decl name='__sanitizer___kernel_fd_set' size-in-bits='1024' is-struct='yes' naming-typedef-id='type-id-955' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='379' column='1' id='type-id-1233'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned long int __sanitizer::__sanitizer___kernel_fd_set::fds_bits[16] -->
           <var-decl name='fds_bits' type-id='type-id-922' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='380' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer___sysctl_args -->
-      <class-decl name='__sanitizer___sysctl_args' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='129' column='1' id='type-id-950'>
+      <class-decl name='__sanitizer___sysctl_args' size-in-bits='640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='129' column='1' id='type-id-967'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int* __sanitizer::__sanitizer___sysctl_args::name -->
           <var-decl name='name' type-id='type-id-35' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='130' column='1'/>
@@ -22704,7 +22704,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_dirent -->
-      <class-decl name='__sanitizer_dirent' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='326' column='1' id='type-id-952'>
+      <class-decl name='__sanitizer_dirent' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='326' column='1' id='type-id-970'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned long long int __sanitizer::__sanitizer_dirent::d_ino -->
           <var-decl name='d_ino' type-id='type-id-115' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='327' column='1'/>
@@ -22719,7 +22719,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_dirent64 -->
-      <class-decl name='__sanitizer_dirent64' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='342' column='1' id='type-id-957'>
+      <class-decl name='__sanitizer_dirent64' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='342' column='1' id='type-id-975'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned long long int __sanitizer::__sanitizer_dirent64::d_ino -->
           <var-decl name='d_ino' type-id='type-id-115' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='343' column='1'/>
@@ -22734,21 +22734,21 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_ether_addr -->
-      <class-decl name='__sanitizer_ether_addr' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='257' column='1' id='type-id-962'>
+      <class-decl name='__sanitizer_ether_addr' size-in-bits='48' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='257' column='1' id='type-id-980'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned char __sanitizer::__sanitizer_ether_addr::octet[6] -->
           <var-decl name='octet' type-id='type-id-919' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='258' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_hostent -->
-      <class-decl name='__sanitizer_hostent' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='471' column='1' id='type-id-966'>
+      <class-decl name='__sanitizer_hostent' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='471' column='1' id='type-id-984'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- char* __sanitizer::__sanitizer_hostent::h_name -->
           <var-decl name='h_name' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='472' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- char** __sanitizer::__sanitizer_hostent::h_aliases -->
-          <var-decl name='h_aliases' type-id='type-id-1021' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='473' column='1'/>
+          <var-decl name='h_aliases' type-id='type-id-1043' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='473' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __sanitizer::__sanitizer_hostent::h_addrtype -->
@@ -22760,11 +22760,11 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- char** __sanitizer::__sanitizer_hostent::h_addr_list -->
-          <var-decl name='h_addr_list' type-id='type-id-1021' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='476' column='1'/>
+          <var-decl name='h_addr_list' type-id='type-id-1043' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='476' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_io_event -->
-      <class-decl name='__sanitizer_io_event' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='117' column='1' id='type-id-973'>
+      <class-decl name='__sanitizer_io_event' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='117' column='1' id='type-id-991'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::u64 __sanitizer::__sanitizer_io_event::data -->
           <var-decl name='data' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='118' column='1'/>
@@ -22783,7 +22783,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_iocb -->
-      <class-decl name='__sanitizer_iocb' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='103' column='1' id='type-id-975'>
+      <class-decl name='__sanitizer_iocb' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='103' column='1' id='type-id-993'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::u64 __sanitizer::__sanitizer_iocb::aio_data -->
           <var-decl name='aio_data' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='104' column='1'/>
@@ -22830,7 +22830,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_iovec -->
-      <class-decl name='__sanitizer_iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='246' column='1' id='type-id-978'>
+      <class-decl name='__sanitizer_iovec' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='246' column='1' id='type-id-996'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- void* __sanitizer::__sanitizer_iovec::iov_base -->
           <var-decl name='iov_base' type-id='type-id-3' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='247' column='1'/>
@@ -22848,7 +22848,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_mntent -->
-      <class-decl name='__sanitizer_mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='276' column='1' id='type-id-981'>
+      <class-decl name='__sanitizer_mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='276' column='1' id='type-id-999'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- char* __sanitizer::__sanitizer_mntent::mnt_fsname -->
           <var-decl name='mnt_fsname' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='277' column='1'/>
@@ -22875,7 +22875,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_msghdr -->
-      <class-decl name='__sanitizer_msghdr' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='302' column='1' id='type-id-985'>
+      <class-decl name='__sanitizer_msghdr' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='302' column='1' id='type-id-1003'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- void* __sanitizer::__sanitizer_msghdr::msg_name -->
           <var-decl name='msg_name' type-id='type-id-3' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='303' column='1'/>
@@ -22886,7 +22886,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::__sanitizer_iovec* __sanitizer::__sanitizer_msghdr::msg_iov -->
-          <var-decl name='msg_iov' type-id='type-id-979' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='305' column='1'/>
+          <var-decl name='msg_iov' type-id='type-id-997' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='305' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- __sanitizer::uptr __sanitizer::__sanitizer_msghdr::msg_iovlen -->
@@ -22906,7 +22906,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_perf_event_attr -->
-      <class-decl name='__sanitizer_perf_event_attr' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='79' column='1' id='type-id-987'>
+      <class-decl name='__sanitizer_perf_event_attr' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='79' column='1' id='type-id-1005'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned int __sanitizer::__sanitizer_perf_event_attr::type -->
           <var-decl name='type' type-id='type-id-172' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='80' column='1'/>
@@ -22917,7 +22917,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_pollfd -->
-      <class-decl name='__sanitizer_pollfd' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='479' column='1' id='type-id-989'>
+      <class-decl name='__sanitizer_pollfd' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='479' column='1' id='type-id-1007'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __sanitizer::__sanitizer_pollfd::fd -->
           <var-decl name='fd' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='480' column='1'/>
@@ -22939,7 +22939,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_tm -->
-      <class-decl name='__sanitizer_tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='261' column='1' id='type-id-992'>
+      <class-decl name='__sanitizer_tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='261' column='1' id='type-id-1010'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __sanitizer::__sanitizer_tm::tm_sec -->
           <var-decl name='tm_sec' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='262' column='1'/>
@@ -22986,14 +22986,14 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::__sanitizer_wordexp_t -->
-      <class-decl name='__sanitizer_wordexp_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='511' column='1' id='type-id-996'>
+      <class-decl name='__sanitizer_wordexp_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='511' column='1' id='type-id-1014'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::uptr __sanitizer::__sanitizer_wordexp_t::we_wordc -->
           <var-decl name='we_wordc' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='512' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- char** __sanitizer::__sanitizer_wordexp_t::we_wordv -->
-          <var-decl name='we_wordv' type-id='type-id-1021' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='513' column='1'/>
+          <var-decl name='we_wordv' type-id='type-id-1043' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='513' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::uptr __sanitizer::__sanitizer_wordexp_t::we_offs -->
@@ -23001,7 +23001,7 @@ 
         </data-member>
       </class-decl>
       <!-- struct __sanitizer::atomic_uint32_t -->
-      <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-998'>
+      <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-1016'>
         <member-type access='public'>
           <!-- typedef __sanitizer::u32 __sanitizer::atomic_uint32_t::Type -->
           <typedef-decl name='Type' type-id='type-id-237' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='39' column='1' id='type-id-235'/>
@@ -23016,17 +23016,17 @@ 
       <!-- typedef __sanitizer::u64 __sanitizer::OFF_T -->
       <typedef-decl name='OFF_T' type-id='type-id-116' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='81' column='1' id='type-id-238'/>
       <!-- typedef __sanitizer::__sanitizer___kernel_fd_set __sanitizer::__sanitizer___kernel_fd_set -->
-      <typedef-decl name='__sanitizer___kernel_fd_set' type-id='type-id-1233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='381' column='1' id='type-id-938'/>
+      <typedef-decl name='__sanitizer___kernel_fd_set' type-id='type-id-1233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='381' column='1' id='type-id-955'/>
       <!-- typedef unsigned int __sanitizer::__sanitizer___kernel_gid_t -->
-      <typedef-decl name='__sanitizer___kernel_gid_t' type-id='type-id-172' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='359' column='1' id='type-id-940'/>
+      <typedef-decl name='__sanitizer___kernel_gid_t' type-id='type-id-172' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='359' column='1' id='type-id-957'/>
       <!-- typedef long long int __sanitizer::__sanitizer___kernel_loff_t -->
-      <typedef-decl name='__sanitizer___kernel_loff_t' type-id='type-id-179' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='378' column='1' id='type-id-942'/>
+      <typedef-decl name='__sanitizer___kernel_loff_t' type-id='type-id-179' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='378' column='1' id='type-id-959'/>
       <!-- typedef long int __sanitizer::__sanitizer___kernel_off_t -->
-      <typedef-decl name='__sanitizer___kernel_off_t' type-id='type-id-41' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='367' column='1' id='type-id-944'/>
+      <typedef-decl name='__sanitizer___kernel_off_t' type-id='type-id-41' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='367' column='1' id='type-id-961'/>
       <!-- typedef unsigned short int __sanitizer::__sanitizer___kernel_old_gid_t -->
-      <typedef-decl name='__sanitizer___kernel_old_gid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='375' column='1' id='type-id-946'/>
+      <typedef-decl name='__sanitizer___kernel_old_gid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='375' column='1' id='type-id-963'/>
       <!-- typedef unsigned short int __sanitizer::__sanitizer___kernel_old_uid_t -->
-      <typedef-decl name='__sanitizer___kernel_old_uid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='374' column='1' id='type-id-948'/>
+      <typedef-decl name='__sanitizer___kernel_old_uid_t' type-id='type-id-233' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='374' column='1' id='type-id-965'/>
       <!-- typedef long int __sanitizer::__sanitizer_clock_t -->
       <typedef-decl name='__sanitizer_clock_t' type-id='type-id-41' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='353' column='1' id='type-id-1229'/>
       <!-- typedef unsigned long int __sanitizer::__sanitizer_nfds_t -->
@@ -23357,7 +23357,7 @@ 
         <!-- parameter of type 'volatile __sanitizer::atomic_uint32_t*' -->
         <parameter type-id='type-id-236'/>
         <!-- parameter of type '__sanitizer::atomic_uint32_t::Type*' -->
-        <parameter type-id='type-id-1000'/>
+        <parameter type-id='type-id-1018'/>
         <!-- parameter of type 'typedef __sanitizer::atomic_uint32_t::Type' -->
         <parameter type-id='type-id-235'/>
         <!-- parameter of type 'enum __sanitizer::memory_order' -->
@@ -23395,9 +23395,9 @@ 
       <!-- void __sanitizer::Swap<ioctl_desc>(ioctl_desc&, ioctl_desc&) -->
       <function-decl name='Swap&lt;ioctl_desc&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'ioctl_desc&' -->
-        <parameter type-id='type-id-1161'/>
+        <parameter type-id='type-id-1183'/>
         <!-- parameter of type 'ioctl_desc&' -->
-        <parameter type-id='type-id-1161'/>
+        <parameter type-id='type-id-1183'/>
         <!-- void -->
         <return type-id='type-id-27'/>
       </function-decl>
@@ -23430,11 +23430,11 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int pthread_key_create(unsigned int*, void (void*)*) -->
+    <!-- int pthread_key_create(unsigned int*, void (*)(void*)) -->
     <function-decl name='pthread_key_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-178'/>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-469'/>
       <!-- int -->
       <return type-id='type-id-6'/>
@@ -23467,9 +23467,9 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-1044'/>
+      <parameter type-id='type-id-1066'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991'/>
+      <parameter type-id='type-id-1009'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -23558,25 +23558,25 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor_atexit(void ()*) -->
+    <!-- int __interceptor_atexit(void (*)(void)) -->
     <function-decl name='__interceptor_atexit' mangled-name='__interceptor_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_atexit'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor_on_exit(void (int, void*)*, void*) -->
+    <!-- int __interceptor_on_exit(void (*)(int, void*), void*) -->
     <function-decl name='__interceptor_on_exit' mangled-name='__interceptor_on_exit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_on_exit'>
-      <!-- parameter of type 'void (int, void*)*' -->
+      <!-- parameter of type 'void (*)(int, void*)' -->
       <parameter type-id='type-id-1207' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor___cxa_atexit(void (void*)*, void*, void*) -->
+    <!-- int __interceptor___cxa_atexit(void (*)(void*), void*, void*) -->
     <function-decl name='__interceptor___cxa_atexit' mangled-name='__interceptor___cxa_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___cxa_atexit'>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-469' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
@@ -23705,7 +23705,7 @@ 
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='571' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void* -->
       <return type-id='type-id-3'/>
     </function-decl>
@@ -23714,7 +23714,7 @@ 
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='577' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void* -->
       <return type-id='type-id-3'/>
     </function-decl>
@@ -23737,7 +23737,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='ptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='603' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -23746,7 +23746,7 @@ 
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='ptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='609' column='1'/>
       <!-- parameter of type 'const std::nothrow_t&' -->
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
@@ -23966,31 +23966,31 @@ 
     <!-- int __cxa_guard_acquire(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_acquire' mangled-name='__cxa_guard_acquire' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_acquire'>
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
-      <parameter type-id='type-id-999' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1'/>
+      <parameter type-id='type-id-1017' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
     <!-- void __cxa_guard_release(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_release' mangled-name='__cxa_guard_release' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='809' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_release'>
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
-      <parameter type-id='type-id-999' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='809' column='1'/>
+      <parameter type-id='type-id-1017' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='809' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
     <!-- void __cxa_guard_abort(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_abort' mangled-name='__cxa_guard_abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_abort'>
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
-      <parameter type-id='type-id-999' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1'/>
+      <parameter type-id='type-id-1017' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-decl>
-    <!-- int __interceptor_pthread_create(void*, void*, void* (void*)*, void*) -->
+    <!-- int __interceptor_pthread_create(void*, void*, void* (*)(void*), void*) -->
     <function-decl name='__interceptor_pthread_create' mangled-name='__interceptor_pthread_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_create'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='th' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
-      <!-- parameter of type 'void* (void*)*' -->
+      <!-- parameter of type 'void* (*)(void*)' -->
       <parameter type-id='type-id-1218' name='callback' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='param' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
@@ -24194,11 +24194,11 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
-    <!-- int __interceptor_pthread_once(void*, void ()*) -->
+    <!-- int __interceptor_pthread_once(void*, void (*)(void)) -->
     <function-decl name='__interceptor_pthread_once' mangled-name='__interceptor_pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_once'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='o' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
@@ -24752,9 +24752,9 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-1197' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-1197' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -24770,7 +24770,7 @@ 
     <!-- int __interceptor_sigsuspend(const __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigsuspend' mangled-name='__interceptor_sigsuspend' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsuspend'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-1044' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
+      <parameter type-id='type-id-1066' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-decl>
@@ -25559,60 +25559,60 @@ 
       </enum-decl>
     </namespace-decl>
     <!-- __sanitizer::__sanitizer_dirent* (void*) -->
-    <function-type size-in-bits='64' id='type-id-954'>
+    <function-type size-in-bits='64' id='type-id-972'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- __sanitizer::__sanitizer_dirent* -->
-      <return type-id='type-id-953'/>
+      <return type-id='type-id-971'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_dirent64* (void*) -->
-    <function-type size-in-bits='64' id='type-id-959'>
+    <function-type size-in-bits='64' id='type-id-977'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- __sanitizer::__sanitizer_dirent64* -->
-      <return type-id='type-id-958'/>
+      <return type-id='type-id-976'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_ether_addr* (char*) -->
-    <function-type size-in-bits='64' id='type-id-964'>
+    <function-type size-in-bits='64' id='type-id-982'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_ether_addr* (char*, __sanitizer::__sanitizer_ether_addr*) -->
-    <function-type size-in-bits='64' id='type-id-965'>
+    <function-type size-in-bits='64' id='type-id-983'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- __sanitizer::__sanitizer_ether_addr* -->
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (char*) -->
-    <function-type size-in-bits='64' id='type-id-968'>
+    <function-type size-in-bits='64' id='type-id-986'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (char*, int) -->
-    <function-type size-in-bits='64' id='type-id-969'>
+    <function-type size-in-bits='64' id='type-id-987'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (int) -->
-    <function-type size-in-bits='64' id='type-id-970'>
+    <function-type size-in-bits='64' id='type-id-988'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fake'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (void*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-971'>
+    <function-type size-in-bits='64' id='type-id-989'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'int' -->
@@ -25620,85 +25620,85 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_mntent* (void*) -->
-    <function-type size-in-bits='64' id='type-id-983'>
+    <function-type size-in-bits='64' id='type-id-1001'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_mntent* (void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
-    <function-type size-in-bits='64' id='type-id-984'>
+    <function-type size-in-bits='64' id='type-id-1002'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='fp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_mntent*' -->
-      <parameter type-id='type-id-982' name='mntbuf'/>
+      <parameter type-id='type-id-1000' name='mntbuf'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='buflen'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_tm* (unsigned long int*) -->
-    <function-type size-in-bits='64' id='type-id-994'>
+    <function-type size-in-bits='64' id='type-id-1012'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_tm* (unsigned long int*, void*) -->
-    <function-type size-in-bits='64' id='type-id-995'>
+    <function-type size-in-bits='64' id='type-id-1013'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='result'/>
       <!-- __sanitizer::__sanitizer_tm* -->
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_ether_addr*) -->
-    <function-type size-in-bits='64' id='type-id-1002'>
+    <function-type size-in-bits='64' id='type-id-1024'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_ether_addr*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1003'>
+    <function-type size-in-bits='64' id='type-id-1025'>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_tm*) -->
-    <function-type size-in-bits='64' id='type-id-1004'>
+    <function-type size-in-bits='64' id='type-id-1026'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (__sanitizer::__sanitizer_tm*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1005'>
+    <function-type size-in-bits='64' id='type-id-1027'>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='result'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*) -->
-    <function-type size-in-bits='64' id='type-id-1006'>
+    <function-type size-in-bits='64' id='type-id-1028'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1007'>
+    <function-type size-in-bits='64' id='type-id-1030'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dir'/>
       <!-- parameter of type 'char*' -->
@@ -25707,18 +25707,18 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, char*, __sanitizer::__sanitizer_tm*) -->
-    <function-type size-in-bits='64' id='type-id-1008'>
+    <function-type size-in-bits='64' id='type-id-1031'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='format'/>
       <!-- parameter of type '__sanitizer::__sanitizer_tm*' -->
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, char*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1009'>
+    <function-type size-in-bits='64' id='type-id-1032'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dst'/>
       <!-- parameter of type 'char*' -->
@@ -25729,7 +25729,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1010'>
+    <function-type size-in-bits='64' id='type-id-1033'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dst'/>
       <!-- parameter of type 'const char*' -->
@@ -25738,7 +25738,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, int) -->
-    <function-type size-in-bits='64' id='type-id-1011'>
+    <function-type size-in-bits='64' id='type-id-1034'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'int' -->
@@ -25747,7 +25747,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1012'>
+    <function-type size-in-bits='64' id='type-id-1029'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -25756,7 +25756,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (const char*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1014'>
+    <function-type size-in-bits='64' id='type-id-1036'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='path'/>
       <!-- parameter of type 'char*' -->
@@ -25765,14 +25765,14 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int) -->
-    <function-type size-in-bits='64' id='type-id-1015'>
+    <function-type size-in-bits='64' id='type-id-1037'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='errnum'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, char*) -->
-    <function-type size-in-bits='64' id='type-id-1016'>
+    <function-type size-in-bits='64' id='type-id-1038'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='category'/>
       <!-- parameter of type 'char*' -->
@@ -25781,7 +25781,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1017'>
+    <function-type size-in-bits='64' id='type-id-1039'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='errnum'/>
       <!-- parameter of type 'char*' -->
@@ -25792,7 +25792,7 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, void*, char*, __sanitizer::u32) -->
-    <function-type size-in-bits='64' id='type-id-1018'>
+    <function-type size-in-bits='64' id='type-id-1040'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- parameter of type 'void*' -->
@@ -25805,14 +25805,14 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (unsigned long int*) -->
-    <function-type size-in-bits='64' id='type-id-1019'>
+    <function-type size-in-bits='64' id='type-id-1041'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (unsigned long int*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1020'>
+    <function-type size-in-bits='64' id='type-id-1042'>
       <!-- parameter of type 'unsigned long int*' -->
       <parameter type-id='type-id-137' name='timep'/>
       <!-- parameter of type 'char*' -->
@@ -25821,16 +25821,16 @@ 
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char** (void**, int) -->
-    <function-type size-in-bits='64' id='type-id-1022'>
+    <function-type size-in-bits='64' id='type-id-1044'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='buffer'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size'/>
       <!-- char** -->
-      <return type-id='type-id-1021'/>
+      <return type-id='type-id-1043'/>
     </function-type>
     <!-- const char* (const char*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1045'>
+    <function-type size-in-bits='64' id='type-id-1067'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s1'/>
       <!-- parameter of type 'const char*' -->
@@ -25839,39 +25839,39 @@ 
       <return type-id='type-id-4'/>
     </function-type>
     <!-- double (double) -->
-    <function-type size-in-bits='64' id='type-id-1057'>
+    <function-type size-in-bits='64' id='type-id-1079'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- double -->
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double) -->
-    <function-type size-in-bits='64' id='type-id-1163'>
+    <function-type size-in-bits='64' id='type-id-1185'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- long double -->
       <return type-id='type-id-383'/>
     </function-type>
     <!-- double (double, double*) -->
-    <function-type size-in-bits='64' id='type-id-1058'>
+    <function-type size-in-bits='64' id='type-id-1080'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='iptr'/>
+      <parameter type-id='type-id-1083' name='iptr'/>
       <!-- double -->
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double, long double*) -->
-    <function-type size-in-bits='64' id='type-id-1165'>
+    <function-type size-in-bits='64' id='type-id-1187'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='iptr'/>
+      <parameter type-id='type-id-1189' name='iptr'/>
       <!-- long double -->
       <return type-id='type-id-383'/>
     </function-type>
     <!-- double (double, double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1059'>
+    <function-type size-in-bits='64' id='type-id-1081'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'double' -->
@@ -25882,7 +25882,7 @@ 
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double, long double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1166'>
+    <function-type size-in-bits='64' id='type-id-1188'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'long double' -->
@@ -25893,7 +25893,7 @@ 
       <return type-id='type-id-383'/>
     </function-type>
     <!-- double (double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1060'>
+    <function-type size-in-bits='64' id='type-id-1082'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'int*' -->
@@ -25902,7 +25902,7 @@ 
       <return type-id='type-id-378'/>
     </function-type>
     <!-- long double (long double, int*) -->
-    <function-type size-in-bits='64' id='type-id-1164'>
+    <function-type size-in-bits='64' id='type-id-1186'>
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'int*' -->
@@ -25911,23 +25911,23 @@ 
       <return type-id='type-id-383'/>
     </function-type>
     <!-- float (float) -->
-    <function-type size-in-bits='64' id='type-id-1062'>
+    <function-type size-in-bits='64' id='type-id-1084'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-type>
     <!-- float (float, float*) -->
-    <function-type size-in-bits='64' id='type-id-1063'>
+    <function-type size-in-bits='64' id='type-id-1085'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='iptr'/>
+      <parameter type-id='type-id-1088' name='iptr'/>
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-type>
     <!-- float (float, float, int*) -->
-    <function-type size-in-bits='64' id='type-id-1064'>
+    <function-type size-in-bits='64' id='type-id-1086'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'float' -->
@@ -25938,7 +25938,7 @@ 
       <return type-id='type-id-379'/>
     </function-type>
     <!-- float (float, int*) -->
-    <function-type size-in-bits='64' id='type-id-1065'>
+    <function-type size-in-bits='64' id='type-id-1087'>
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'int*' -->
@@ -25946,30 +25946,25 @@ 
       <!-- float -->
       <return type-id='type-id-379'/>
     </function-type>
-    <!-- int () -->
-    <function-type size-in-bits='64' id='type-id-1067'>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
     <!-- int (__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1068'>
+    <function-type size-in-bits='64' id='type-id-1089'>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
-    <function-type size-in-bits='64' id='type-id-1069'>
+    <function-type size-in-bits='64' id='type-id-1090'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds'/>
+      <parameter type-id='type-id-1008' name='fds'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds'/>
       <!-- parameter of type 'int' -->
@@ -25978,47 +25973,47 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1070'>
+    <function-type size-in-bits='64' id='type-id-1091'>
       <!-- parameter of type '__sanitizer::__sanitizer_pollfd*' -->
-      <parameter type-id='type-id-990' name='fds'/>
+      <parameter type-id='type-id-1008' name='fds'/>
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1228' name='nfds'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='timeout_ts'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='sigmask'/>
+      <parameter type-id='type-id-1009' name='sigmask'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1071'>
+    <function-type size-in-bits='64' id='type-id-1092'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1072'>
+    <function-type size-in-bits='64' id='type-id-1093'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='sig'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1073'>
+    <function-type size-in-bits='64' id='type-id-1094'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1074'>
+    <function-type size-in-bits='64' id='type-id-1095'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='info'/>
       <!-- parameter of type 'void*' -->
@@ -26027,18 +26022,18 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*) -->
-    <function-type size-in-bits='64' id='type-id-1075'>
+    <function-type size-in-bits='64' id='type-id-1099'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (char**, SIZE_T*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1183'>
+    <function-type size-in-bits='64' id='type-id-938'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr'/>
+      <parameter type-id='type-id-1043' name='lineptr'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n'/>
+      <parameter type-id='type-id-937' name='n'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='delim'/>
       <!-- parameter of type 'void*' -->
@@ -26047,22 +26042,22 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (char**, SIZE_T*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1184'>
+    <function-type size-in-bits='64' id='type-id-939'>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='lineptr'/>
+      <parameter type-id='type-id-1043' name='lineptr'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='n'/>
+      <parameter type-id='type-id-937' name='n'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) -->
-    <function-type size-in-bits='64' id='type-id-1076'>
+    <function-type size-in-bits='64' id='type-id-1100'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent***' -->
-      <parameter type-id='type-id-956' name='namelist'/>
+      <parameter type-id='type-id-974' name='namelist'/>
       <!-- parameter of type 'typedef scandir_filter_f' -->
       <parameter type-id='type-id-791' name='filter'/>
       <!-- parameter of type 'typedef scandir_compar_f' -->
@@ -26071,11 +26066,11 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) -->
-    <function-type size-in-bits='64' id='type-id-1077'>
+    <function-type size-in-bits='64' id='type-id-1101'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64***' -->
-      <parameter type-id='type-id-961' name='namelist'/>
+      <parameter type-id='type-id-979' name='namelist'/>
       <!-- parameter of type 'typedef scandir64_filter_f' -->
       <parameter type-id='type-id-785' name='filter'/>
       <!-- parameter of type 'typedef scandir64_compar_f' -->
@@ -26084,74 +26079,74 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_ether_addr*) -->
-    <function-type size-in-bits='64' id='type-id-1078'>
+    <function-type size-in-bits='64' id='type-id-1102'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_ether_addr*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1079'>
+    <function-type size-in-bits='64' id='type-id-1103'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='line'/>
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1080'>
+    <function-type size-in-bits='64' id='type-id-1104'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_wordexp_t*, int) -->
-    <function-type size-in-bits='64' id='type-id-1081'>
+    <function-type size-in-bits='64' id='type-id-1105'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type '__sanitizer::__sanitizer_wordexp_t*' -->
-      <parameter type-id='type-id-997' name='p'/>
+      <parameter type-id='type-id-1015' name='p'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1082'>
+    <function-type size-in-bits='64' id='type-id-1107'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, __sanitizer::u32) -->
-    <function-type size-in-bits='64' id='type-id-1083'>
+    <function-type size-in-bits='64' id='type-id-1106'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='user'/>
       <!-- parameter of type 'typedef __sanitizer::u32' -->
@@ -26160,7 +26155,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1084'>
+    <function-type size-in-bits='64' id='type-id-1108'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- parameter of type 'void*' -->
@@ -26169,64 +26164,72 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent*) -->
-    <function-type size-in-bits='64' id='type-id-1085'>
+    <function-type size-in-bits='64' id='type-id-1109'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent*' -->
-      <parameter type-id='type-id-1036'/>
+      <parameter type-id='type-id-1058'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) -->
-    <function-type size-in-bits='64' id='type-id-1086'>
+    <function-type size-in-bits='64' id='type-id-1110'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-1037'/>
+      <parameter type-id='type-id-1059'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-1037'/>
+      <parameter type-id='type-id-1059'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent64*) -->
-    <function-type size-in-bits='64' id='type-id-1087'>
+    <function-type size-in-bits='64' id='type-id-1111'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64*' -->
-      <parameter type-id='type-id-1039'/>
+      <parameter type-id='type-id-1061'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) -->
-    <function-type size-in-bits='64' id='type-id-1088'>
+    <function-type size-in-bits='64' id='type-id-1112'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-1040'/>
+      <parameter type-id='type-id-1062'/>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-1040'/>
+      <parameter type-id='type-id-1062'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1089'>
+    <function-type size-in-bits='64' id='type-id-1113'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-1044' name='mask'/>
+      <parameter type-id='type-id-1066' name='mask'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*) -->
-    <function-type size-in-bits='64' id='type-id-1090'>
+    <function-type size-in-bits='64' id='type-id-1114'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
+    <!-- int (const char*, ...) -->
+    <function-type size-in-bits='64' id='type-id-1115'>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-4' name='format'/>
+      <parameter is-variadic='yes'/>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
     <!-- INTMAX_T (const char*, char**, int) -->
-    <function-type size-in-bits='64' id='type-id-1174'>
+    <function-type size-in-bits='64' id='type-id-928'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='nptr'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='endptr'/>
+      <parameter type-id='type-id-1043' name='endptr'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='base'/>
       <!-- typedef INTMAX_T -->
       <return type-id='type-id-408'/>
     </function-type>
     <!-- int (const char*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1091'>
+    <function-type size-in-bits='64' id='type-id-1116'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s1'/>
       <!-- parameter of type 'const char*' -->
@@ -26234,19 +26237,29 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
+    <!-- int (const char*, const char*, ...) -->
+    <function-type size-in-bits='64' id='type-id-1117'>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-4' name='str'/>
+      <!-- parameter of type 'const char*' -->
+      <parameter type-id='type-id-4' name='format'/>
+      <parameter is-variadic='yes'/>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
     <!-- int (const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
-    <function-type size-in-bits='64' id='type-id-1093'>
+    <function-type size-in-bits='64' id='type-id-1119'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='str'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, const char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1092'>
+    <function-type size-in-bits='64' id='type-id-1118'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s1'/>
       <!-- parameter of type 'const char*' -->
@@ -26256,18 +26269,8 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (const char*, const char*, ...) -->
-    <function-type size-in-bits='64' id='type-id-1094'>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-4' name='str'/>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
     <!-- int (const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-1095'>
+    <function-type size-in-bits='64' id='type-id-1120'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='name'/>
       <!-- parameter of type 'int' -->
@@ -26276,7 +26279,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-1096'>
+    <function-type size-in-bits='64' id='type-id-1121'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='name'/>
       <!-- parameter of type 'int' -->
@@ -26287,24 +26290,16 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, typedef __va_list_tag __va_list_tag*) -->
-    <function-type size-in-bits='64' id='type-id-1097'>
+    <function-type size-in-bits='64' id='type-id-1122'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap'/>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
-    <!-- int (const char*, ...) -->
-    <function-type size-in-bits='64' id='type-id-1098'>
-      <!-- parameter of type 'const char*' -->
-      <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (const char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1099'>
+    <function-type size-in-bits='64' id='type-id-1123'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='cp'/>
       <!-- parameter of type 'void*' -->
@@ -26313,28 +26308,28 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int) -->
-    <function-type size-in-bits='64' id='type-id-1100'>
+    <function-type size-in-bits='64' id='type-id-1124'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (long_t) -->
-    <function-type size-in-bits='64' id='type-id-1132'>
+    <function-type size-in-bits='64' id='type-id-1153'>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-612' name='usec'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int*) -->
-    <function-type size-in-bits='64' id='type-id-1101'>
+    <function-type size-in-bits='64' id='type-id-1125'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='status'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int*, int) -->
-    <function-type size-in-bits='64' id='type-id-1102'>
+    <function-type size-in-bits='64' id='type-id-1126'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='pipefd'/>
       <!-- parameter of type 'int' -->
@@ -26343,7 +26338,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1103'>
+    <function-type size-in-bits='64' id='type-id-1127'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='status'/>
       <!-- parameter of type 'int' -->
@@ -26354,22 +26349,22 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int) -->
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-940'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov'/>
+      <parameter type-id='type-id-997' name='iov'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-1186'>
+    <function-type size-in-bits='64' id='type-id-941'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
-      <parameter type-id='type-id-979' name='iov'/>
+      <parameter type-id='type-id-997' name='iov'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='iovcnt'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -26378,29 +26373,29 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int) -->
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-942'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
-      <parameter type-id='type-id-986' name='msg'/>
+      <parameter type-id='type-id-1004' name='msg'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='flags'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
-    <function-type size-in-bits='64' id='type-id-1104'>
+    <function-type size-in-bits='64' id='type-id-1129'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='how'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='set'/>
+      <parameter type-id='type-id-1009' name='set'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
-      <parameter type-id='type-id-991' name='oldset'/>
+      <parameter type-id='type-id-1009' name='oldset'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1106'>
+    <function-type size-in-bits='64' id='type-id-1131'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='errnum'/>
       <!-- parameter of type 'char*' -->
@@ -26411,7 +26406,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, const char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1107'>
+    <function-type size-in-bits='64' id='type-id-1132'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='af'/>
       <!-- parameter of type 'const char*' -->
@@ -26422,7 +26417,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int) -->
-    <function-type size-in-bits='64' id='type-id-1108'>
+    <function-type size-in-bits='64' id='type-id-1133'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- parameter of type 'int' -->
@@ -26431,7 +26426,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int*, int) -->
-    <function-type size-in-bits='64' id='type-id-1109'>
+    <function-type size-in-bits='64' id='type-id-1134'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='pid'/>
       <!-- parameter of type 'int*' -->
@@ -26442,7 +26437,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int*, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1110'>
+    <function-type size-in-bits='64' id='type-id-1135'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='pid'/>
       <!-- parameter of type 'int*' -->
@@ -26455,7 +26450,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int) -->
-    <function-type size-in-bits='64' id='type-id-1111'>
+    <function-type size-in-bits='64' id='type-id-1136'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='domain'/>
       <!-- parameter of type 'int' -->
@@ -26466,7 +26461,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int, int*) -->
-    <function-type size-in-bits='64' id='type-id-1112'>
+    <function-type size-in-bits='64' id='type-id-1137'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='domain'/>
       <!-- parameter of type 'int' -->
@@ -26479,7 +26474,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1113'>
+    <function-type size-in-bits='64' id='type-id-1138'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='epfd'/>
       <!-- parameter of type 'int' -->
@@ -26492,7 +26487,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, int, void*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1114'>
+    <function-type size-in-bits='64' id='type-id-1139'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sockfd'/>
       <!-- parameter of type 'int' -->
@@ -26507,7 +26502,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1115'>
+    <function-type size-in-bits='64' id='type-id-1140'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='shmid'/>
       <!-- parameter of type 'int' -->
@@ -26518,7 +26513,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1116'>
+    <function-type size-in-bits='64' id='type-id-1141'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='idtype'/>
       <!-- parameter of type 'int' -->
@@ -26531,27 +26526,27 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, sigaction_t*, sigaction_t*) -->
-    <function-type size-in-bits='64' id='type-id-1117'>
+    <function-type size-in-bits='64' id='type-id-1142'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sig'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='act'/>
+      <parameter type-id='type-id-1197' name='act'/>
       <!-- parameter of type 'sigaction_t*' -->
-      <parameter type-id='type-id-1173' name='old'/>
+      <parameter type-id='type-id-1197' name='old'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, __sanitizer::u32*) -->
-    <function-type size-in-bits='64' id='type-id-1105'>
+    <function-type size-in-bits='64' id='type-id-1130'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='size'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='lst'/>
+      <parameter type-id='type-id-1019' name='lst'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
-    <function-type size-in-bits='64' id='type-id-1120'>
+    <function-type size-in-bits='64' id='type-id-1144'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='option'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -26566,7 +26561,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1118'>
+    <function-type size-in-bits='64' id='type-id-1128'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='pid'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -26577,7 +26572,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, unsigned int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1119'>
+    <function-type size-in-bits='64' id='type-id-1143'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='d'/>
       <!-- parameter of type 'unsigned int' -->
@@ -26588,7 +26583,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1121'>
+    <function-type size-in-bits='64' id='type-id-1145'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26597,7 +26592,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1122'>
+    <function-type size-in-bits='64' id='type-id-1146'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26608,7 +26603,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- long_t (int, void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1197'>
+    <function-type size-in-bits='64' id='type-id-1191'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26619,7 +26614,7 @@ 
       <return type-id='type-id-612'/>
     </function-type>
     <!-- int (int, void*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1123'>
+    <function-type size-in-bits='64' id='type-id-1147'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sock_fd'/>
       <!-- parameter of type 'void*' -->
@@ -26630,7 +26625,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-1124'>
+    <function-type size-in-bits='64' id='type-id-1148'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='epfd'/>
       <!-- parameter of type 'void*' -->
@@ -26643,7 +26638,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- long_t (int, void*, long_t, int) -->
-    <function-type size-in-bits='64' id='type-id-1198'>
+    <function-type size-in-bits='64' id='type-id-1192'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26656,7 +26651,7 @@ 
       <return type-id='type-id-612'/>
     </function-type>
     <!-- int (int, void*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1125'>
+    <function-type size-in-bits='64' id='type-id-1149'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26667,7 +26662,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1189'>
+    <function-type size-in-bits='64' id='type-id-944'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26678,7 +26673,7 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (int, void*, unsigned int*) -->
-    <function-type size-in-bits='64' id='type-id-1126'>
+    <function-type size-in-bits='64' id='type-id-1150'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='sockfd'/>
       <!-- parameter of type 'void*' -->
@@ -26689,7 +26684,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (int, void*, unsigned int*, int) -->
-    <function-type size-in-bits='64' id='type-id-1127'>
+    <function-type size-in-bits='64' id='type-id-1151'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26702,7 +26697,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SSIZE_T (int, void*, OFF64_T, OFF64_T) -->
-    <function-type size-in-bits='64' id='type-id-1188'>
+    <function-type size-in-bits='64' id='type-id-943'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26715,7 +26710,7 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- SSIZE_T (int, void*, SIZE_T, OFF_T) -->
-    <function-type size-in-bits='64' id='type-id-1190'>
+    <function-type size-in-bits='64' id='type-id-945'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='fd'/>
       <!-- parameter of type 'void*' -->
@@ -26728,7 +26723,7 @@ 
       <return type-id='type-id-414'/>
     </function-type>
     <!-- int (int, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1128'>
+    <function-type size-in-bits='64' id='type-id-1152'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='which'/>
       <!-- parameter of type 'void*' -->
@@ -26739,7 +26734,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::uptr, const char*) -->
-    <function-type size-in-bits='64' id='type-id-1130'>
+    <function-type size-in-bits='64' id='type-id-1097'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='thread'/>
       <!-- parameter of type 'const char*' -->
@@ -26748,7 +26743,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (unsigned int, int) -->
-    <function-type size-in-bits='64' id='type-id-1133'>
+    <function-type size-in-bits='64' id='type-id-1154'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-172' name='initval'/>
       <!-- parameter of type 'int' -->
@@ -26757,7 +26752,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::uptr, int*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1131'>
+    <function-type size-in-bits='64' id='type-id-1098'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='thread'/>
       <!-- parameter of type 'int*' -->
@@ -26768,7 +26763,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (__sanitizer::u32, void*) -->
-    <function-type size-in-bits='64' id='type-id-1129'>
+    <function-type size-in-bits='64' id='type-id-1096'>
       <!-- parameter of type 'typedef __sanitizer::u32' -->
       <parameter type-id='type-id-237' name='clk_id'/>
       <!-- parameter of type 'void*' -->
@@ -26776,25 +26771,25 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void ()*) -->
-    <function-type size-in-bits='64' id='type-id-1134'>
-      <!-- parameter of type 'void ()*' -->
-      <parameter type-id='type-id-144' name='f'/>
-      <!-- int -->
-      <return type-id='type-id-6'/>
-    </function-type>
-    <!-- int (void (int, void*)*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1135'>
-      <!-- parameter of type 'void (int, void*)*' -->
+    <!-- int (void (*)(int, void*), void*) -->
+    <function-type size-in-bits='64' id='type-id-1155'>
+      <!-- parameter of type 'void (*)(int, void*)' -->
       <parameter type-id='type-id-1207' name='f'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void (void*)*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1136'>
-      <!-- parameter of type 'void (void*)*' -->
+    <!-- int (void (*)(void)) -->
+    <function-type size-in-bits='64' id='type-id-1156'>
+      <!-- parameter of type 'void (*)(void)' -->
+      <parameter type-id='type-id-144' name='f'/>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
+    <!-- int (void (*)(void*), void*, void*) -->
+    <function-type size-in-bits='64' id='type-id-1157'>
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-469' name='f'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='arg'/>
@@ -26803,15 +26798,20 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
+    <!-- int () -->
+    <function-type size-in-bits='64' id='type-id-1158'>
+      <!-- int -->
+      <return type-id='type-id-6'/>
+    </function-type>
     <!-- __sanitizer::__sanitizer_clock_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-1191'>
+    <function-type size-in-bits='64' id='type-id-969'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tms'/>
       <!-- typedef __sanitizer::__sanitizer_clock_t -->
       <return type-id='type-id-1229'/>
     </function-type>
     <!-- int (void**, int) -->
-    <function-type size-in-bits='64' id='type-id-1137'>
+    <function-type size-in-bits='64' id='type-id-1160'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='buffer'/>
       <!-- parameter of type 'int' -->
@@ -26820,7 +26820,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void**, __sanitizer::uptr, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1138'>
+    <function-type size-in-bits='64' id='type-id-1159'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='memptr'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -26831,59 +26831,59 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
-    <function-type size-in-bits='64' id='type-id-1139'>
+    <function-type size-in-bits='64' id='type-id-1162'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent*' -->
-      <parameter type-id='type-id-953' name='entry'/>
+      <parameter type-id='type-id-971' name='entry'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent**' -->
-      <parameter type-id='type-id-955' name='result'/>
+      <parameter type-id='type-id-973' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
-    <function-type size-in-bits='64' id='type-id-1140'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dirp'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64*' -->
-      <parameter type-id='type-id-958' name='entry'/>
+      <parameter type-id='type-id-976' name='entry'/>
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64**' -->
-      <parameter type-id='type-id-960' name='result'/>
+      <parameter type-id='type-id-978' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*) -->
-    <function-type size-in-bits='64' id='type-id-1142'>
+    <!-- int (void*, const char*, ...) -->
+    <function-type size-in-bits='64' id='type-id-1166'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
-      <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
-      <parameter type-id='type-id-1196' name='ap'/>
+      <parameter is-variadic='yes'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, const char*, ...) -->
-    <function-type size-in-bits='64' id='type-id-1143'>
+    <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*) -->
+    <function-type size-in-bits='64' id='type-id-1167'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='stream'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
+      <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
+      <parameter type-id='type-id-1199' name='ap'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, double*) -->
-    <function-type size-in-bits='64' id='type-id-1144'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='result'/>
+      <parameter type-id='type-id-1083' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int) -->
-    <function-type size-in-bits='64' id='type-id-1145'>
+    <function-type size-in-bits='64' id='type-id-1169'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='tid'/>
       <!-- parameter of type 'int' -->
@@ -26892,7 +26892,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, long_t) -->
-    <function-type size-in-bits='64' id='type-id-1152'>
+    <function-type size-in-bits='64' id='type-id-1174'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'typedef long_t' -->
@@ -26901,7 +26901,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int*) -->
-    <function-type size-in-bits='64' id='type-id-1146'>
+    <function-type size-in-bits='64' id='type-id-1170'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='s'/>
       <!-- parameter of type 'int*' -->
@@ -26910,16 +26910,16 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, long int*) -->
-    <function-type size-in-bits='64' id='type-id-1149'>
+    <function-type size-in-bits='64' id='type-id-1173'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer'/>
       <!-- parameter of type 'long int*' -->
-      <parameter type-id='type-id-1168' name='result'/>
+      <parameter type-id='type-id-1190' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1147'>
+    <function-type size-in-bits='64' id='type-id-1171'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'int' -->
@@ -26927,20 +26927,20 @@ 
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='buflen'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent**' -->
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-35' name='h_errnop'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1148'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='s'/>
       <!-- parameter of type 'int' -->
@@ -26951,16 +26951,16 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::u32*) -->
-    <function-type size-in-bits='64' id='type-id-1141'>
+    <function-type size-in-bits='64' id='type-id-1164'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buf'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='result'/>
+      <parameter type-id='type-id-1019' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1165'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -26969,7 +26969,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1150'>
+    <function-type size-in-bits='64' id='type-id-1161'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -26979,17 +26979,17 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, void ()*) -->
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <!-- int (void*, void (*)(void)) -->
+    <function-type size-in-bits='64' id='type-id-1175'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='o'/>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-144' name='f'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void**) -->
-    <function-type size-in-bits='64' id='type-id-1154'>
+    <function-type size-in-bits='64' id='type-id-1176'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='th'/>
       <!-- parameter of type 'void**' -->
@@ -26998,18 +26998,18 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void**, SIZE_T*) -->
-    <function-type size-in-bits='64' id='type-id-1155'>
+    <function-type size-in-bits='64' id='type-id-1177'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='addr'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='size'/>
+      <parameter type-id='type-id-937' name='size'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1156'>
+    <function-type size-in-bits='64' id='type-id-1178'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='s1'/>
       <!-- parameter of type 'void*' -->
@@ -27020,7 +27020,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1157'>
+    <function-type size-in-bits='64' id='type-id-1179'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='b'/>
       <!-- parameter of type 'void*' -->
@@ -27030,13 +27030,13 @@ 
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, void*, void* (void*)*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1158'>
+    <!-- int (void*, void*, void* (*)(void*), void*) -->
+    <function-type size-in-bits='64' id='type-id-1180'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='th'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr'/>
-      <!-- parameter of type 'void* (void*)*' -->
+      <!-- parameter of type 'void* (*)(void*)' -->
       <parameter type-id='type-id-1218' name='callback'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='param'/>
@@ -27044,7 +27044,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1159'>
+    <function-type size-in-bits='64' id='type-id-1181'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='c'/>
       <!-- parameter of type 'void*' -->
@@ -27055,7 +27055,7 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1160'>
+    <function-type size-in-bits='64' id='type-id-1182'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='node'/>
       <!-- parameter of type 'void*' -->
@@ -27068,11 +27068,11 @@ 
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SIZE_T (char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1175'>
+    <function-type size-in-bits='64' id='type-id-929'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src'/>
+      <parameter type-id='type-id-1078' name='src'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='nms'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -27083,11 +27083,11 @@ 
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (char*, const wchar_t**, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1176'>
+    <function-type size-in-bits='64' id='type-id-930'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src'/>
+      <parameter type-id='type-id-1078' name='src'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len'/>
       <!-- parameter of type 'void*' -->
@@ -27096,18 +27096,18 @@ 
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (char*, const wchar_t*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1177'>
+    <function-type size-in-bits='64' id='type-id-931'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-1055' name='src'/>
+      <parameter type-id='type-id-1077' name='src'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len'/>
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1178'>
+    <function-type size-in-bits='64' id='type-id-932'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='name'/>
       <!-- parameter of type 'char*' -->
@@ -27118,7 +27118,7 @@ 
       <return type-id='type-id-412'/>
     </function-type>
     <!-- __sanitizer::uptr (int, int, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1193'>
+    <function-type size-in-bits='64' id='type-id-1021'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='request'/>
       <!-- parameter of type 'int' -->
@@ -27145,29 +27145,29 @@ 
       <return type-id='type-id-1'/>
     </function-type>
     <!-- __sanitizer::uptr (void*) -->
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1022'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='p'/>
       <!-- typedef __sanitizer::uptr -->
       <return type-id='type-id-2'/>
     </function-type>
     <!-- SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*) -->
-    <function-type size-in-bits='64' id='type-id-1179'>
+    <function-type size-in-bits='64' id='type-id-933'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='cd'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='inbuf'/>
+      <parameter type-id='type-id-1043' name='inbuf'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='inbytesleft'/>
+      <parameter type-id='type-id-937' name='inbytesleft'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='outbuf'/>
+      <parameter type-id='type-id-1043' name='outbuf'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='outbytesleft'/>
+      <parameter type-id='type-id-937' name='outbytesleft'/>
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-type>
     <!-- __sanitizer::uptr (void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
-    <function-type size-in-bits='64' id='type-id-1195'>
+    <function-type size-in-bits='64' id='type-id-1023'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='p'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -27180,7 +27180,7 @@ 
       <return type-id='type-id-2'/>
     </function-type>
     <!-- SIZE_T (wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1180'>
+    <function-type size-in-bits='64' id='type-id-934'>
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1225' name='dest'/>
       <!-- parameter of type 'const char**' -->
@@ -27195,7 +27195,7 @@ 
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (wchar_t*, const char**, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1181'>
+    <function-type size-in-bits='64' id='type-id-935'>
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1225' name='dest'/>
       <!-- parameter of type 'const char**' -->
@@ -27208,7 +27208,7 @@ 
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (wchar_t*, const char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1182'>
+    <function-type size-in-bits='64' id='type-id-936'>
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1225' name='dest'/>
       <!-- parameter of type 'const char*' -->
@@ -27218,14 +27218,23 @@ 
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-type>
+    <!-- sighandler_t (int, sighandler_t) -->
+    <function-type size-in-bits='64' id='type-id-1198'>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-6' name='sig'/>
+      <!-- parameter of type 'typedef sighandler_t' -->
+      <parameter type-id='type-id-402' name='h'/>
+      <!-- typedef sighandler_t -->
+      <return type-id='type-id-402'/>
+    </function-type>
     <!-- void (double, double*, double*) -->
     <function-type size-in-bits='64' id='type-id-1203'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='sin'/>
+      <parameter type-id='type-id-1083' name='sin'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='cos'/>
+      <parameter type-id='type-id-1083' name='cos'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
@@ -27234,9 +27243,9 @@ 
       <!-- parameter of type 'long double' -->
       <parameter type-id='type-id-383' name='x'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='sin'/>
+      <parameter type-id='type-id-1189' name='sin'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='cos'/>
+      <parameter type-id='type-id-1189' name='cos'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
@@ -27245,27 +27254,18 @@ 
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='sin'/>
+      <parameter type-id='type-id-1088' name='sin'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='cos'/>
+      <parameter type-id='type-id-1088' name='cos'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
-    <!-- sighandler_t (int, sighandler_t) -->
-    <function-type size-in-bits='64' id='type-id-1199'>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-6' name='sig'/>
-      <!-- parameter of type 'typedef sighandler_t' -->
-      <parameter type-id='type-id-402' name='h'/>
-      <!-- typedef sighandler_t -->
-      <return type-id='type-id-402'/>
-    </function-type>
     <!-- void (int, my_siginfo_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-1205'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- parameter of type 'my_siginfo_t*' -->
-      <parameter type-id='type-id-1169'/>
+      <parameter type-id='type-id-1193'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- void -->
@@ -27299,14 +27299,14 @@ 
       <return type-id='type-id-27'/>
     </function-type>
     <!-- void* (char*) -->
-    <function-type size-in-bits='64' id='type-id-1210'>
+    <function-type size-in-bits='64' id='type-id-1212'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- void* -->
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (char*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1211'>
+    <function-type size-in-bits='64' id='type-id-1213'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- parameter of type 'char*' -->
@@ -27315,7 +27315,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (char*, char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1212'>
+    <function-type size-in-bits='64' id='type-id-1214'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- parameter of type 'char*' -->
@@ -27326,7 +27326,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (char*, int, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1213'>
+    <function-type size-in-bits='64' id='type-id-1215'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'int' -->
@@ -27337,7 +27337,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-1214'>
+    <function-type size-in-bits='64' id='type-id-1216'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='filename'/>
       <!-- parameter of type 'int' -->
@@ -27346,7 +27346,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (__sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1215'>
+    <function-type size-in-bits='64' id='type-id-1210'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='sz'/>
       <!-- void* -->
@@ -27394,7 +27394,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (void*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1219'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='p'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -27403,14 +27403,14 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- char* (const char*) -->
-    <function-type size-in-bits='64' id='type-id-1013'>
+    <function-type size-in-bits='64' id='type-id-1035'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='str'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- __sanitizer::uptr (const char*) -->
-    <function-type size-in-bits='64' id='type-id-1192'>
+    <function-type size-in-bits='64' id='type-id-1020'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s'/>
       <!-- typedef __sanitizer::uptr -->
@@ -27424,7 +27424,7 @@ 
       <return type-id='type-id-27'/>
     </function-type>
     <!-- void* (__sanitizer::uptr, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1216'>
+    <function-type size-in-bits='64' id='type-id-1211'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='align'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -27433,7 +27433,7 @@ 
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (void*, int, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1219'>
+    <function-type size-in-bits='64' id='type-id-1220'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dst'/>
       <!-- parameter of type 'int' -->
@@ -28537,10 +28537,10 @@ 
     <!-- __sanitizer::StaticSpinMutex* -->
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-1357'/>
     <!-- __sanitizer::Suppression* -->
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-935'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-952'/>
     <!-- __sanitizer::ThreadContextBase* -->
     <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1240'/>
-    <!-- __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* -->
+    <!-- __sanitizer::ThreadContextBase* (*)(__sanitizer::u32) -->
     <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-332'/>
     <!-- __sanitizer::ThreadContextBase** -->
     <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-1359'/>
@@ -28612,7 +28612,7 @@ 
     <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-1406'/>
     <!-- a8* -->
     <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1407'/>
-    <!-- bool (__sanitizer::ThreadContextBase*, void*)* -->
+    <!-- bool (*)(__sanitizer::ThreadContextBase*, void*) -->
     <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-1409'/>
     <!-- char* -->
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-28'/>
@@ -28754,9 +28754,9 @@ 
     <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
     <!-- const volatile void -->
     <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
-    <!-- void (__sanitizer::ThreadContextBase*, void*)* -->
+    <!-- void (*)(__sanitizer::ThreadContextBase*, void*) -->
     <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1482'/>
-    <!-- void (typedef __sanitizer::uptr, void*)* -->
+    <!-- void (*)(__sanitizer::uptr, void*) -->
     <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-96'/>
     <!-- volatile __sanitizer::atomic_uint64_t::Type -->
     <qualified-type-def type-id='type-id-104' volatile='yes' id='type-id-1484'/>
@@ -30011,11 +30011,11 @@ 
       <!-- class __sanitizer::ThreadRegistry -->
       <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-1360'>
         <member-type access='public'>
-          <!-- typedef bool (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::FindThreadCallback -->
+          <!-- typedef bool (*)(__sanitizer::ThreadContextBase*, void*) __sanitizer::ThreadRegistry::FindThreadCallback -->
           <typedef-decl name='FindThreadCallback' type-id='type-id-1409' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='99' column='1' id='type-id-1496'/>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::ThreadCallback -->
+          <!-- typedef void (*)(__sanitizer::ThreadContextBase*, void*) __sanitizer::ThreadRegistry::ThreadCallback -->
           <typedef-decl name='ThreadCallback' type-id='type-id-1482' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-1497'/>
         </member-type>
         <data-member access='public' static='yes'>
@@ -30997,7 +30997,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct __sanitizer::Suppression -->
-      <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-933'>
+      <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-950'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::SuppressionType __sanitizer::Suppression::type -->
           <var-decl name='type' type-id='type-id-195' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='31' column='1'/>
@@ -31048,11 +31048,11 @@ 
           <var-decl name='val_dont_use' type-id='type-id-1486' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='50' column='1'/>
         </data-member>
       </class-decl>
-      <!-- typedef void (typedef __sanitizer::uptr, void*)* __sanitizer::ForEachChunkCallback -->
+      <!-- typedef void (*)(__sanitizer::uptr, void*) __sanitizer::ForEachChunkCallback -->
       <typedef-decl name='ForEachChunkCallback' type-id='type-id-96' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='284' column='1' id='type-id-97'/>
       <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > __sanitizer::InternalAllocatorCache -->
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-98' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-99'/>
-      <!-- typedef __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* __sanitizer::ThreadContextFactory -->
+      <!-- typedef __sanitizer::ThreadContextBase* (*)(__sanitizer::u32) __sanitizer::ThreadContextFactory -->
       <typedef-decl name='ThreadContextFactory' type-id='type-id-332' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-333'/>
       <!-- typedef unsigned int __sanitizer::u32 -->
       <typedef-decl name='u32' type-id='type-id-172' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='68' column='1' id='type-id-237'/>
@@ -33500,7 +33500,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::Suppression* __tsan::FiredSuppression::supp -->
-          <var-decl name='supp' type-id='type-id-935' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
+          <var-decl name='supp' type-id='type-id-952' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __tsan::Flags -->
@@ -36919,10 +36919,10 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1571'/>
     <!-- rlimit* -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-267'/>
-    <!-- void (const __sanitizer::SuspendedThreadsList&, void*)* -->
-    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-312'/>
-    <!-- void (typedef __sanitizer::uptr, typedef __sanitizer::uptr, bool, __sanitizer::uptr*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-239'/>
+    <!-- void (*)(__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-239'/>
+    <!-- void (*)(const __sanitizer::SuspendedThreadsList&, void*) -->
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-312'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::InternalMmapVector<int> -->
@@ -37221,11 +37221,11 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- typedef void (const __sanitizer::SuspendedThreadsList&, void*)* __sanitizer::StopTheWorldCallback -->
+      <!-- typedef void (*)(const __sanitizer::SuspendedThreadsList&, void*) __sanitizer::StopTheWorldCallback -->
       <typedef-decl name='StopTheWorldCallback' type-id='type-id-312' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='54' column='1' id='type-id-310'/>
       <!-- typedef int __sanitizer::SuspendedThreadID -->
       <typedef-decl name='SuspendedThreadID' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='19' column='1' id='type-id-308'/>
-      <!-- typedef void (typedef __sanitizer::uptr, typedef __sanitizer::uptr, bool, __sanitizer::uptr*, typedef __sanitizer::uptr)* __sanitizer::fill_profile_f -->
+      <!-- typedef void (*)(__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) __sanitizer::fill_profile_f -->
       <typedef-decl name='fill_profile_f' type-id='type-id-239' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_procmaps.h' line='119' column='1' id='type-id-240'/>
       <!-- unsigned long int __sanitizer::Min<long unsigned int>(unsigned long int, unsigned long int) -->
       <function-decl name='Min&lt;long unsigned int&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -37315,7 +37315,7 @@ 
       </function-decl>
     </namespace-decl>
     <!-- void (const __sanitizer::SuspendedThreadsList&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1572'>
+    <function-type size-in-bits='64' id='type-id-1573'>
       <!-- parameter of type 'const __sanitizer::SuspendedThreadsList&' -->
       <parameter type-id='type-id-1568'/>
       <!-- parameter of type 'void*' -->
@@ -37324,7 +37324,7 @@ 
       <return type-id='type-id-27'/>
     </function-type>
     <!-- void (__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1573'>
+    <function-type size-in-bits='64' id='type-id-1572'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -39014,9 +39014,9 @@ 
     <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1671'/>
     <!-- const volatile __sanitizer::atomic_uint8_t* -->
     <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-105'/>
-    <!-- void (const char*, int, const char*, typedef __sanitizer::u64, typedef __sanitizer::u64)* -->
-    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-157'/>
-    <!-- void (void*)* -->
+    <!-- void (*)(const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) -->
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-157'/>
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-469'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-258'/>
@@ -39942,7 +39942,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- typedef void (const char*, int, const char*, typedef __sanitizer::u64, typedef __sanitizer::u64)* __sanitizer::CheckFailedCallbackType -->
+      <!-- typedef void (*)(const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) __sanitizer::CheckFailedCallbackType -->
       <typedef-decl name='CheckFailedCallbackType' type-id='type-id-157' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='205' column='1' id='type-id-158'/>
       <!-- typedef int __sanitizer::fd_t -->
       <typedef-decl name='fd_t' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='74' column='1' id='type-id-156'/>
@@ -42720,13 +42720,13 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::Suppression* const -->
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1722'/>
     <!-- __sanitizer::Suppression* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-194'/>
     <!-- __sanitizer::Suppression* const* -->
     <pointer-type-def type-id='type-id-1722' size-in-bits='64' id='type-id-1723'/>
     <!-- __sanitizer::Suppression*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-193'/>
+    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-193'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*> -->
     <qualified-type-def type-id='type-id-188' const='yes' id='type-id-1724'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*>& -->
@@ -43277,7 +43277,7 @@ 
     <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1738'/>
     <!-- dl_phdr_info* -->
     <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-38'/>
-    <!-- int (dl_phdr_info*, typedef size_t, void*)* -->
+    <!-- int (*)(dl_phdr_info*, size_t, void*) -->
     <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-36'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -43290,7 +43290,7 @@ 
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021'/>
+      <parameter type-id='type-id-1043'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- long int -->
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index d27999c0..98d5282e 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -973,7 +973,7 @@ 
     <typedef-decl name='hb_blob_t' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.h' line='65' column='1' id='type-id-43'/>
     <!-- typedef int hb_bool_t -->
     <typedef-decl name='hb_bool_t' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='73' column='1' id='type-id-40'/>
-    <!-- typedef void (void*)* hb_destroy_func_t -->
+    <!-- typedef void(*)(void*) hb_destroy_func_t -->
     <typedef-decl name='hb_destroy_func_t' type-id='type-id-44' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='339' column='1' id='type-id-20'/>
     <!-- typedef pthread_mutex_t hb_mutex_impl_t -->
     <typedef-decl name='hb_mutex_impl_t' type-id='type-id-45' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-mutex-private.hh' line='59' column='1' id='type-id-29'/>
@@ -1085,7 +1085,7 @@ 
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-26'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-60'/>
-    <!-- void (void*)* -->
+    <!-- void(*)(void*) -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-44'/>
     <!-- hb_blob_t* hb_blob_create(const char*, unsigned int, hb_memory_mode_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_blob_create' mangled-name='hb_blob_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_blob_create'>
@@ -2395,23 +2395,23 @@ 
     <typedef-decl name='hb_position_t' type-id='type-id-126' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-103'/>
     <!-- typedef hb_segment_properties_t hb_segment_properties_t -->
     <typedef-decl name='hb_segment_properties_t' type-id='type-id-104' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-85'/>
-    <!-- typedef enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_combining_class_func_t -->
+    <!-- typedef hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_combining_class_func_t -->
     <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-127' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-109'/>
-    <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_compose_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_compose_func_t -->
     <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-128' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-114'/>
-    <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_decompose_compatibility_func_t -->
+    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_decompose_compatibility_func_t -->
     <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-129' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-116'/>
-    <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* hb_unicode_decompose_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) hb_unicode_decompose_func_t -->
     <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-130' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-115'/>
-    <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_eastasian_width_func_t -->
+    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_eastasian_width_func_t -->
     <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-110'/>
     <!-- typedef hb_unicode_funcs_t hb_unicode_funcs_t -->
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-132'/>
-    <!-- typedef enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_general_category_func_t -->
+    <!-- typedef hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_general_category_func_t -->
     <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-133' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-111'/>
-    <!-- typedef typedef hb_codepoint_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_mirroring_func_t -->
+    <!-- typedef hb_codepoint_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_mirroring_func_t -->
     <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-112'/>
-    <!-- typedef enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_script_func_t -->
+    <!-- typedef hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_script_func_t -->
     <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-113'/>
     <!-- typedef _hb_var_int_t hb_var_int_t -->
     <typedef-decl name='hb_var_int_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-101'/>
@@ -2502,22 +2502,20 @@ 
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
     <!-- const unsigned int -->
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-89'/>
-    <!-- enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-134'/>
-    <!-- enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-127'/>
-    <!-- enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-133'/>
+    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-130'/>
+    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-128'/>
     <!-- hb_buffer_t* -->
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-91'/>
     <!-- hb_buffer_t* -->
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-152'/>
     <!-- hb_buffer_t::scratch_buffer_t* -->
     <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-93'/>
     <!-- hb_codepoint_t* -->
     <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-119'/>
     <!-- hb_font_t* -->
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-153'/>
     <!-- hb_glyph_info_t& -->
     <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-96'/>
     <!-- hb_glyph_info_t* -->
@@ -2526,17 +2524,19 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-124' size-in-bits='64' id='type-id-98'/>
     <!-- hb_glyph_position_t* -->
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-87'/>
+    <!-- hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-134'/>
+    <!-- hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-127'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-118'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-84'/>
-    <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-130'/>
-    <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-128'/>
-    <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
+    <!-- hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-133'/>
+    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-129'/>
-    <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
+    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-131'/>
     <!-- struct hb_font_t -->
     <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-121'>
@@ -3055,7 +3055,7 @@ 
     <!-- unsigned int hb_buffer_serialize_glyphs(hb_buffer_t*, unsigned int, unsigned int, char*, unsigned int, unsigned int*, hb_font_t*, hb_buffer_serialize_format_t, hb_buffer_serialize_flags_t) -->
     <function-decl name='hb_buffer_serialize_glyphs' mangled-name='hb_buffer_serialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='start' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='247' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3067,7 +3067,7 @@ 
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='buf_consumed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='251' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
       <parameter type-id='type-id-67' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_flags_t' -->
@@ -3078,7 +3078,7 @@ 
     <!-- hb_bool_t hb_buffer_deserialize_glyphs(hb_buffer_t*, const char*, int, const char**, hb_font_t*, hb_buffer_serialize_format_t) -->
     <function-decl name='hb_buffer_deserialize_glyphs' mangled-name='hb_buffer_deserialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_deserialize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='354' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3086,14 +3086,14 @@ 
       <!-- parameter of type 'const char**' -->
       <parameter type-id='type-id-142' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
       <parameter type-id='type-id-67' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- hb_script_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-150'>
+    <function-type size-in-bits='64' id='type-id-154'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3104,7 +3104,7 @@ 
       <return type-id='type-id-69'/>
     </function-type>
     <!-- hb_unicode_combining_class_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-151'>
+    <function-type size-in-bits='64' id='type-id-155'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3115,7 +3115,7 @@ 
       <return type-id='type-id-70'/>
     </function-type>
     <!-- hb_unicode_general_category_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-152'>
+    <function-type size-in-bits='64' id='type-id-156'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3126,7 +3126,7 @@ 
       <return type-id='type-id-71'/>
     </function-type>
     <!-- hb_bool_t (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-155'>
+    <function-type size-in-bits='64' id='type-id-150'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3141,7 +3141,7 @@ 
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-156'>
+    <function-type size-in-bits='64' id='type-id-151'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3344,31 +3344,31 @@ 
     <!-- hb_buffer_t* hb_buffer_create() -->
     <function-decl name='hb_buffer_create' mangled-name='hb_buffer_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_create'>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <!-- hb_buffer_t* hb_buffer_get_empty() -->
     <function-decl name='hb_buffer_get_empty' mangled-name='hb_buffer_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_empty'>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <!-- hb_buffer_t* hb_buffer_reference(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reference' mangled-name='hb_buffer_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reference'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <!-- void hb_buffer_destroy(hb_buffer_t*) -->
     <function-decl name='hb_buffer_destroy' mangled-name='hb_buffer_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_destroy'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_buffer_set_user_data(hb_buffer_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_buffer_set_user_data' mangled-name='hb_buffer_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_user_data'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='773' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -3383,7 +3383,7 @@ 
     <!-- void* hb_buffer_get_user_data(hb_buffer_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_buffer_get_user_data' mangled-name='hb_buffer_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_user_data'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='794' column='1'/>
       <!-- void* -->
@@ -3392,7 +3392,7 @@ 
     <!-- void hb_buffer_set_content_type(hb_buffer_t*, hb_buffer_content_type_t) -->
     <function-decl name='hb_buffer_set_content_type' mangled-name='hb_buffer_set_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_content_type'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
       <!-- parameter of type 'enum hb_buffer_content_type_t' -->
       <parameter type-id='type-id-64' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
       <!-- void -->
@@ -3401,14 +3401,14 @@ 
     <!-- hb_buffer_content_type_t hb_buffer_get_content_type(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_content_type' mangled-name='hb_buffer_get_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_content_type'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
       <!-- enum hb_buffer_content_type_t -->
       <return type-id='type-id-64'/>
     </function-decl>
     <!-- void hb_buffer_set_unicode_funcs(hb_buffer_t*, hb_unicode_funcs_t*) -->
     <function-decl name='hb_buffer_set_unicode_funcs' mangled-name='hb_buffer_set_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_unicode_funcs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
       <!-- void -->
@@ -3417,14 +3417,14 @@ 
     <!-- hb_unicode_funcs_t* hb_buffer_get_unicode_funcs(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_unicode_funcs' mangled-name='hb_buffer_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_unicode_funcs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
       <!-- hb_unicode_funcs_t* -->
       <return type-id='type-id-84'/>
     </function-decl>
     <!-- void hb_buffer_set_direction(hb_buffer_t*, hb_direction_t) -->
     <function-decl name='hb_buffer_set_direction' mangled-name='hb_buffer_set_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_direction'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
       <!-- void -->
@@ -3433,14 +3433,14 @@ 
     <!-- hb_direction_t hb_buffer_get_direction(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_direction' mangled-name='hb_buffer_get_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_direction'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
       <!-- enum hb_direction_t -->
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- void hb_buffer_set_script(hb_buffer_t*, hb_script_t) -->
     <function-decl name='hb_buffer_set_script' mangled-name='hb_buffer_set_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_script'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
       <!-- parameter of type 'enum hb_script_t' -->
       <parameter type-id='type-id-69' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
       <!-- void -->
@@ -3449,14 +3449,14 @@ 
     <!-- hb_script_t hb_buffer_get_script(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_script' mangled-name='hb_buffer_get_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_script'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
       <!-- enum hb_script_t -->
       <return type-id='type-id-69'/>
     </function-decl>
     <!-- void hb_buffer_set_language(hb_buffer_t*, hb_language_t) -->
     <function-decl name='hb_buffer_set_language' mangled-name='hb_buffer_set_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_language'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
       <!-- parameter of type 'typedef hb_language_t' -->
       <parameter type-id='type-id-105' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
       <!-- void -->
@@ -3465,14 +3465,14 @@ 
     <!-- hb_language_t hb_buffer_get_language(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_language' mangled-name='hb_buffer_get_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_language'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
       <!-- typedef hb_language_t -->
       <return type-id='type-id-105'/>
     </function-decl>
     <!-- void hb_buffer_set_segment_properties(hb_buffer_t*, const hb_segment_properties_t*) -->
     <function-decl name='hb_buffer_set_segment_properties' mangled-name='hb_buffer_set_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
       <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <!-- void -->
@@ -3481,7 +3481,7 @@ 
     <!-- void hb_buffer_get_segment_properties(hb_buffer_t*, hb_segment_properties_t*) -->
     <function-decl name='hb_buffer_get_segment_properties' mangled-name='hb_buffer_get_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
       <!-- parameter of type 'hb_segment_properties_t*' -->
       <parameter type-id='type-id-177' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <!-- void -->
@@ -3490,7 +3490,7 @@ 
     <!-- void hb_buffer_set_flags(hb_buffer_t*, hb_buffer_flags_t) -->
     <function-decl name='hb_buffer_set_flags' mangled-name='hb_buffer_set_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_flags'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
       <!-- parameter of type 'enum hb_buffer_flags_t' -->
       <parameter type-id='type-id-65' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
       <!-- void -->
@@ -3499,14 +3499,14 @@ 
     <!-- hb_buffer_flags_t hb_buffer_get_flags(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_flags' mangled-name='hb_buffer_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_flags'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
       <!-- enum hb_buffer_flags_t -->
       <return type-id='type-id-65'/>
     </function-decl>
     <!-- void hb_buffer_set_replacement_codepoint(hb_buffer_t*, hb_codepoint_t) -->
     <function-decl name='hb_buffer_set_replacement_codepoint' mangled-name='hb_buffer_set_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_replacement_codepoint'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
       <!-- void -->
@@ -3515,28 +3515,28 @@ 
     <!-- hb_codepoint_t hb_buffer_get_replacement_codepoint(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_replacement_codepoint' mangled-name='hb_buffer_get_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_replacement_codepoint'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
       <!-- typedef hb_codepoint_t -->
       <return type-id='type-id-72'/>
     </function-decl>
     <!-- void hb_buffer_reset(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reset' mangled-name='hb_buffer_reset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reset'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_clear_contents(hb_buffer_t*) -->
     <function-decl name='hb_buffer_clear_contents' mangled-name='hb_buffer_clear_contents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_clear_contents'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_buffer_pre_allocate(hb_buffer_t*, unsigned int) -->
     <function-decl name='hb_buffer_pre_allocate' mangled-name='hb_buffer_pre_allocate' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_pre_allocate'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -3545,14 +3545,14 @@ 
     <!-- hb_bool_t hb_buffer_allocation_successful(hb_buffer_t*) -->
     <function-decl name='hb_buffer_allocation_successful' mangled-name='hb_buffer_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_allocation_successful'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- void hb_buffer_add(hb_buffer_t*, hb_codepoint_t, unsigned int) -->
     <function-decl name='hb_buffer_add' mangled-name='hb_buffer_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3563,7 +3563,7 @@ 
     <!-- hb_bool_t hb_buffer_set_length(hb_buffer_t*, unsigned int) -->
     <function-decl name='hb_buffer_set_length' mangled-name='hb_buffer_set_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_length'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1181' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -3572,14 +3572,14 @@ 
     <!-- unsigned int hb_buffer_get_length(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- hb_glyph_info_t* hb_buffer_get_glyph_infos(hb_buffer_t*, unsigned int*) -->
     <function-decl name='hb_buffer_get_glyph_infos' mangled-name='hb_buffer_get_glyph_infos' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_infos'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1238' column='1'/>
       <!-- hb_glyph_info_t* -->
@@ -3588,7 +3588,7 @@ 
     <!-- hb_glyph_position_t* hb_buffer_get_glyph_positions(hb_buffer_t*, unsigned int*) -->
     <function-decl name='hb_buffer_get_glyph_positions' mangled-name='hb_buffer_get_glyph_positions' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_positions'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1260' column='1'/>
       <!-- hb_glyph_position_t* -->
@@ -3597,28 +3597,28 @@ 
     <!-- void hb_buffer_reverse(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reverse' mangled-name='hb_buffer_reverse' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_reverse_clusters(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reverse_clusters' mangled-name='hb_buffer_reverse_clusters' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse_clusters'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_guess_segment_properties(hb_buffer_t*) -->
     <function-decl name='hb_buffer_guess_segment_properties' mangled-name='hb_buffer_guess_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_guess_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_add_utf8(hb_buffer_t*, const char*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf8' mangled-name='hb_buffer_add_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf8'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1414' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3633,7 +3633,7 @@ 
     <!-- void hb_buffer_add_utf16(hb_buffer_t*, const uint16_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf16' mangled-name='hb_buffer_add_utf16' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf16'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
       <!-- parameter of type 'const uint16_t*' -->
       <parameter type-id='type-id-167' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3648,7 +3648,7 @@ 
     <!-- void hb_buffer_add_utf32(hb_buffer_t*, const uint32_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf32' mangled-name='hb_buffer_add_utf32' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf32'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
       <!-- parameter of type 'const uint32_t*' -->
       <parameter type-id='type-id-171' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3663,7 +3663,7 @@ 
     <!-- void hb_buffer_add_codepoints(hb_buffer_t*, const hb_codepoint_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_codepoints' mangled-name='hb_buffer_add_codepoints' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_codepoints'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
       <!-- parameter of type 'const hb_codepoint_t*' -->
       <parameter type-id='type-id-95' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3678,7 +3678,7 @@ 
     <!-- void hb_buffer_normalize_glyphs(hb_buffer_t*) -->
     <function-decl name='hb_buffer_normalize_glyphs' mangled-name='hb_buffer_normalize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_normalize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
@@ -4826,15 +4826,15 @@ 
     <typedef-decl name='hb_feature_t' type-id='type-id-198' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-219'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
     <typedef-decl name='hb_font_funcs_t' type-id='type-id-199' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-220'/>
-    <!-- typedef typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, void*)* hb_font_get_glyph_advance_func_t -->
+    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) hb_font_get_glyph_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-221' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-222'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*)* hb_font_get_glyph_contour_point_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_contour_point_func_t -->
     <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-223' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-210'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_glyph_extents_t*, void*)* hb_font_get_glyph_extents_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) hb_font_get_glyph_extents_func_t -->
     <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-224' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-209'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*)* hb_font_get_glyph_from_name_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) hb_font_get_glyph_from_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-225' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-212'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_font_get_glyph_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_font_get_glyph_func_t -->
     <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-226' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-202'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-203'/>
@@ -4842,11 +4842,11 @@ 
     <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-227' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-207'/>
     <!-- typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-205'/>
-    <!-- typedef typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* hb_font_get_glyph_kerning_func_t -->
+    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) hb_font_get_glyph_kerning_func_t -->
     <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-229' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-227'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, char*, unsigned int, void*)* hb_font_get_glyph_name_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) hb_font_get_glyph_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-230' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-211'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_position_t*, hb_position_t*, void*)* hb_font_get_glyph_origin_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-231' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-228'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-204'/>
@@ -4856,7 +4856,7 @@ 
     <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-206'/>
     <!-- typedef hb_glyph_extents_t hb_glyph_extents_t -->
     <typedef-decl name='hb_glyph_extents_t' type-id='type-id-214' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-232'/>
-    <!-- typedef hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* hb_reference_table_func_t -->
+    <!-- typedef hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) hb_reference_table_func_t -->
     <typedef-decl name='hb_reference_table_func_t' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-196'/>
     <!-- typedef typedef hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) hb_shape_func_t -->
     <typedef-decl name='hb_shape_func_t' type-id='type-id-234' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-235'/>
@@ -5067,8 +5067,20 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
     <!-- hb_auto_trace_t<0, bool>* -->
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <!-- hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* -->
+    <!-- hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) -->
     <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-233'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-226'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-224'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-231'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
     <!-- hb_face_t* -->
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-160'/>
     <!-- hb_face_t::plan_node_t* -->
@@ -5081,28 +5093,16 @@ 
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-159'/>
     <!-- hb_glyph_extents_t* -->
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-164'/>
+    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
+    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <!-- hb_position_t* -->
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
     <!-- hb_shape_func_t* -->
     <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-216'/>
     <!-- hb_shape_plan_t* -->
     <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-194'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, char*, unsigned int, void*)* -->
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_glyph_extents_t*, void*)* -->
-    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-224'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_position_t*, hb_position_t*, void*)* -->
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-231'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-226'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*)* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
-    <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
-    <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-370'/>
     <!-- hb_face_t* hb_face_create_for_tables(hb_reference_table_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_face_create_for_tables' mangled-name='hb_face_create_for_tables' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create_for_tables'>
@@ -8918,7 +8918,7 @@ 
     <!-- hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-361'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'const char*' -->
@@ -8935,7 +8935,7 @@ 
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
     <function-type size-in-bits='64' id='type-id-362'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -8950,9 +8950,9 @@ 
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-363'>
+    <function-type size-in-bits='64' id='type-id-364'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -8965,9 +8965,9 @@ 
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-364'>
+    <function-type size-in-bits='64' id='type-id-365'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -8982,9 +8982,9 @@ 
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-365'>
+    <function-type size-in-bits='64' id='type-id-363'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9001,7 +9001,7 @@ 
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-366'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9020,7 +9020,7 @@ 
     <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-367'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9035,7 +9035,7 @@ 
     <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-368'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9050,9 +9050,9 @@ 
       <!-- parameter of type 'hb_shape_plan_t*' -->
       <parameter type-id='type-id-194'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
-      <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-153'/>
+      <!-- parameter of type 'hb_buffer_t*' -->
+      <parameter type-id='type-id-152'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9274,7 +9274,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph(hb_font_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <function-decl name='hb_font_get_glyph' mangled-name='hb_font_get_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9287,7 +9287,7 @@ 
     <!-- hb_position_t hb_font_get_glyph_h_advance(hb_font_t*, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_h_advance' mangled-name='hb_font_get_glyph_h_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_advance'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
       <!-- typedef hb_position_t -->
@@ -9296,7 +9296,7 @@ 
     <!-- hb_position_t hb_font_get_glyph_v_advance(hb_font_t*, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_v_advance' mangled-name='hb_font_get_glyph_v_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_advance'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='469' column='1'/>
       <!-- typedef hb_position_t -->
@@ -9305,7 +9305,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_h_origin(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_h_origin' mangled-name='hb_font_get_glyph_h_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
@@ -9318,7 +9318,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_v_origin(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_v_origin' mangled-name='hb_font_get_glyph_v_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='510' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
@@ -9331,7 +9331,7 @@ 
     <!-- hb_position_t hb_font_get_glyph_h_kerning(hb_font_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_h_kerning' mangled-name='hb_font_get_glyph_h_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_kerning'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9342,7 +9342,7 @@ 
     <!-- hb_position_t hb_font_get_glyph_v_kerning(hb_font_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_v_kerning' mangled-name='hb_font_get_glyph_v_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_kerning'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='top_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='549' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9353,7 +9353,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_extents(hb_font_t*, hb_codepoint_t, hb_glyph_extents_t*) -->
     <function-decl name='hb_font_get_glyph_extents' mangled-name='hb_font_get_glyph_extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
@@ -9364,7 +9364,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_contour_point(hb_font_t*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_contour_point' mangled-name='hb_font_get_glyph_contour_point' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9379,7 +9379,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_name(hb_font_t*, hb_codepoint_t, char*, unsigned int) -->
     <function-decl name='hb_font_get_glyph_name' mangled-name='hb_font_get_glyph_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_name'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -9392,7 +9392,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_from_name(hb_font_t*, const char*, int, hb_codepoint_t*) -->
     <function-decl name='hb_font_get_glyph_from_name' mangled-name='hb_font_get_glyph_from_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_from_name'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9405,7 +9405,7 @@ 
     <!-- void hb_font_get_glyph_advance_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_advance_for_direction' mangled-name='hb_font_get_glyph_advance_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_advance_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9420,7 +9420,7 @@ 
     <!-- void hb_font_get_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_origin_for_direction' mangled-name='hb_font_get_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='676' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9435,7 +9435,7 @@ 
     <!-- void hb_font_add_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_add_glyph_origin_for_direction' mangled-name='hb_font_add_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_add_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='697' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9450,7 +9450,7 @@ 
     <!-- void hb_font_subtract_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_subtract_glyph_origin_for_direction' mangled-name='hb_font_subtract_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_subtract_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='718' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9465,7 +9465,7 @@ 
     <!-- void hb_font_get_glyph_kerning_for_direction(hb_font_t*, hb_codepoint_t, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_kerning_for_direction' mangled-name='hb_font_get_glyph_kerning_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_kerning_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9482,7 +9482,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_extents_for_origin(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_glyph_extents_t*) -->
     <function-decl name='hb_font_get_glyph_extents_for_origin' mangled-name='hb_font_get_glyph_extents_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents_for_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9495,7 +9495,7 @@ 
     <!-- hb_bool_t hb_font_get_glyph_contour_point_for_origin(hb_font_t*, hb_codepoint_t, unsigned int, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_contour_point_for_origin' mangled-name='hb_font_get_glyph_contour_point_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point_for_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9512,7 +9512,7 @@ 
     <!-- void hb_font_glyph_to_string(hb_font_t*, hb_codepoint_t, char*, unsigned int) -->
     <function-decl name='hb_font_glyph_to_string' mangled-name='hb_font_glyph_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_to_string'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -9525,7 +9525,7 @@ 
     <!-- hb_bool_t hb_font_glyph_from_string(hb_font_t*, const char*, int, hb_codepoint_t*) -->
     <function-decl name='hb_font_glyph_from_string' mangled-name='hb_font_glyph_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_from_string'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='829' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9540,38 +9540,38 @@ 
       <!-- parameter of type 'hb_face_t*' -->
       <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_font_t* hb_font_create_sub_font(hb_font_t*) -->
     <function-decl name='hb_font_create_sub_font' mangled-name='hb_font_create_sub_font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create_sub_font'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1'/>
+      <parameter type-id='type-id-153' name='parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_font_t* hb_font_get_empty() -->
     <function-decl name='hb_font_get_empty' mangled-name='hb_font_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_empty'>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_font_t* hb_font_reference(hb_font_t*) -->
     <function-decl name='hb_font_reference' mangled-name='hb_font_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_reference'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- void hb_font_destroy(hb_font_t*) -->
     <function-decl name='hb_font_destroy' mangled-name='hb_font_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_destroy'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_font_set_user_data(hb_font_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_font_set_user_data' mangled-name='hb_font_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_user_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1000' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9586,7 +9586,7 @@ 
     <!-- void* hb_font_get_user_data(hb_font_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_font_get_user_data' mangled-name='hb_font_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_user_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1021' column='1'/>
       <!-- void* -->
@@ -9595,35 +9595,35 @@ 
     <!-- void hb_font_make_immutable(hb_font_t*) -->
     <function-decl name='hb_font_make_immutable' mangled-name='hb_font_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_make_immutable'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_font_is_immutable(hb_font_t*) -->
     <function-decl name='hb_font_is_immutable' mangled-name='hb_font_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_is_immutable'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- hb_font_t* hb_font_get_parent(hb_font_t*) -->
     <function-decl name='hb_font_get_parent' mangled-name='hb_font_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_parent'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_face_t* hb_font_get_face(hb_font_t*) -->
     <function-decl name='hb_font_get_face' mangled-name='hb_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_face'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
       <!-- hb_face_t* -->
       <return type-id='type-id-160'/>
     </function-decl>
     <!-- void hb_font_set_funcs(hb_font_t*, hb_font_funcs_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
       <!-- parameter of type 'hb_font_funcs_t*' -->
       <parameter type-id='type-id-161' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9636,7 +9636,7 @@ 
     <!-- void hb_font_set_funcs_data(hb_font_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs_data' mangled-name='hb_font_set_funcs_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1140' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9647,7 +9647,7 @@ 
     <!-- void hb_font_set_scale(hb_font_t*, int, int) -->
     <function-decl name='hb_font_set_scale' mangled-name='hb_font_set_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_scale'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-11' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1170' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9658,7 +9658,7 @@ 
     <!-- void hb_font_get_scale(hb_font_t*, int*, int*) -->
     <function-decl name='hb_font_get_scale' mangled-name='hb_font_get_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_scale'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-575' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
       <!-- parameter of type 'int*' -->
@@ -9669,7 +9669,7 @@ 
     <!-- void hb_font_set_ppem(hb_font_t*, unsigned int, unsigned int) -->
     <function-decl name='hb_font_set_ppem' mangled-name='hb_font_set_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_ppem'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1211' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9680,7 +9680,7 @@ 
     <!-- void hb_font_get_ppem(hb_font_t*, unsigned int*, unsigned int*) -->
     <function-decl name='hb_font_get_ppem' mangled-name='hb_font_get_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_ppem'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1233' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -10262,7 +10262,7 @@ 
         <var-decl name='y' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void* (typedef FT_Memory, long int)* FT_Alloc_Func -->
+    <!-- typedef void*(*)(FT_Memory, long int) FT_Alloc_Func -->
     <typedef-decl name='FT_Alloc_Func' type-id='type-id-637' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-622'/>
     <!-- typedef FT_BBox_ FT_BBox -->
     <typedef-decl name='FT_BBox' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-595'/>
@@ -10278,11 +10278,11 @@ 
     <typedef-decl name='FT_Face' type-id='type-id-640' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-585'/>
     <!-- typedef long int FT_Fixed -->
     <typedef-decl name='FT_Fixed' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-610'/>
-    <!-- typedef void (typedef FT_Memory, void*)* FT_Free_Func -->
+    <!-- typedef void(*)(FT_Memory, void*) FT_Free_Func -->
     <typedef-decl name='FT_Free_Func' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-623'/>
     <!-- typedef FT_Generic_ FT_Generic -->
     <typedef-decl name='FT_Generic' type-id='type-id-604' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-594'/>
-    <!-- typedef void (void*)* FT_Generic_Finalizer -->
+    <!-- typedef void(*)(void*) FT_Generic_Finalizer -->
     <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-44' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-605'/>
     <!-- typedef FT_GlyphSlotRec_* FT_GlyphSlot -->
     <typedef-decl name='FT_GlyphSlot' type-id='type-id-642' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-596'/>
@@ -10304,7 +10304,7 @@ 
     <typedef-decl name='FT_Outline' type-id='type-id-625' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-614'/>
     <!-- typedef long int FT_Pos -->
     <typedef-decl name='FT_Pos' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-579'/>
-    <!-- typedef void* (typedef FT_Memory, long int, long int, void*)* FT_Realloc_Func -->
+    <!-- typedef void*(*)(FT_Memory, long int, long int, void*) FT_Realloc_Func -->
     <typedef-decl name='FT_Realloc_Func' type-id='type-id-645' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-624'/>
     <!-- typedef short int FT_Short -->
     <typedef-decl name='FT_Short' type-id='type-id-80' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-583'/>
@@ -10316,9 +10316,9 @@ 
     <typedef-decl name='FT_Stream' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-601'/>
     <!-- typedef FT_StreamDesc_ FT_StreamDesc -->
     <typedef-decl name='FT_StreamDesc' type-id='type-id-648' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-633'/>
-    <!-- typedef void (typedef FT_Stream)* FT_Stream_CloseFunc -->
+    <!-- typedef void(*)(FT_Stream) FT_Stream_CloseFunc -->
     <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-635'/>
-    <!-- typedef unsigned long int (typedef FT_Stream, unsigned long int, unsigned char*, unsigned long int)* FT_Stream_IoFunc -->
+    <!-- typedef unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) FT_Stream_IoFunc -->
     <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-634'/>
     <!-- typedef char FT_String -->
     <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-651'/>
@@ -10365,15 +10365,15 @@ 
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-627'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-581'/>
-    <!-- unsigned long int (typedef FT_Stream, unsigned long int, unsigned char*, unsigned long int)* -->
+    <!-- unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
     <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-650'/>
-    <!-- void (typedef FT_Memory, void*)* -->
+    <!-- void(*)(FT_Memory, void*) -->
     <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-641'/>
-    <!-- void (typedef FT_Stream)* -->
+    <!-- void(*)(FT_Stream) -->
     <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-649'/>
-    <!-- void* (typedef FT_Memory, long int)* -->
+    <!-- void*(*)(FT_Memory, long int) -->
     <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-637'/>
-    <!-- void* (typedef FT_Memory, long int, long int, void*)* -->
+    <!-- void*(*)(FT_Memory, long int, long int, void*) -->
     <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-645'/>
     <!-- FT_DriverRec_* -->
     <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
@@ -10434,19 +10434,19 @@ 
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- void hb_ft_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ft_font_set_funcs' mangled-name='hb_ft_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- FT_Face hb_ft_font_get_face(hb_font_t*) -->
     <function-decl name='hb_ft_font_get_face' mangled-name='hb_ft_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_get_face'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
       <!-- typedef FT_Face -->
       <return type-id='type-id-585'/>
     </function-decl>
@@ -12802,7 +12802,7 @@ 
     <!-- void hb_ot_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
@@ -13329,7 +13329,7 @@ 
         <!-- struct hb_ot_map_t::stage_map_t -->
         <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-921'>
           <member-type access='public'>
-            <!-- typedef void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* hb_ot_map_t::stage_map_t::pause_func_t -->
+            <!-- typedef void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) hb_ot_map_t::stage_map_t::pause_func_t -->
             <typedef-decl name='pause_func_t' type-id='type-id-957' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-956'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -13385,9 +13385,9 @@ 
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -13402,9 +13402,9 @@ 
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -13417,9 +13417,9 @@ 
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -13432,9 +13432,9 @@ 
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -14644,1032 +14644,1038 @@ 
     <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
     <!-- OT::hb_apply_context_t::matcher_t* -->
     <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
-    <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
+    <!-- OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
-    <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
+    <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
     <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
-    <!-- OT::hb_closure_context_t* -->
+    <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
     <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
-    <!-- OT::hb_collect_glyphs_context_t* -->
+    <!-- OT::hb_closure_context_t* -->
     <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
-    <!-- OT::hb_get_coverage_context_t* -->
+    <!-- OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
-    <!-- OT::hb_would_apply_context_t* -->
+    <!-- OT::hb_collect_glyphs_context_t* -->
     <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
-    <!-- bool (hb_set_t*, const OT::USHORT&, void*)* -->
+    <!-- OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
-    <!-- bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* -->
+    <!-- OT::hb_get_coverage_context_t* -->
     <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
+    <!-- OT::hb_would_apply_context_t* -->
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
+    <!-- bool(*)(hb_codepoint_t, const OT::USHORT&, void*) -->
+    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
+    <!-- bool(*)(hb_set_t*, const OT::USHORT&, void*) -->
+    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
     <!-- bool* -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1349'/>
     <!-- const GPOSProxy -->
-    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1344'/>
+    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1350'/>
     <!-- const GPOSProxy& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-963'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1350' size-in-bits='64' id='type-id-963'/>
     <!-- const GSUBProxy -->
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1345'/>
+    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1351'/>
     <!-- const GSUBProxy& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-961'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-961'/>
     <!-- const OT::AlternateSubst -->
-    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1346'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1352'/>
     <!-- const OT::AlternateSubst* -->
-    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
     <!-- const OT::AlternateSubstFormat1 -->
-    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1348'/>
+    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1354'/>
     <!-- const OT::AlternateSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1348' size-in-bits='64' id='type-id-1349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
     <!-- const OT::AlternateSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1350'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1356'/>
     <!-- const OT::Anchor -->
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1351'/>
+    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1357'/>
     <!-- const OT::Anchor& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
     <!-- const OT::Anchor* -->
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-1353'/>
+    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1359'/>
     <!-- const OT::AnchorFormat1 -->
-    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1354'/>
+    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1360'/>
     <!-- const OT::AnchorFormat1* -->
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-517'/>
     <!-- const OT::AnchorFormat2 -->
-    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1355'/>
+    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1361'/>
     <!-- const OT::AnchorFormat2* -->
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-518'/>
     <!-- const OT::AnchorFormat3 -->
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1356'/>
+    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1362'/>
     <!-- const OT::AnchorFormat3* -->
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-519'/>
+    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-519'/>
     <!-- const OT::AnchorMatrix -->
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1357'/>
+    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1363'/>
     <!-- const OT::AnchorMatrix& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
     <!-- const OT::AnchorMatrix* -->
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-524'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1359'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1365'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-516'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1360'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1366'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-463'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1361'/>
+    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1367'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1362'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1368'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-474'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1363'/>
+    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1369'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-503'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-503'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1364'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1370'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-521'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-521'/>
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1365'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1371'/>
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-483'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1366'/>
+    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1372'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-527'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1367'/>
+    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1373'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-444'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-444'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-1368'/>
+    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-1374'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-448'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1369'/>
+    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1375'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-502'/>
+    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-502'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1032' const='yes' id='type-id-1370'/>
+    <qualified-type-def type-id='type-id-1032' const='yes' id='type-id-1376'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-501'/>
+    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-501'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1371'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1377'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-506'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1372'/>
+    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1378'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-459'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1379'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-447'/>
+    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-447'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1374'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1380'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-492'/>
+    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-492'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1375'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1381'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-491'/>
+    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-491'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1376'/>
+    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1382'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-482'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1377'/>
+    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1383'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-513'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1378'/>
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1384'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-511'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1379'/>
+    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1385'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-512'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1380'/>
+    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1386'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-497'/>
+    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-497'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1381'/>
+    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1387'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-496'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1054' const='yes' id='type-id-1382'/>
+    <qualified-type-def type-id='type-id-1054' const='yes' id='type-id-1388'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-489'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1383'/>
+    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1389'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-487'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1384'/>
+    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1390'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-488'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1385'/>
+    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1391'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-442'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1386'/>
+    <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1392'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-471'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1064' const='yes' id='type-id-1387'/>
+    <qualified-type-def type-id='type-id-1064' const='yes' id='type-id-1393'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-466'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1388'/>
+    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1394'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-462'/>
     <!-- const OT::AttachList -->
-    <qualified-type-def type-id='type-id-1068' const='yes' id='type-id-1389'/>
+    <qualified-type-def type-id='type-id-1068' const='yes' id='type-id-1395'/>
     <!-- const OT::AttachList& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1389' size-in-bits='64' id='type-id-1390'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1395' size-in-bits='64' id='type-id-1396'/>
     <!-- const OT::AttachList* -->
-    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-1391'/>
+    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-1397'/>
     <!-- const OT::CaretValue -->
-    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1392'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1398'/>
     <!-- const OT::CaretValue& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
     <!-- const OT::CaretValue* -->
-    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1394'/>
+    <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1400'/>
     <!-- const OT::CaretValueFormat1 -->
-    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1395'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1401'/>
     <!-- const OT::CaretValueFormat1* -->
-    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-449'/>
     <!-- const OT::CaretValueFormat2 -->
-    <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1396'/>
+    <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1402'/>
     <!-- const OT::CaretValueFormat2* -->
-    <pointer-type-def type-id='type-id-1396' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-450'/>
     <!-- const OT::CaretValueFormat3 -->
-    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1397'/>
+    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1403'/>
     <!-- const OT::CaretValueFormat3* -->
-    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-453'/>
     <!-- const OT::ChainContext -->
-    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1398'/>
+    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1404'/>
     <!-- const OT::ChainContext* -->
-    <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
+    <pointer-type-def type-id='type-id-1404' size-in-bits='64' id='type-id-1405'/>
     <!-- const OT::ChainContextFormat1 -->
-    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1400'/>
+    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1406'/>
     <!-- const OT::ChainContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1400' size-in-bits='64' id='type-id-1401'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1406' size-in-bits='64' id='type-id-1407'/>
     <!-- const OT::ChainContextFormat1* -->
-    <pointer-type-def type-id='type-id-1400' size-in-bits='64' id='type-id-1402'/>
+    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1408'/>
     <!-- const OT::ChainContextFormat2 -->
-    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1403'/>
+    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1409'/>
     <!-- const OT::ChainContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-1404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
     <!-- const OT::ChainContextFormat2* -->
-    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-1405'/>
+    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
     <!-- const OT::ChainContextFormat3 -->
-    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1406'/>
+    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1412'/>
     <!-- const OT::ChainContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1406' size-in-bits='64' id='type-id-1407'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1412' size-in-bits='64' id='type-id-1413'/>
     <!-- const OT::ChainContextFormat3* -->
-    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1408'/>
+    <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1414'/>
     <!-- const OT::ChainRule -->
-    <qualified-type-def type-id='type-id-1094' const='yes' id='type-id-1409'/>
+    <qualified-type-def type-id='type-id-1094' const='yes' id='type-id-1415'/>
     <!-- const OT::ChainRule& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1415' size-in-bits='64' id='type-id-1416'/>
     <!-- const OT::ChainRule* -->
-    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
+    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1417'/>
     <!-- const OT::ChainRuleSet -->
-    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1412'/>
+    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1418'/>
     <!-- const OT::ChainRuleSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1412' size-in-bits='64' id='type-id-1413'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
     <!-- const OT::ChainRuleSet* -->
-    <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1420'/>
     <!-- const OT::ClassDef -->
-    <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1415'/>
+    <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1421'/>
     <!-- const OT::ClassDef& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1415' size-in-bits='64' id='type-id-1416'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1421' size-in-bits='64' id='type-id-1422'/>
     <!-- const OT::ClassDef* -->
-    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1417'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1423'/>
     <!-- const OT::ClassDefFormat1 -->
-    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1418'/>
+    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1424'/>
     <!-- const OT::ClassDefFormat1* -->
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-457'/>
     <!-- const OT::ClassDefFormat2 -->
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1419'/>
+    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1425'/>
     <!-- const OT::ClassDefFormat2* -->
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-1420'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-1426'/>
     <!-- const OT::Context -->
-    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1421'/>
+    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1427'/>
     <!-- const OT::Context* -->
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-1428'/>
     <!-- const OT::ContextFormat1 -->
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1423'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1429'/>
     <!-- const OT::ContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1423' size-in-bits='64' id='type-id-1424'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
     <!-- const OT::ContextFormat1* -->
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-1431'/>
     <!-- const OT::ContextFormat2 -->
-    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1426'/>
+    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1432'/>
     <!-- const OT::ContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1426' size-in-bits='64' id='type-id-1427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1432' size-in-bits='64' id='type-id-1433'/>
     <!-- const OT::ContextFormat2* -->
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-1434'/>
     <!-- const OT::ContextFormat3 -->
-    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1429'/>
+    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1435'/>
     <!-- const OT::ContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1435' size-in-bits='64' id='type-id-1436'/>
     <!-- const OT::ContextFormat3* -->
-    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-500'/>
     <!-- const OT::Coverage -->
-    <qualified-type-def type-id='type-id-1121' const='yes' id='type-id-1431'/>
+    <qualified-type-def type-id='type-id-1121' const='yes' id='type-id-1437'/>
     <!-- const OT::Coverage& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1431' size-in-bits='64' id='type-id-943'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1437' size-in-bits='64' id='type-id-943'/>
     <!-- const OT::Coverage* -->
-    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-1432'/>
+    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-1438'/>
     <!-- const OT::CoverageFormat1 -->
-    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1433'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1439'/>
     <!-- const OT::CoverageFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1433' size-in-bits='64' id='type-id-1434'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1439' size-in-bits='64' id='type-id-1440'/>
     <!-- const OT::CoverageFormat1* -->
-    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-1435'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1441'/>
     <!-- const OT::CoverageFormat2 -->
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1436'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1442'/>
     <!-- const OT::CoverageFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1436' size-in-bits='64' id='type-id-1437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1442' size-in-bits='64' id='type-id-1443'/>
     <!-- const OT::CoverageFormat2* -->
-    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-1444'/>
     <!-- const OT::CursivePos -->
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1439'/>
+    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1445'/>
     <!-- const OT::CursivePos* -->
-    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-1446'/>
     <!-- const OT::CursivePosFormat1 -->
-    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1441'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1447'/>
     <!-- const OT::CursivePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1441' size-in-bits='64' id='type-id-1442'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1447' size-in-bits='64' id='type-id-1448'/>
     <!-- const OT::CursivePosFormat1* -->
-    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-1449'/>
     <!-- const OT::Device -->
-    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1444'/>
+    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1450'/>
     <!-- const OT::Device& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1444' size-in-bits='64' id='type-id-1445'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1450' size-in-bits='64' id='type-id-1451'/>
     <!-- const OT::Device* -->
-    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-1450' size-in-bits='64' id='type-id-451'/>
     <!-- const OT::EntryExitRecord -->
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1446'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1452'/>
     <!-- const OT::EntryExitRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1446' size-in-bits='64' id='type-id-1447'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1452' size-in-bits='64' id='type-id-1453'/>
     <!-- const OT::EntryExitRecord* -->
-    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-1452' size-in-bits='64' id='type-id-1454'/>
     <!-- const OT::Extension<OT::ExtensionPos> -->
-    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1449'/>
+    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1455'/>
     <!-- const OT::Extension<OT::ExtensionPos>* -->
-    <pointer-type-def type-id='type-id-1449' size-in-bits='64' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-1456'/>
     <!-- const OT::Extension<OT::ExtensionSubst> -->
-    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1451'/>
+    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1457'/>
     <!-- const OT::Extension<OT::ExtensionSubst>* -->
-    <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
+    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
     <!-- const OT::ExtensionFormat1 -->
-    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1453'/>
+    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1459'/>
     <!-- const OT::ExtensionFormat1* -->
-    <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-507'/>
     <!-- const OT::ExtensionSubst -->
-    <qualified-type-def type-id='type-id-1454' const='yes' id='type-id-1455'/>
+    <qualified-type-def type-id='type-id-1460' const='yes' id='type-id-1461'/>
     <!-- const OT::ExtensionSubst* -->
-    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-1462'/>
     <!-- const OT::Feature -->
-    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1457'/>
+    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1463'/>
     <!-- const OT::Feature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
     <!-- const OT::Feature* -->
-    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-477'/>
     <!-- const OT::FeatureParams -->
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1459'/>
+    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1465'/>
     <!-- const OT::FeatureParams& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
     <!-- const OT::FeatureParams* -->
-    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1467'/>
     <!-- const OT::FeatureParamsCharacterVariants -->
-    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1462'/>
+    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1468'/>
     <!-- const OT::FeatureParamsCharacterVariants* -->
-    <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-475'/>
     <!-- const OT::FeatureParamsSize -->
-    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1463'/>
+    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1469'/>
     <!-- const OT::FeatureParamsSize& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
     <!-- const OT::FeatureParamsSize* -->
-    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-472'/>
     <!-- const OT::FeatureParamsStylisticSet -->
-    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1471'/>
     <!-- const OT::FeatureParamsStylisticSet* -->
-    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-473'/>
+    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-473'/>
     <!-- const OT::GDEF -->
-    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1466'/>
+    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1472'/>
     <!-- const OT::GDEF& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1466' size-in-bits='64' id='type-id-1467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1472' size-in-bits='64' id='type-id-1473'/>
     <!-- const OT::GDEF* -->
-    <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-1468'/>
+    <pointer-type-def type-id='type-id-1472' size-in-bits='64' id='type-id-1474'/>
     <!-- const OT::GPOS -->
-    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1469'/>
+    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1475'/>
     <!-- const OT::GPOS& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1475' size-in-bits='64' id='type-id-932'/>
     <!-- const OT::GPOS* -->
-    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-1476'/>
     <!-- const OT::GSUB -->
-    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1471'/>
+    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1477'/>
     <!-- const OT::GSUB& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1471' size-in-bits='64' id='type-id-938'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1477' size-in-bits='64' id='type-id-938'/>
     <!-- const OT::GSUB* -->
-    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
     <!-- const OT::GSUBGPOS -->
-    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1473'/>
+    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1479'/>
     <!-- const OT::GSUBGPOS* -->
-    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-1474'/>
+    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-1480'/>
     <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1475'/>
+    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1481'/>
     <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-493'/>
     <!-- const OT::Index -->
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1476'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1482'/>
     <!-- const OT::Index& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1476' size-in-bits='64' id='type-id-1477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
     <!-- const OT::Index* -->
-    <pointer-type-def type-id='type-id-1476' size-in-bits='64' id='type-id-1478'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1484'/>
     <!-- const OT::IndexArray -->
-    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1485' const='yes' id='type-id-1486'/>
     <!-- const OT::IndexArray* -->
-    <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1487'/>
     <!-- const OT::LangSys -->
-    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1482'/>
+    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1488'/>
     <!-- const OT::LangSys& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1489'/>
     <!-- const OT::LangSys* -->
-    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-464'/>
     <!-- const OT::LigCaretList -->
-    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1484'/>
+    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1490'/>
     <!-- const OT::LigCaretList& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
     <!-- const OT::LigCaretList* -->
-    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1492'/>
     <!-- const OT::LigGlyph -->
-    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1487'/>
+    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1493'/>
     <!-- const OT::LigGlyph& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1487' size-in-bits='64' id='type-id-1488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <!-- const OT::LigGlyph* -->
-    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-1489'/>
+    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1495'/>
     <!-- const OT::Ligature -->
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1490'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1496'/>
     <!-- const OT::Ligature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
     <!-- const OT::Ligature* -->
-    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1498'/>
     <!-- const OT::LigatureSet -->
-    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1493'/>
+    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1499'/>
     <!-- const OT::LigatureSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1500'/>
     <!-- const OT::LigatureSet* -->
-    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1495'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1501'/>
     <!-- const OT::LigatureSubst -->
-    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1496'/>
+    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1502'/>
     <!-- const OT::LigatureSubst* -->
-    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
+    <pointer-type-def type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
     <!-- const OT::LigatureSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1504'/>
     <!-- const OT::LigatureSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1504' size-in-bits='64' id='type-id-1505'/>
     <!-- const OT::LigatureSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1500'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1506'/>
     <!-- const OT::Lookup -->
-    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1501'/>
+    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1507'/>
     <!-- const OT::Lookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1501' size-in-bits='64' id='type-id-1502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1507' size-in-bits='64' id='type-id-1508'/>
     <!-- const OT::Lookup* -->
-    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-484'/>
     <!-- const OT::LookupRecord -->
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1509'/>
     <!-- const OT::LookupRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
     <!-- const OT::LookupRecord* -->
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1505'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1511'/>
     <!-- const OT::MarkArray -->
-    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1506'/>
+    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1512'/>
     <!-- const OT::MarkArray& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1506' size-in-bits='64' id='type-id-1507'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
     <!-- const OT::MarkArray* -->
-    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1514'/>
     <!-- const OT::MarkBasePos -->
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1509'/>
+    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1515'/>
     <!-- const OT::MarkBasePos* -->
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
+    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-1516'/>
     <!-- const OT::MarkBasePosFormat1 -->
-    <qualified-type-def type-id='type-id-1190' const='yes' id='type-id-1511'/>
+    <qualified-type-def type-id='type-id-1190' const='yes' id='type-id-1517'/>
     <!-- const OT::MarkBasePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1517' size-in-bits='64' id='type-id-1518'/>
     <!-- const OT::MarkBasePosFormat1* -->
-    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-526'/>
     <!-- const OT::MarkGlyphSets -->
-    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1513'/>
+    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1519'/>
     <!-- const OT::MarkGlyphSets& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1514'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1519' size-in-bits='64' id='type-id-1520'/>
     <!-- const OT::MarkGlyphSets* -->
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1515'/>
+    <pointer-type-def type-id='type-id-1519' size-in-bits='64' id='type-id-1521'/>
     <!-- const OT::MarkGlyphSetsFormat1 -->
-    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1516'/>
+    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1522'/>
     <!-- const OT::MarkGlyphSetsFormat1* -->
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
+    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
     <!-- const OT::MarkLigPos -->
-    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1518'/>
+    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1524'/>
     <!-- const OT::MarkLigPos* -->
-    <pointer-type-def type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
+    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
     <!-- const OT::MarkLigPosFormat1 -->
-    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1520'/>
+    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1526'/>
     <!-- const OT::MarkLigPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1520' size-in-bits='64' id='type-id-1521'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1526' size-in-bits='64' id='type-id-1527'/>
     <!-- const OT::MarkLigPosFormat1* -->
-    <pointer-type-def type-id='type-id-1520' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-529'/>
     <!-- const OT::MarkMarkPos -->
-    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1522'/>
+    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1528'/>
     <!-- const OT::MarkMarkPos* -->
-    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
+    <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
     <!-- const OT::MarkMarkPosFormat1 -->
-    <qualified-type-def type-id='type-id-1203' const='yes' id='type-id-1524'/>
+    <qualified-type-def type-id='type-id-1203' const='yes' id='type-id-1530'/>
     <!-- const OT::MarkMarkPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
     <!-- const OT::MarkMarkPosFormat1* -->
-    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-530'/>
     <!-- const OT::MarkRecord -->
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1526'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1532'/>
     <!-- const OT::MarkRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1526' size-in-bits='64' id='type-id-1527'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1532' size-in-bits='64' id='type-id-1533'/>
     <!-- const OT::MarkRecord* -->
-    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-1532' size-in-bits='64' id='type-id-522'/>
     <!-- const OT::MultipleSubst -->
-    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1528'/>
+    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1534'/>
     <!-- const OT::MultipleSubst* -->
-    <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
+    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-1535'/>
     <!-- const OT::MultipleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1530'/>
+    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1536'/>
     <!-- const OT::MultipleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
     <!-- const OT::MultipleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1532'/>
+    <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1538'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1533'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1539'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1535'/>
+    <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1541'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix> -->
-    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1536'/>
+    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1542'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix>* -->
-    <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1538'/>
+    <pointer-type-def type-id='type-id-1542' size-in-bits='64' id='type-id-1544'/>
     <!-- const OT::OffsetListOf<OT::Lookup> -->
-    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1539'/>
+    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1545'/>
     <!-- const OT::OffsetListOf<OT::Lookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1545' size-in-bits='64' id='type-id-1546'/>
     <!-- const OT::OffsetListOf<OT::Lookup>* -->
-    <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1541'/>
+    <pointer-type-def type-id='type-id-1545' size-in-bits='64' id='type-id-1547'/>
     <!-- const OT::OffsetListOf<OT::PosLookup> -->
-    <qualified-type-def type-id='type-id-1218' const='yes' id='type-id-1542'/>
+    <qualified-type-def type-id='type-id-1218' const='yes' id='type-id-1548'/>
     <!-- const OT::OffsetListOf<OT::PosLookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
     <!-- const OT::OffsetListOf<OT::PosLookup>* -->
-    <pointer-type-def type-id='type-id-1542' size-in-bits='64' id='type-id-1544'/>
+    <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-1550'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup> -->
-    <qualified-type-def type-id='type-id-1221' const='yes' id='type-id-1545'/>
+    <qualified-type-def type-id='type-id-1221' const='yes' id='type-id-1551'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1545' size-in-bits='64' id='type-id-1546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup>* -->
-    <pointer-type-def type-id='type-id-1545' size-in-bits='64' id='type-id-1547'/>
+    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-1553'/>
     <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1548'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1554'/>
     <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-1554' size-in-bits='64' id='type-id-520'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1549'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1555'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-525'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1551'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1557'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1557' size-in-bits='64' id='type-id-1558'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-1557' size-in-bits='64' id='type-id-445'/>
     <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1553'/>
+    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1559'/>
     <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1553' size-in-bits='64' id='type-id-446'/>
+    <pointer-type-def type-id='type-id-1559' size-in-bits='64' id='type-id-446'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1554'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1560'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1554' size-in-bits='64' id='type-id-1555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1560' size-in-bits='64' id='type-id-1561'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1554' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-454'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1556'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1562'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1556' size-in-bits='64' id='type-id-1557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1562' size-in-bits='64' id='type-id-1563'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1556' size-in-bits='64' id='type-id-504'/>
+    <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-504'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1558'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1564'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1558' size-in-bits='64' id='type-id-1559'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-1565'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1558' size-in-bits='64' id='type-id-505'/>
+    <pointer-type-def type-id='type-id-1564' size-in-bits='64' id='type-id-505'/>
     <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1560'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1566'/>
     <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1566' size-in-bits='64' id='type-id-458'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1561'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1567'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1561' size-in-bits='64' id='type-id-1562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1567' size-in-bits='64' id='type-id-1568'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1561' size-in-bits='64' id='type-id-443'/>
+    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-443'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1563'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1569'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1563' size-in-bits='64' id='type-id-1564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1569' size-in-bits='64' id='type-id-1570'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1563' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-460'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1565'/>
+    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1571'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1565' size-in-bits='64' id='type-id-1566'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1571' size-in-bits='64' id='type-id-1572'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1565' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-452'/>
     <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1567'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1573'/>
     <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-479'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1568'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1574'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1568' size-in-bits='64' id='type-id-478'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1574' size-in-bits='64' id='type-id-478'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-476'/>
+    <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-476'/>
     <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1569'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1575'/>
     <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-465'/>
     <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1576'/>
     <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-456'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1571'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1577'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1571' size-in-bits='64' id='type-id-1572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-455'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1573'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1579'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1573' size-in-bits='64' id='type-id-1574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1579' size-in-bits='64' id='type-id-1580'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-494'/>
+    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-494'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1575'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1581'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1575' size-in-bits='64' id='type-id-1576'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1581' size-in-bits='64' id='type-id-1582'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-495'/>
+    <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-495'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1577'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1583'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-485'/>
+    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-485'/>
     <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1579'/>
+    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1585'/>
     <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-523'/>
     <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1580'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1586'/>
     <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1580' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-1586' size-in-bits='64' id='type-id-461'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1581'/>
+    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1587'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-528'/>
+    <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-528'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1582'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1588'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1582' size-in-bits='64' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-1588' size-in-bits='64' id='type-id-486'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1583'/>
+    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1589'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-537'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1584'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1590'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1584' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1590' size-in-bits='64' id='type-id-510'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1585'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1591'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1591' size-in-bits='64' id='type-id-1592'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-515'/>
+    <pointer-type-def type-id='type-id-1591' size-in-bits='64' id='type-id-515'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1587'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1593'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1593' size-in-bits='64' id='type-id-1594'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-1593' size-in-bits='64' id='type-id-536'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1589'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1595'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-535'/>
+    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-535'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1591'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1597'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1591' size-in-bits='64' id='type-id-481'/>
+    <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-481'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1592'/>
+    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1598'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-470'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1593'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1599'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1593' size-in-bits='64' id='type-id-1594'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1599' size-in-bits='64' id='type-id-1600'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1593' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-1599' size-in-bits='64' id='type-id-498'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1595'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1601'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1601' size-in-bits='64' id='type-id-1602'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-499'/>
+    <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-499'/>
     <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1597'/>
+    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1603'/>
     <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-1603' size-in-bits='64' id='type-id-468'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1598'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1604'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1599'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-490'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1600'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1606'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1600' size-in-bits='64' id='type-id-1601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-1607'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1600' size-in-bits='64' id='type-id-509'/>
+    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-509'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1602'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1608'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1602' size-in-bits='64' id='type-id-1603'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-508'/>
     <!-- const OT::PairPos -->
-    <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1604'/>
+    <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1610'/>
     <!-- const OT::PairPos* -->
-    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
     <!-- const OT::PairPosFormat1 -->
-    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1606'/>
+    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1612'/>
     <!-- const OT::PairPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-1607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
     <!-- const OT::PairPosFormat1* -->
-    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-533'/>
+    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-533'/>
     <!-- const OT::PairPosFormat2 -->
-    <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-1608'/>
+    <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-1614'/>
     <!-- const OT::PairPosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
     <!-- const OT::PairPosFormat2* -->
-    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-534'/>
     <!-- const OT::PairSet -->
-    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1610'/>
+    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1616'/>
     <!-- const OT::PairSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
     <!-- const OT::PairSet* -->
-    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-514'/>
+    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-514'/>
     <!-- const OT::PairSet::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-1612'/>
+    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-1618'/>
     <!-- const OT::PairSet::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
+    <pointer-type-def type-id='type-id-1618' size-in-bits='64' id='type-id-1619'/>
     <!-- const OT::PosLookup -->
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1614'/>
+    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1620'/>
     <!-- const OT::PosLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-951'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1620' size-in-bits='64' id='type-id-951'/>
     <!-- const OT::PosLookup* -->
-    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
+    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-1621'/>
     <!-- const OT::PosLookupSubTable -->
-    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1616'/>
+    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1622'/>
     <!-- const OT::PosLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
     <!-- const OT::PosLookupSubTable* -->
-    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-1618'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1624'/>
     <!-- const OT::RangeRecord -->
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1619'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1625'/>
     <!-- const OT::RangeRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1619' size-in-bits='64' id='type-id-1620'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-1626'/>
     <!-- const OT::RangeRecord* -->
-    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-1621'/>
+    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1627'/>
     <!-- const OT::Record<OT::Feature> -->
-    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1622'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1628'/>
     <!-- const OT::Record<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1628' size-in-bits='64' id='type-id-1629'/>
     <!-- const OT::Record<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-480'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-480'/>
     <!-- const OT::Record<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1624'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1630'/>
     <!-- const OT::Record<OT::LangSys>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-1625'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
     <!-- const OT::Record<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-467'/>
     <!-- const OT::Record<OT::Script> -->
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1626'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1632'/>
     <!-- const OT::Record<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1626' size-in-bits='64' id='type-id-1627'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
     <!-- const OT::Record<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-469'/>
     <!-- const OT::RecordArrayOf<OT::Feature> -->
-    <qualified-type-def type-id='type-id-1628' const='yes' id='type-id-1629'/>
+    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
     <!-- const OT::RecordArrayOf<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1630'/>
+    <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1636'/>
     <!-- const OT::RecordArrayOf<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-1631' const='yes' id='type-id-1632'/>
+    <qualified-type-def type-id='type-id-1637' const='yes' id='type-id-1638'/>
     <!-- const OT::RecordArrayOf<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1639'/>
     <!-- const OT::RecordArrayOf<OT::Script> -->
-    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
+    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-1641'/>
     <!-- const OT::RecordArrayOf<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1636'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1642'/>
     <!-- const OT::RecordListOf<OT::Feature> -->
-    <qualified-type-def type-id='type-id-1283' const='yes' id='type-id-1637'/>
+    <qualified-type-def type-id='type-id-1283' const='yes' id='type-id-1643'/>
     <!-- const OT::RecordListOf<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1643' size-in-bits='64' id='type-id-1644'/>
     <!-- const OT::RecordListOf<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1639'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1645'/>
     <!-- const OT::RecordListOf<OT::Script> -->
-    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1640'/>
+    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1646'/>
     <!-- const OT::RecordListOf<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1640' size-in-bits='64' id='type-id-1641'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1646' size-in-bits='64' id='type-id-1647'/>
     <!-- const OT::RecordListOf<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1642'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1648'/>
     <!-- const OT::ReverseChainSingleSubst -->
-    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1643'/>
+    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1649'/>
     <!-- const OT::ReverseChainSingleSubst* -->
-    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1650'/>
     <!-- const OT::ReverseChainSingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1645'/>
+    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1651'/>
     <!-- const OT::ReverseChainSingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1645' size-in-bits='64' id='type-id-1646'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
     <!-- const OT::ReverseChainSingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1647'/>
+    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1653'/>
     <!-- const OT::Rule -->
-    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1648'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1654'/>
     <!-- const OT::Rule& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1648' size-in-bits='64' id='type-id-1649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
     <!-- const OT::Rule* -->
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1650'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1656'/>
     <!-- const OT::RuleSet -->
-    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1651'/>
+    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1657'/>
     <!-- const OT::RuleSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
     <!-- const OT::RuleSet* -->
-    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1653'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1659'/>
     <!-- const OT::SHORT -->
-    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1654'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1660'/>
     <!-- const OT::SHORT& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1660' size-in-bits='64' id='type-id-1661'/>
     <!-- const OT::Script -->
-    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1656'/>
+    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1662'/>
     <!-- const OT::Script& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1656' size-in-bits='64' id='type-id-1657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1662' size-in-bits='64' id='type-id-1663'/>
     <!-- const OT::Script* -->
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1658'/>
+    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1664'/>
     <!-- const OT::Sequence -->
-    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1659'/>
+    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1665'/>
     <!-- const OT::Sequence& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1659' size-in-bits='64' id='type-id-1660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1665' size-in-bits='64' id='type-id-1666'/>
     <!-- const OT::Sequence* -->
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1667'/>
     <!-- const OT::SinglePos -->
-    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1662'/>
+    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1668'/>
     <!-- const OT::SinglePos* -->
-    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1663'/>
+    <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1669'/>
     <!-- const OT::SinglePosFormat1 -->
-    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1664'/>
+    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1670'/>
     <!-- const OT::SinglePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1664' size-in-bits='64' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
     <!-- const OT::SinglePosFormat1* -->
-    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-531'/>
     <!-- const OT::SinglePosFormat2 -->
-    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1666'/>
+    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1672'/>
     <!-- const OT::SinglePosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1672' size-in-bits='64' id='type-id-1673'/>
     <!-- const OT::SinglePosFormat2* -->
-    <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-532'/>
     <!-- const OT::SingleSubst -->
-    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1668'/>
+    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1674'/>
     <!-- const OT::SingleSubst* -->
-    <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1669'/>
+    <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1675'/>
     <!-- const OT::SingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1670'/>
+    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1676'/>
     <!-- const OT::SingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-1677'/>
     <!-- const OT::SingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1672'/>
+    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-1678'/>
     <!-- const OT::SingleSubstFormat2 -->
-    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1673'/>
+    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1679'/>
     <!-- const OT::SingleSubstFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-1674'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1679' size-in-bits='64' id='type-id-1680'/>
     <!-- const OT::SingleSubstFormat2* -->
-    <pointer-type-def type-id='type-id-1673' size-in-bits='64' id='type-id-1675'/>
+    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-1681'/>
     <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1676' const='yes' id='type-id-1677'/>
+    <qualified-type-def type-id='type-id-1682' const='yes' id='type-id-1683'/>
     <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1677' size-in-bits='64' id='type-id-1678'/>
+    <pointer-type-def type-id='type-id-1683' size-in-bits='64' id='type-id-1684'/>
     <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1679' const='yes' id='type-id-1680'/>
+    <qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1686'/>
     <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1680' size-in-bits='64' id='type-id-1681'/>
+    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1682' const='yes' id='type-id-1683'/>
+    <qualified-type-def type-id='type-id-1688' const='yes' id='type-id-1689'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1683' size-in-bits='64' id='type-id-1684'/>
+    <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1686'/>
+    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1692'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
+    <pointer-type-def type-id='type-id-1692' size-in-bits='64' id='type-id-1693'/>
     <!-- const OT::SubstLookup -->
-    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1688'/>
+    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1694'/>
     <!-- const OT::SubstLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1688' size-in-bits='64' id='type-id-950'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1694' size-in-bits='64' id='type-id-950'/>
     <!-- const OT::SubstLookup* -->
-    <pointer-type-def type-id='type-id-1688' size-in-bits='64' id='type-id-1689'/>
+    <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
     <!-- const OT::SubstLookupSubTable -->
-    <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1690'/>
+    <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1696'/>
     <!-- const OT::SubstLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1690' size-in-bits='64' id='type-id-1691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1696' size-in-bits='64' id='type-id-1697'/>
     <!-- const OT::SubstLookupSubTable* -->
-    <pointer-type-def type-id='type-id-1690' size-in-bits='64' id='type-id-1692'/>
+    <pointer-type-def type-id='type-id-1696' size-in-bits='64' id='type-id-1698'/>
     <!-- const OT::Tag& -->
-    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1693'/>
+    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1699'/>
     <!-- const OT::USHORT -->
-    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1694'/>
+    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1700'/>
     <!-- const OT::USHORT& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1700' size-in-bits='64' id='type-id-1701'/>
     <!-- const OT::USHORT* -->
-    <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1696'/>
+    <pointer-type-def type-id='type-id-1700' size-in-bits='64' id='type-id-1702'/>
     <!-- const OT::Value -->
-    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1697'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1703'/>
     <!-- const OT::Value* -->
-    <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>
+    <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
     <!-- const OT::ValueFormat -->
-    <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1699'/>
+    <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1705'/>
     <!-- const OT::ValueFormat* -->
-    <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>
+    <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
     <!-- const OT::hb_apply_context_t -->
-    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1701'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1707'/>
     <!-- const OT::hb_apply_context_t* -->
-    <pointer-type-def type-id='type-id-1701' size-in-bits='64' id='type-id-1702'/>
+    <pointer-type-def type-id='type-id-1707' size-in-bits='64' id='type-id-1708'/>
     <!-- const OT::hb_apply_context_t::matcher_t -->
-    <qualified-type-def type-id='type-id-1325' const='yes' id='type-id-1703'/>
+    <qualified-type-def type-id='type-id-1325' const='yes' id='type-id-1709'/>
     <!-- const OT::hb_apply_context_t::matcher_t* -->
-    <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
+    <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t -->
-    <qualified-type-def type-id='type-id-1327' const='yes' id='type-id-1705'/>
+    <qualified-type-def type-id='type-id-1329' const='yes' id='type-id-1711'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
+    <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t -->
-    <qualified-type-def type-id='type-id-1329' const='yes' id='type-id-1707'/>
+    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1713'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1707' size-in-bits='64' id='type-id-1708'/>
+    <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
     <!-- const OT::hb_closure_context_t -->
-    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1709'/>
+    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1715'/>
     <!-- const OT::hb_closure_context_t* -->
-    <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>
+    <pointer-type-def type-id='type-id-1715' size-in-bits='64' id='type-id-1716'/>
     <!-- const OT::hb_collect_glyphs_context_t -->
-    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1711'/>
+    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1717'/>
     <!-- const OT::hb_collect_glyphs_context_t* -->
-    <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
+    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-1718'/>
     <!-- const OT::hb_would_apply_context_t -->
-    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1713'/>
+    <qualified-type-def type-id='type-id-1343' const='yes' id='type-id-1719'/>
     <!-- const OT::hb_would_apply_context_t* -->
-    <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
+    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
     <!-- const _hb_void_t -->
-    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1715'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1721'/>
     <!-- const _hb_void_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1715' size-in-bits='64' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1721' size-in-bits='64' id='type-id-946'/>
     <!-- const bool -->
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-931'/>
     <!-- const hb_glyph_info_t* -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-1716'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-1722'/>
     <!-- const hb_ot_layout_lookup_accelerator_t -->
-    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1717'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1723'/>
     <!-- const hb_ot_layout_lookup_accelerator_t* -->
-    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-1723' size-in-bits='64' id='type-id-933'/>
     <!-- const hb_ot_map_t -->
-    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1718'/>
+    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1724'/>
     <!-- const hb_ot_map_t* -->
-    <pointer-type-def type-id='type-id-1718' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-960'/>
     <!-- const hb_ot_map_t::feature_map_t -->
-    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-1719'/>
+    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-1725'/>
     <!-- const hb_ot_map_t::feature_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1725' size-in-bits='64' id='type-id-1726'/>
     <!-- const hb_ot_map_t::feature_map_t* -->
-    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-954'/>
+    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-954'/>
     <!-- const hb_ot_map_t::lookup_map_t -->
-    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-1721'/>
+    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-1727'/>
     <!-- const hb_ot_map_t::lookup_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1721' size-in-bits='64' id='type-id-973'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1727' size-in-bits='64' id='type-id-973'/>
     <!-- const hb_ot_map_t::lookup_map_t* -->
-    <pointer-type-def type-id='type-id-1721' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-955'/>
     <!-- const hb_ot_map_t::lookup_map_t** -->
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-965'/>
     <!-- const hb_ot_map_t::stage_map_t -->
-    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-1728'/>
     <!-- const hb_ot_map_t::stage_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-978'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1728' size-in-bits='64' id='type-id-978'/>
     <!-- const hb_ot_shape_plan_t -->
-    <qualified-type-def type-id='type-id-1723' const='yes' id='type-id-1724'/>
+    <qualified-type-def type-id='type-id-1729' const='yes' id='type-id-1730'/>
     <!-- const hb_ot_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-962'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u> -->
-    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1725'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1731'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
-    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-969'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u> -->
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-1726'/>
+    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-1732'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>* -->
-    <pointer-type-def type-id='type-id-1726' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-972'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u> -->
-    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1727'/>
+    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1733'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* -->
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-977'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1728'/>
+    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1734'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* -->
-    <pointer-type-def type-id='type-id-1728' size-in-bits='64' id='type-id-983'/>
+    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-983'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > -->
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1729'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1735'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* -->
-    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-988'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1730'/>
+    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1736'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u>* -->
-    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-989'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1731'/>
+    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1737'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-991'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1732'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1738'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
-    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-993'/>
     <!-- const hb_set_digest_t -->
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1733'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1739'/>
     <!-- const hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-1734'/>
+    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1740'/>
     <!-- const hb_tag_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-1735'/>
+    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-1741'/>
     <!-- const hb_tag_t* -->
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-1736'/>
+    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-1742'/>
     <!-- hb_auto_trace_t<0, const OT::Coverage&>* -->
     <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-942'/>
     <!-- hb_auto_trace_t<0, const _hb_void_t&>* -->
@@ -15687,7 +15693,7 @@ 
     <!-- hb_ot_map_t::lookup_map_t* -->
     <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-971'/>
     <!-- hb_ot_map_t::stage_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1743'/>
     <!-- hb_ot_map_t::stage_map_t* -->
     <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-976'/>
     <!-- hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
@@ -15707,16 +15713,10 @@ 
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-994'/>
     <!-- hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1738'/>
-    <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1740'/>
-    <!-- typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1741' size-in-bits='64' id='type-id-1742'/>
-    <!-- typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1744'/>
-    <!-- void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* -->
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1744'/>
+    <!-- void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
     <pointer-type-def type-id='type-id-1745' size-in-bits='64' id='type-id-957'/>
-    <!-- void (hb_set_t*, const OT::USHORT&, void*)* -->
+    <!-- void(*)(hb_set_t*, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
     <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>
@@ -15760,7 +15760,7 @@ 
     <!-- const OT::Record<OT::Script>::sanitize_closure_t* -->
     <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-1814'/>
     <!-- struct hb_ot_shape_plan_t -->
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1723'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1729'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
         <var-decl name='props' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
@@ -15828,9 +15828,9 @@ 
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -15841,9 +15841,9 @@ 
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -15883,9 +15883,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -15894,9 +15894,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -15905,7 +15905,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -15916,9 +15916,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -15927,9 +15927,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -15949,9 +15949,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -15979,9 +15979,9 @@ 
           <!-- bool OT::AlternateSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT21AlternateSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -15990,7 +15990,7 @@ 
           <!-- const OT::Coverage& OT::AlternateSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT21AlternateSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -15999,9 +15999,9 @@ 
           <!-- void OT::AlternateSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT21AlternateSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -16010,9 +16010,9 @@ 
           <!-- void OT::AlternateSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT21AlternateSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -16032,7 +16032,7 @@ 
           <!-- bool OT::AlternateSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT21AlternateSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -16086,9 +16086,9 @@ 
           <!-- void OT::Anchor::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
           <function-decl name='get_anchor' mangled-name='_ZNK2OT6Anchor10get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Anchor*' -->
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1359' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16139,7 +16139,7 @@ 
             <!-- implicit parameter of type 'const OT::AnchorFormat1*' -->
             <parameter type-id='type-id-517' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16194,7 +16194,7 @@ 
             <!-- implicit parameter of type 'const OT::AnchorFormat2*' -->
             <parameter type-id='type-id-518' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16253,7 +16253,7 @@ 
             <!-- implicit parameter of type 'const OT::AnchorFormat3*' -->
             <parameter type-id='type-id-519' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16304,9 +16304,9 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'bool*' -->
-            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1349'/>
             <!-- const OT::Anchor& -->
-            <return type-id='type-id-1352'/>
+            <return type-id='type-id-1358'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16356,7 +16356,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::EntryExitRecord& -->
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1453'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16384,7 +16384,7 @@ 
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-60'/>
             <!-- const OT::Index* -->
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16395,7 +16395,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Index& -->
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1483'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16543,7 +16543,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::MarkRecord& -->
-            <return type-id='type-id-1527'/>
+            <return type-id='type-id-1533'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16669,7 +16669,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1552'/>
+            <return type-id='type-id-1558'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16771,7 +16771,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1557'/>
+            <return type-id='type-id-1563'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16821,7 +16821,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1559'/>
+            <return type-id='type-id-1565'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16880,7 +16880,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1562'/>
+            <return type-id='type-id-1568'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16930,7 +16930,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
-            <return type-id='type-id-1564'/>
+            <return type-id='type-id-1570'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17004,7 +17004,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1572'/>
+            <return type-id='type-id-1578'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17030,7 +17030,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1574'/>
+            <return type-id='type-id-1580'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17113,7 +17113,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1576'/>
+            <return type-id='type-id-1582'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17261,7 +17261,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1586'/>
+            <return type-id='type-id-1592'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17341,7 +17341,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1590'/>
+            <return type-id='type-id-1596'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17378,7 +17378,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1594'/>
+            <return type-id='type-id-1600'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17428,7 +17428,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1596'/>
+            <return type-id='type-id-1602'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17478,7 +17478,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1599'/>
+            <return type-id='type-id-1605'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17582,7 +17582,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1603'/>
+            <return type-id='type-id-1609'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17630,7 +17630,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::RangeRecord& -->
-            <return type-id='type-id-1620'/>
+            <return type-id='type-id-1626'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17698,7 +17698,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Record<OT::Feature>& -->
-            <return type-id='type-id-1623'/>
+            <return type-id='type-id-1629'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17761,7 +17761,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Record<OT::LangSys>& -->
-            <return type-id='type-id-1625'/>
+            <return type-id='type-id-1631'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17824,7 +17824,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Record<OT::Script>& -->
-            <return type-id='type-id-1627'/>
+            <return type-id='type-id-1633'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17883,7 +17883,7 @@ 
           <!-- unsigned int OT::AttachList::get_attach_points(hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT10AttachList17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AttachList*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1397' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -17956,9 +17956,9 @@ 
           <!-- hb_position_t OT::CaretValue::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT10CaretValue15get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CaretValue*' -->
-            <parameter type-id='type-id-1394' is-artificial='yes'/>
+            <parameter type-id='type-id-1400' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18003,7 +18003,7 @@ 
             <!-- implicit parameter of type 'const OT::CaretValueFormat1*' -->
             <parameter type-id='type-id-449' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18048,7 +18048,7 @@ 
             <!-- implicit parameter of type 'const OT::CaretValueFormat2*' -->
             <parameter type-id='type-id-450' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18097,7 +18097,7 @@ 
             <!-- implicit parameter of type 'const OT::CaretValueFormat3*' -->
             <parameter type-id='type-id-453' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18138,9 +18138,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -18149,9 +18149,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::ChainContext::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18160,9 +18160,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::ChainContext::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -18171,9 +18171,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::ChainContext::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18193,7 +18193,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -18204,9 +18204,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::ChainContext::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -18267,7 +18267,7 @@ 
           <!-- const OT::Coverage& OT::ChainContextFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1858' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -18276,9 +18276,9 @@ 
           <!-- void OT::ChainContextFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1813' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18287,9 +18287,9 @@ 
           <!-- bool OT::ChainContextFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1846' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18309,7 +18309,7 @@ 
           <!-- bool OT::ChainContextFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1863' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -18320,9 +18320,9 @@ 
           <!-- void OT::ChainContextFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1831' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18362,7 +18362,7 @@ 
           <!-- const OT::Coverage& OT::ChainContextFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1961' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -18371,9 +18371,9 @@ 
           <!-- bool OT::ChainContextFormat2::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1942' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18393,7 +18393,7 @@ 
           <!-- bool OT::ChainContextFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1966' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -18404,9 +18404,9 @@ 
           <!-- void OT::ChainContextFormat2::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1896' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18415,9 +18415,9 @@ 
           <!-- void OT::ChainContextFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1921' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18453,7 +18453,7 @@ 
           <!-- const OT::Coverage& OT::ChainContextFormat3::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat312get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2081' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -18462,9 +18462,9 @@ 
           <!-- void OT::ChainContextFormat3::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2020' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18473,9 +18473,9 @@ 
           <!-- bool OT::ChainContextFormat3::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18495,7 +18495,7 @@ 
           <!-- bool OT::ChainContextFormat3::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat35applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2087' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -18506,9 +18506,9 @@ 
           <!-- void OT::ChainContextFormat3::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2042' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18550,9 +18550,9 @@ 
           <!-- void OT::ChainRule::closure(OT::hb_closure_context_t*, OT::ChainContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT9ChainRule7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1675' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ChainContextClosureLookupContext&' -->
             <parameter type-id='type-id-1085'/>
             <!-- void -->
@@ -18563,9 +18563,9 @@ 
           <!-- bool OT::ChainRule::would_apply(OT::hb_would_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT9ChainRule11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1703' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
             <parameter type-id='type-id-1083'/>
             <!-- bool -->
@@ -18587,7 +18587,7 @@ 
           <!-- bool OT::ChainRule::apply(OT::hb_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT9ChainRule5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1716' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
@@ -18600,9 +18600,9 @@ 
           <!-- void OT::ChainRule::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ChainContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9ChainRule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1689' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ChainContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1087'/>
             <!-- void -->
@@ -18635,9 +18635,9 @@ 
           <!-- bool OT::ChainRuleSet::would_apply(OT::hb_would_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT12ChainRuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1776' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
             <parameter type-id='type-id-1083'/>
             <!-- bool -->
@@ -18648,9 +18648,9 @@ 
           <!-- void OT::ChainRuleSet::closure(OT::hb_closure_context_t*, OT::ChainContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT12ChainRuleSet7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1760' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ChainContextClosureLookupContext&' -->
             <parameter type-id='type-id-1085'/>
             <!-- void -->
@@ -18661,9 +18661,9 @@ 
           <!-- void OT::ChainRuleSet::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ChainContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT12ChainRuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1768' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ChainContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1087'/>
             <!-- void -->
@@ -18674,7 +18674,7 @@ 
           <!-- bool OT::ChainRuleSet::apply(OT::hb_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT12ChainRuleSet5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1787' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
@@ -18726,7 +18726,7 @@ 
           <!-- unsigned int OT::ClassDef::get_class(hb_codepoint_t) -->
           <function-decl name='get_class' mangled-name='_ZNK2OT8ClassDef9get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1050' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -18737,7 +18737,7 @@ 
           <!-- bool OT::ClassDef::intersects_class(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_class' mangled-name='_ZNK2OT8ClassDef16intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1077' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18750,7 +18750,7 @@ 
           <!-- void OT::ClassDef::add_class(hb_set_t*, unsigned int) -->
           <function-decl name='add_class' mangled-name='_ZNK2OT8ClassDef9add_classEP8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1069' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18835,7 +18835,7 @@ 
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > OT::ClassDefFormat2::rangeRecord -->
-          <var-decl name='rangeRecord' type-id='type-id-1679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
+          <var-decl name='rangeRecord' type-id='type-id-1685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDefFormat2::min_size -->
@@ -18845,7 +18845,7 @@ 
           <!-- void OT::ClassDefFormat2::add_class<hb_set_t>(hb_set_t*, unsigned int) -->
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1008' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18858,7 +18858,7 @@ 
           <!-- unsigned int OT::ClassDefFormat2::get_class(hb_codepoint_t) -->
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat29get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='994' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -18880,7 +18880,7 @@ 
           <!-- bool OT::ClassDefFormat2::intersects_class(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_class' mangled-name='_ZNK2OT15ClassDefFormat216intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1015' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18921,9 +18921,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::Context::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -18932,9 +18932,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::Context::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18943,9 +18943,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::Context::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -18954,9 +18954,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Context::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18976,7 +18976,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::Context::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -18987,9 +18987,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::Context::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -19071,7 +19071,7 @@ 
           <!-- const OT::Coverage& OT::ContextFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -19080,9 +19080,9 @@ 
           <!-- void OT::ContextFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1251' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19091,9 +19091,9 @@ 
           <!-- bool OT::ContextFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1285' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19113,7 +19113,7 @@ 
           <!-- bool OT::ContextFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1302' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -19124,9 +19124,9 @@ 
           <!-- void OT::ContextFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19158,7 +19158,7 @@ 
           <!-- const OT::Coverage& OT::ContextFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -19167,9 +19167,9 @@ 
           <!-- bool OT::ContextFormat2::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1374' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19189,7 +19189,7 @@ 
           <!-- bool OT::ContextFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1393' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -19200,9 +19200,9 @@ 
           <!-- void OT::ContextFormat2::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1337' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19211,9 +19211,9 @@ 
           <!-- void OT::ContextFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19260,7 +19260,7 @@ 
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
             <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19271,7 +19271,7 @@ 
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
             <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19304,7 +19304,7 @@ 
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
             <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19433,9 +19433,9 @@ 
           <!-- void OT::Coverage::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19444,7 +19444,7 @@ 
           <!-- bool OT::Coverage::intersects_coverage(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT8Coverage19intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19457,7 +19457,7 @@ 
           <!-- unsigned int OT::Coverage::get_coverage(hb_codepoint_t) -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT8Coverage12get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='808' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -19468,7 +19468,7 @@ 
           <!-- void OT::Coverage::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' mangled-name='_ZNK2OT8Coverage12add_coverageI8hb_set_tEEvPT_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -19479,7 +19479,7 @@ 
           <!-- bool OT::Coverage::intersects(const hb_set_t*) -->
           <function-decl name='intersects' mangled-name='_ZNK2OT8Coverage10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='845' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- bool -->
@@ -19503,7 +19503,7 @@ 
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1845' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19531,7 +19531,7 @@ 
           <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1125'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat1* OT::CoverageFormat1::Iter::c -->
-              <var-decl name='c' type-id='type-id-1435' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-1441' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat1::Iter::i -->
@@ -19561,7 +19561,7 @@ 
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
                 <parameter type-id='type-id-1126' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::CoverageFormat1&' -->
-                <parameter type-id='type-id-1434'/>
+                <parameter type-id='type-id-1440'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -19592,7 +19592,7 @@ 
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::CoverageFormat1::glyphArray -->
-          <var-decl name='glyphArray' type-id='type-id-1676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
+          <var-decl name='glyphArray' type-id='type-id-1682' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CoverageFormat1::min_size -->
@@ -19602,9 +19602,9 @@ 
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19613,7 +19613,7 @@ 
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -19624,7 +19624,7 @@ 
           <!-- unsigned int OT::CoverageFormat1::get_coverage(hb_codepoint_t) -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat112get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -19635,7 +19635,7 @@ 
           <!-- bool OT::CoverageFormat1::intersects_coverage(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat119intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='659' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19661,7 +19661,7 @@ 
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-1846' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19689,7 +19689,7 @@ 
           <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1128'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat2* OT::CoverageFormat2::Iter::c -->
-              <var-decl name='c' type-id='type-id-1438' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-1444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat2::Iter::i -->
@@ -19727,7 +19727,7 @@ 
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
                 <parameter type-id='type-id-1129' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::CoverageFormat2&' -->
-                <parameter type-id='type-id-1437'/>
+                <parameter type-id='type-id-1443'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -19758,7 +19758,7 @@ 
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > OT::CoverageFormat2::rangeRecord -->
-          <var-decl name='rangeRecord' type-id='type-id-1679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
+          <var-decl name='rangeRecord' type-id='type-id-1685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CoverageFormat2::min_size -->
@@ -19768,9 +19768,9 @@ 
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19779,7 +19779,7 @@ 
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -19790,7 +19790,7 @@ 
           <!-- unsigned int OT::CoverageFormat2::get_coverage(hb_codepoint_t) -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat212get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -19801,7 +19801,7 @@ 
           <!-- bool OT::CoverageFormat2::intersects_coverage(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat219intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19827,7 +19827,7 @@ 
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-1847' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19871,9 +19871,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::CursivePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -19882,7 +19882,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::CursivePos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -19893,9 +19893,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::CursivePos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -19934,7 +19934,7 @@ 
           <!-- const OT::Coverage& OT::CursivePosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT17CursivePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='882' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -19943,9 +19943,9 @@ 
           <!-- void OT::CursivePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17CursivePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19965,7 +19965,7 @@ 
           <!-- bool OT::CursivePosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT17CursivePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='887' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -20032,7 +20032,7 @@ 
             <!-- implicit parameter of type 'const OT::Device*' -->
             <parameter type-id='type-id-451' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- typedef hb_position_t -->
             <return type-id='type-id-103'/>
           </function-decl>
@@ -20043,7 +20043,7 @@ 
             <!-- implicit parameter of type 'const OT::Device*' -->
             <parameter type-id='type-id-451' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- typedef hb_position_t -->
             <return type-id='type-id-103'/>
           </function-decl>
@@ -20104,18 +20104,18 @@ 
           <!-- const OT::PosLookupSubTable& OT::Extension<OT::ExtensionPos>::get_subtable<OT::PosLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::PosLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- const OT::PosLookupSubTable& -->
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionPos>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -20124,7 +20124,7 @@ 
           <!-- unsigned int OT::Extension<OT::ExtensionPos>::get_offset() -->
           <function-decl name='get_offset' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE10get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20133,7 +20133,7 @@ 
           <!-- unsigned int OT::Extension<OT::ExtensionPos>::get_type() -->
           <function-decl name='get_type' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2200' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20153,9 +20153,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Extension<OT::ExtensionPos>::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -20164,7 +20164,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::Extension<OT::ExtensionPos>::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -20206,18 +20206,18 @@ 
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -20226,9 +20226,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -20237,9 +20237,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -20248,7 +20248,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -20259,9 +20259,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -20270,7 +20270,7 @@ 
           <!-- unsigned int OT::Extension<OT::ExtensionSubst>::get_offset() -->
           <function-decl name='get_offset' mangled-name='_ZNK2OT9ExtensionINS_14ExtensionSubstEE10get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20279,7 +20279,7 @@ 
           <!-- unsigned int OT::Extension<OT::ExtensionSubst>::get_type() -->
           <function-decl name='get_type' mangled-name='_ZNK2OT9ExtensionINS_14ExtensionSubstEE8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2200' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20310,18 +20310,18 @@ 
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -20385,14 +20385,14 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1139'/>
       </class-decl>
       <!-- struct OT::ExtensionSubst -->
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1454'>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1460'>
         <!-- struct OT::Extension<OT::ExtensionSubst> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1141'/>
         <member-function access='public'>
           <!-- bool OT::ExtensionSubst::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT14ExtensionSubst10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='924' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ExtensionSubst*' -->
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20406,7 +20406,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IndexArray OT::Feature::lookupIndex -->
-          <var-decl name='lookupIndex' type-id='type-id-1479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-1485' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Feature::min_size -->
@@ -20431,7 +20431,7 @@ 
             <!-- implicit parameter of type 'const OT::Feature*' -->
             <parameter type-id='type-id-477' is-artificial='yes'/>
             <!-- const OT::FeatureParams& -->
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -20498,11 +20498,11 @@ 
           <!-- const OT::FeatureParamsSize& OT::FeatureParams::get_size_params(hb_tag_t) -->
           <function-decl name='get_size_params' mangled-name='_ZNK2OT13FeatureParams15get_size_paramsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::FeatureParams*' -->
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
             <parameter type-id='type-id-184'/>
             <!-- const OT::FeatureParamsSize& -->
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1470'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -20662,7 +20662,7 @@ 
           <!-- bool OT::GDEF::has_glyph_classes() -->
           <function-decl name='has_glyph_classes' mangled-name='_ZNK2OT4GDEF17has_glyph_classesEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20671,7 +20671,7 @@ 
           <!-- bool OT::GDEF::mark_set_covers(unsigned int, hb_codepoint_t) -->
           <function-decl name='mark_set_covers' mangled-name='_ZNK2OT4GDEF15mark_set_coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -20684,7 +20684,7 @@ 
           <!-- unsigned int OT::GDEF::get_glyph_class(hb_codepoint_t) -->
           <function-decl name='get_glyph_class' mangled-name='_ZNK2OT4GDEF15get_glyph_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -20695,7 +20695,7 @@ 
           <!-- unsigned int OT::GDEF::get_mark_attachment_type(hb_codepoint_t) -->
           <function-decl name='get_mark_attachment_type' mangled-name='_ZNK2OT4GDEF24get_mark_attachment_typeEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -20706,9 +20706,9 @@ 
           <!-- unsigned int OT::GDEF::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT4GDEF14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -20727,7 +20727,7 @@ 
           <!-- unsigned int OT::GDEF::get_attach_points(hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT4GDEF17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -20744,7 +20744,7 @@ 
           <!-- void OT::GDEF::get_glyphs_in_class(unsigned int, hb_set_t*) -->
           <function-decl name='get_glyphs_in_class' mangled-name='_ZNK2OT4GDEF19get_glyphs_in_classEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -20757,7 +20757,7 @@ 
           <!-- unsigned int OT::GDEF::get_glyph_props(hb_codepoint_t) -->
           <function-decl name='get_glyph_props' mangled-name='_ZNK2OT4GDEF15get_glyph_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -20796,9 +20796,9 @@ 
           <!-- void OT::GPOS::position_finish(hb_buffer_t*) -->
           <function-decl name='position_finish' mangled-name='_ZN2OT4GPOS15position_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1524' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20807,9 +20807,9 @@ 
           <!-- void OT::GPOS::position_start(hb_buffer_t*) -->
           <function-decl name='position_start' mangled-name='_ZN2OT4GPOS14position_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1523' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20818,7 +20818,7 @@ 
           <!-- const OT::PosLookup& OT::GPOS::get_lookup(unsigned int) -->
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1520' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GPOS*' -->
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::PosLookup& -->
@@ -20857,9 +20857,9 @@ 
           <!-- void OT::GSUB::substitute_finish(hb_buffer_t*) -->
           <function-decl name='substitute_finish' mangled-name='_ZN2OT4GSUB17substitute_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1325' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20868,9 +20868,9 @@ 
           <!-- void OT::GSUB::substitute_start(hb_buffer_t*) -->
           <function-decl name='substitute_start' mangled-name='_ZN2OT4GSUB16substitute_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20879,7 +20879,7 @@ 
           <!-- const OT::SubstLookup& OT::GSUB::get_lookup(unsigned int) -->
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GSUB10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1321' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUB*' -->
-            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::SubstLookup& -->
@@ -20936,18 +20936,18 @@ 
           <!-- const OT::Lookup& OT::GSUBGPOS::get_lookup(unsigned int) -->
           <function-decl name='get_lookup' mangled-name='_ZNK2OT8GSUBGPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2291' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Lookup& -->
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::GSUBGPOS::get_feature_count() -->
           <function-decl name='get_feature_count' mangled-name='_ZNK2OT8GSUBGPOS17get_feature_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20956,18 +20956,18 @@ 
           <!-- const OT::Feature& OT::GSUBGPOS::get_feature(unsigned int) -->
           <function-decl name='get_feature' mangled-name='_ZNK2OT8GSUBGPOS11get_featureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2284' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Feature& -->
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::GSUBGPOS::get_feature_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_feature_tags' mangled-name='_ZNK2OT8GSUBGPOS16get_feature_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2280' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -20982,7 +20982,7 @@ 
           <!-- unsigned int OT::GSUBGPOS::get_script_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_script_tags' mangled-name='_ZNK2OT8GSUBGPOS15get_script_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2267' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -20997,7 +20997,7 @@ 
           <!-- unsigned int OT::GSUBGPOS::get_lookup_count() -->
           <function-decl name='get_lookup_count' mangled-name='_ZNK2OT8GSUBGPOS16get_lookup_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -21006,7 +21006,7 @@ 
           <!-- bool OT::GSUBGPOS::find_script_index(hb_tag_t, unsigned int*) -->
           <function-decl name='find_script_index' mangled-name='_ZNK2OT8GSUBGPOS17find_script_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
             <parameter type-id='type-id-184'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -21019,18 +21019,18 @@ 
           <!-- const OT::Script& OT::GSUBGPOS::get_script(unsigned int) -->
           <function-decl name='get_script' mangled-name='_ZNK2OT8GSUBGPOS10get_scriptEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2271' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Script& -->
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- hb_tag_t OT::GSUBGPOS::get_feature_tag(unsigned int) -->
           <function-decl name='get_feature_tag' mangled-name='_ZNK2OT8GSUBGPOS15get_feature_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2278' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef hb_tag_t -->
@@ -21131,14 +21131,14 @@ 
         </data-member>
       </class-decl>
       <!-- struct OT::IndexArray -->
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1479'>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1485'>
         <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1015'/>
         <member-function access='public'>
           <!-- unsigned int OT::IndexArray::get_indexes(unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_indexes' mangled-name='_ZNK2OT10IndexArray11get_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IndexArray*' -->
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
+            <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -21164,7 +21164,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IndexArray OT::LangSys::featureIndex -->
-          <var-decl name='featureIndex' type-id='type-id-1479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-1485' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LangSys::min_size -->
@@ -21266,9 +21266,9 @@ 
           <!-- unsigned int OT::LigCaretList::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT12LigCaretList14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigCaretList*' -->
-            <parameter type-id='type-id-1486' is-artificial='yes'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -21309,9 +21309,9 @@ 
           <!-- unsigned int OT::LigGlyph::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT8LigGlyph14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigGlyph*' -->
-            <parameter type-id='type-id-1489' is-artificial='yes'/>
+            <parameter type-id='type-id-1495' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -21345,9 +21345,9 @@ 
           <!-- void OT::Ligature::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT8Ligature7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21356,9 +21356,9 @@ 
           <!-- void OT::Ligature::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Ligature14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21367,9 +21367,9 @@ 
           <!-- bool OT::Ligature::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT8Ligature11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21389,7 +21389,7 @@ 
           <!-- bool OT::Ligature::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT8Ligature5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -21428,9 +21428,9 @@ 
           <!-- void OT::LigatureSet::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT11LigatureSet7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21439,9 +21439,9 @@ 
           <!-- void OT::LigatureSet::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11LigatureSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21450,9 +21450,9 @@ 
           <!-- bool OT::LigatureSet::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT11LigatureSet11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21472,7 +21472,7 @@ 
           <!-- bool OT::LigatureSet::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT11LigatureSet5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -21522,9 +21522,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -21533,9 +21533,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -21544,7 +21544,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -21555,9 +21555,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -21566,9 +21566,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -21588,9 +21588,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -21641,7 +21641,7 @@ 
           <!-- const OT::Coverage& OT::LigatureSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20LigatureSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='802' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -21650,9 +21650,9 @@ 
           <!-- void OT::LigatureSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT20LigatureSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21661,9 +21661,9 @@ 
           <!-- void OT::LigatureSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20LigatureSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='792' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21672,9 +21672,9 @@ 
           <!-- bool OT::LigatureSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT20LigatureSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='807' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21694,7 +21694,7 @@ 
           <!-- bool OT::LigatureSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT20LigatureSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='817' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -21841,7 +21841,7 @@ 
           <!-- bool OT::MarkArray::apply(OT::hb_apply_context_t*, unsigned int, unsigned int, const OT::AnchorMatrix&, unsigned int, unsigned int) -->
           <function-decl name='apply' mangled-name='_ZNK2OT9MarkArray5applyEPNS_18hb_apply_context_tEjjRKNS_12AnchorMatrixEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='393' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkArray*' -->
-            <parameter type-id='type-id-1508' is-artificial='yes'/>
+            <parameter type-id='type-id-1514' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'unsigned int' -->
@@ -21849,7 +21849,7 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'const OT::AnchorMatrix&' -->
-            <parameter type-id='type-id-1358'/>
+            <parameter type-id='type-id-1364'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int' -->
@@ -21882,9 +21882,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -21893,7 +21893,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -21904,9 +21904,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -21972,7 +21972,7 @@ 
             <!-- implicit parameter of type 'const OT::MarkBasePosFormat1*' -->
             <parameter type-id='type-id-526' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22027,7 +22027,7 @@ 
           <!-- bool OT::MarkGlyphSets::covers(unsigned int, hb_codepoint_t) -->
           <function-decl name='covers' mangled-name='_ZNK2OT13MarkGlyphSets6coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkGlyphSets*' -->
-            <parameter type-id='type-id-1515' is-artificial='yes'/>
+            <parameter type-id='type-id-1521' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -22066,7 +22066,7 @@ 
           <!-- bool OT::MarkGlyphSetsFormat1::covers(unsigned int, hb_codepoint_t) -->
           <function-decl name='covers' mangled-name='_ZNK2OT20MarkGlyphSetsFormat16coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkGlyphSetsFormat1*' -->
-            <parameter type-id='type-id-1517' is-artificial='yes'/>
+            <parameter type-id='type-id-1523' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -22110,9 +22110,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22121,7 +22121,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -22132,9 +22132,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22200,7 +22200,7 @@ 
             <!-- implicit parameter of type 'const OT::MarkLigPosFormat1*' -->
             <parameter type-id='type-id-529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22251,9 +22251,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22262,7 +22262,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -22273,9 +22273,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22341,7 +22341,7 @@ 
             <!-- implicit parameter of type 'const OT::MarkMarkPosFormat1*' -->
             <parameter type-id='type-id-530' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22424,9 +22424,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22435,9 +22435,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -22446,7 +22446,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -22457,9 +22457,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22468,9 +22468,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22490,9 +22490,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22520,9 +22520,9 @@ 
           <!-- bool OT::MultipleSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT20MultipleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22531,7 +22531,7 @@ 
           <!-- const OT::Coverage& OT::MultipleSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20MultipleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -22540,9 +22540,9 @@ 
           <!-- void OT::MultipleSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT20MultipleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22551,9 +22551,9 @@ 
           <!-- void OT::MultipleSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20MultipleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22573,7 +22573,7 @@ 
           <!-- bool OT::MultipleSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT20MultipleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -22597,7 +22597,7 @@ 
           <!-- bool OT::Offset<OT::IntType<short unsigned int, 2u> >::is_null() -->
           <function-decl name='is_null' mangled-name='_ZNK2OT6OffsetINS_7IntTypeItLj2EEEE7is_nullEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Offset<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1541' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22704,11 +22704,11 @@ 
           <!-- const OT::AnchorMatrix& OT::OffsetListOf<OT::AnchorMatrix>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_12AnchorMatrixEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetListOf<OT::AnchorMatrix>*' -->
-            <parameter type-id='type-id-1538' is-artificial='yes'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::AnchorMatrix& -->
-            <return type-id='type-id-1358'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22720,11 +22720,11 @@ 
           <!-- const OT::Lookup& OT::OffsetListOf<OT::Lookup>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_6LookupEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetListOf<OT::Lookup>*' -->
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
+            <parameter type-id='type-id-1547' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Lookup& -->
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22791,7 +22791,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Anchor& -->
-            <return type-id='type-id-1352'/>
+            <return type-id='type-id-1358'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22839,7 +22839,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::AnchorMatrix& -->
-            <return type-id='type-id-1358'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22889,7 +22889,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1361'/>
+            <return type-id='type-id-1367'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22937,7 +22937,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::AttachList& -->
-            <return type-id='type-id-1390'/>
+            <return type-id='type-id-1396'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22985,7 +22985,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::CaretValue& -->
-            <return type-id='type-id-1393'/>
+            <return type-id='type-id-1399'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23033,7 +23033,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ChainRule& -->
-            <return type-id='type-id-1410'/>
+            <return type-id='type-id-1416'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23081,7 +23081,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ChainRuleSet& -->
-            <return type-id='type-id-1413'/>
+            <return type-id='type-id-1419'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23129,7 +23129,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ClassDef& -->
-            <return type-id='type-id-1416'/>
+            <return type-id='type-id-1422'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23286,7 +23286,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Device& -->
-            <return type-id='type-id-1445'/>
+            <return type-id='type-id-1451'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23349,7 +23349,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Feature& -->
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23399,7 +23399,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::FeatureParams& -->
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23449,7 +23449,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LangSys& -->
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23497,7 +23497,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LigCaretList& -->
-            <return type-id='type-id-1485'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23545,7 +23545,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LigGlyph& -->
-            <return type-id='type-id-1488'/>
+            <return type-id='type-id-1494'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23593,7 +23593,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Ligature& -->
-            <return type-id='type-id-1491'/>
+            <return type-id='type-id-1497'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23654,7 +23654,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LigatureSet& -->
-            <return type-id='type-id-1494'/>
+            <return type-id='type-id-1500'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23715,7 +23715,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Lookup& -->
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23763,7 +23763,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::MarkArray& -->
-            <return type-id='type-id-1507'/>
+            <return type-id='type-id-1513'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23811,7 +23811,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::MarkGlyphSets& -->
-            <return type-id='type-id-1514'/>
+            <return type-id='type-id-1520'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23874,7 +23874,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::OffsetListOf<OT::AnchorMatrix>& -->
-            <return type-id='type-id-1537'/>
+            <return type-id='type-id-1543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23909,7 +23909,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::OffsetListOf<OT::Lookup>& -->
-            <return type-id='type-id-1540'/>
+            <return type-id='type-id-1546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24046,7 +24046,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::PairSet& -->
-            <return type-id='type-id-1611'/>
+            <return type-id='type-id-1617'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24133,7 +24133,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::PosLookupSubTable& -->
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24168,7 +24168,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::RecordListOf<OT::Feature>& -->
-            <return type-id='type-id-1638'/>
+            <return type-id='type-id-1644'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24216,7 +24216,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::RecordListOf<OT::Script>& -->
-            <return type-id='type-id-1641'/>
+            <return type-id='type-id-1647'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24264,7 +24264,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Rule& -->
-            <return type-id='type-id-1649'/>
+            <return type-id='type-id-1655'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24312,7 +24312,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::RuleSet& -->
-            <return type-id='type-id-1652'/>
+            <return type-id='type-id-1658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24375,7 +24375,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Script& -->
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24410,7 +24410,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Sequence& -->
-            <return type-id='type-id-1660'/>
+            <return type-id='type-id-1666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24510,7 +24510,7 @@ 
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24565,9 +24565,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::PairPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPos*' -->
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -24576,7 +24576,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::PairPos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPos*' -->
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -24587,9 +24587,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PairPos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPos*' -->
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -24658,7 +24658,7 @@ 
             <!-- implicit parameter of type 'const OT::PairPosFormat1*' -->
             <parameter type-id='type-id-533' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24732,7 +24732,7 @@ 
             <!-- implicit parameter of type 'const OT::PairPosFormat2*' -->
             <parameter type-id='type-id-534' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24803,7 +24803,7 @@ 
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-277'/>
             <!-- parameter of type 'const OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-1613'/>
+            <parameter type-id='type-id-1619'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24816,7 +24816,7 @@ 
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700'/>
+            <parameter type-id='type-id-1706'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- bool -->
@@ -24829,9 +24829,9 @@ 
             <!-- implicit parameter of type 'const OT::PairSet*' -->
             <parameter type-id='type-id-514' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700'/>
+            <parameter type-id='type-id-1706'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24845,9 +24845,9 @@ 
           <!-- void OT::PosLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24856,9 +24856,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PosLookup::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -24867,7 +24867,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::PosLookup::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -24878,18 +24878,18 @@ 
           <!-- const OT::PosLookupSubTable& OT::PosLookup::get_subtable(unsigned int) -->
           <function-decl name='get_subtable' mangled-name='_ZNK2OT9PosLookup12get_subtableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1445' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::PosLookupSubTable& -->
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::PosLookup::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT9PosLookup10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1448' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24898,7 +24898,7 @@ 
           <!-- bool OT::PosLookup::apply_once(OT::hb_apply_context_t*) -->
           <function-decl name='apply_once' mangled-name='_ZNK2OT9PosLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1475' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -24920,9 +24920,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PosLookup::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9PosLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1453' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -25013,9 +25013,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::PosLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
@@ -25026,9 +25026,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PosLookupSubTable::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -25039,7 +25039,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::PosLookupSubTable::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'unsigned int' -->
@@ -25088,9 +25088,9 @@ 
           <!-- void OT::RangeRecord::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25099,7 +25099,7 @@ 
           <!-- void OT::RangeRecord::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -25110,7 +25110,7 @@ 
           <!-- int OT::RangeRecord::cmp(hb_codepoint_t) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT11RangeRecord3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- int -->
@@ -25121,7 +25121,7 @@ 
           <!-- bool OT::RangeRecord::intersects(const hb_set_t*) -->
           <function-decl name='intersects' mangled-name='_ZNK2OT11RangeRecord10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- bool -->
@@ -25132,9 +25132,9 @@ 
           <!-- void OT::RangeRecord::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25271,25 +25271,25 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::Feature> -->
-      <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1628'>
+      <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1634'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
         <member-function access='public'>
           <!-- const OT::Tag& OT::RecordArrayOf<OT::Feature>::get_tag(unsigned int) -->
           <function-decl name='get_tag' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE7get_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Tag& -->
-            <return type-id='type-id-1693'/>
+            <return type-id='type-id-1699'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::RecordArrayOf<OT::Feature>::get_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25302,14 +25302,14 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::LangSys> -->
-      <class-decl name='RecordArrayOf&lt;OT::LangSys&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1631'>
+      <class-decl name='RecordArrayOf&lt;OT::LangSys&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1637'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1682'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1688'/>
         <member-function access='public'>
           <!-- bool OT::RecordArrayOf<OT::LangSys>::find_index(unsigned int, unsigned int*) -->
           <function-decl name='find_index' mangled-name='_ZNK2OT13RecordArrayOfINS_7LangSysEE10find_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::LangSys>*' -->
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25322,7 +25322,7 @@ 
           <!-- unsigned int OT::RecordArrayOf<OT::LangSys>::get_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_7LangSysEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::LangSys>*' -->
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25335,14 +25335,14 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::Script> -->
-      <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1634'>
+      <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1640'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1691'/>
         <member-function access='public'>
           <!-- bool OT::RecordArrayOf<OT::Script>::find_index(unsigned int, unsigned int*) -->
           <function-decl name='find_index' mangled-name='_ZNK2OT13RecordArrayOfINS_6ScriptEE10find_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Script>*' -->
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25355,7 +25355,7 @@ 
           <!-- unsigned int OT::RecordArrayOf<OT::Script>::get_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_6ScriptEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Script>*' -->
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25370,16 +25370,16 @@ 
       <!-- struct OT::RecordListOf<OT::Feature> -->
       <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1283'>
         <!-- struct OT::RecordArrayOf<OT::Feature> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1628'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1634'/>
         <member-function access='public'>
           <!-- const OT::Feature& OT::RecordListOf<OT::Feature>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_7FeatureEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordListOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Feature& -->
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25397,16 +25397,16 @@ 
       <!-- struct OT::RecordListOf<OT::Script> -->
       <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1286'>
         <!-- struct OT::RecordArrayOf<OT::Script> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1634'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1640'/>
         <member-function access='public'>
           <!-- const OT::Script& OT::RecordListOf<OT::Script>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_6ScriptEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordListOf<OT::Script>*' -->
-            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Script& -->
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25444,9 +25444,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -25455,9 +25455,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -25466,7 +25466,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -25477,9 +25477,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -25488,9 +25488,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -25510,9 +25510,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -25548,9 +25548,9 @@ 
           <!-- bool OT::ReverseChainSingleSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25559,7 +25559,7 @@ 
           <!-- const OT::Coverage& OT::ReverseChainSingleSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='979' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -25568,9 +25568,9 @@ 
           <!-- void OT::ReverseChainSingleSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='930' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25579,9 +25579,9 @@ 
           <!-- void OT::ReverseChainSingleSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='955' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25601,7 +25601,7 @@ 
           <!-- bool OT::ReverseChainSingleSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -25635,9 +25635,9 @@ 
           <!-- void OT::Rule::closure(OT::hb_closure_context_t*, OT::ContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT4Rule7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ContextClosureLookupContext&' -->
             <parameter type-id='type-id-1112'/>
             <!-- void -->
@@ -25648,9 +25648,9 @@ 
           <!-- bool OT::Rule::would_apply(OT::hb_would_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT4Rule11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1156' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
             <parameter type-id='type-id-1110'/>
             <!-- bool -->
@@ -25672,7 +25672,7 @@ 
           <!-- bool OT::Rule::apply(OT::hb_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT4Rule5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1163' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
@@ -25685,9 +25685,9 @@ 
           <!-- void OT::Rule::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT4Rule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1114'/>
             <!-- void -->
@@ -25720,9 +25720,9 @@ 
           <!-- bool OT::RuleSet::would_apply(OT::hb_would_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT7RuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
             <parameter type-id='type-id-1110'/>
             <!-- bool -->
@@ -25733,9 +25733,9 @@ 
           <!-- void OT::RuleSet::closure(OT::hb_closure_context_t*, OT::ContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT7RuleSet7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ContextClosureLookupContext&' -->
             <parameter type-id='type-id-1112'/>
             <!-- void -->
@@ -25746,9 +25746,9 @@ 
           <!-- void OT::RuleSet::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7RuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1114'/>
             <!-- void -->
@@ -25759,7 +25759,7 @@ 
           <!-- bool OT::RuleSet::apply(OT::hb_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT7RuleSet5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
@@ -25786,7 +25786,7 @@ 
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::GDEF* -->
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1474'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25807,7 +25807,7 @@ 
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::GPOS* -->
-            <return type-id='type-id-1470'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25828,7 +25828,7 @@ 
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::GSUB* -->
-            <return type-id='type-id-1472'/>
+            <return type-id='type-id-1478'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25840,7 +25840,7 @@ 
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::RecordArrayOf<OT::LangSys> OT::Script::langSys -->
-          <var-decl name='langSys' type-id='type-id-1631' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
+          <var-decl name='langSys' type-id='type-id-1637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Script::min_size -->
@@ -25850,9 +25850,9 @@ 
           <!-- const OT::LangSys& OT::Script::get_default_lang_sys() -->
           <function-decl name='get_default_lang_sys' mangled-name='_ZNK2OT6Script20get_default_lang_sysEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- const OT::LangSys& -->
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25872,7 +25872,7 @@ 
           <!-- unsigned int OT::Script::get_lang_sys_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_lang_sys_tags' mangled-name='_ZNK2OT6Script17get_lang_sys_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25887,18 +25887,18 @@ 
           <!-- const OT::LangSys& OT::Script::get_lang_sys(unsigned int) -->
           <function-decl name='get_lang_sys' mangled-name='_ZNK2OT6Script12get_lang_sysEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::LangSys& -->
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::Script::find_lang_sys_index(hb_tag_t, unsigned int*) -->
           <function-decl name='find_lang_sys_index' mangled-name='_ZNK2OT6Script19find_lang_sys_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
             <parameter type-id='type-id-184'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25922,9 +25922,9 @@ 
           <!-- void OT::Sequence::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT8Sequence7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Sequence*' -->
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25933,9 +25933,9 @@ 
           <!-- void OT::Sequence::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Sequence14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Sequence*' -->
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25955,7 +25955,7 @@ 
           <!-- bool OT::Sequence::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT8Sequence5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Sequence*' -->
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -25990,9 +25990,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::SinglePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -26001,7 +26001,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::SinglePos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -26012,9 +26012,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SinglePos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26068,7 +26068,7 @@ 
             <!-- implicit parameter of type 'const OT::SinglePosFormat1*' -->
             <parameter type-id='type-id-531' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26137,7 +26137,7 @@ 
             <!-- implicit parameter of type 'const OT::SinglePosFormat2*' -->
             <parameter type-id='type-id-532' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26192,9 +26192,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -26203,9 +26203,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -26214,7 +26214,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -26225,9 +26225,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::SingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26236,9 +26236,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26258,9 +26258,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -26309,9 +26309,9 @@ 
           <!-- bool OT::SingleSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26320,7 +26320,7 @@ 
           <!-- const OT::Coverage& OT::SingleSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -26329,9 +26329,9 @@ 
           <!-- void OT::SingleSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26340,9 +26340,9 @@ 
           <!-- void OT::SingleSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26362,7 +26362,7 @@ 
           <!-- bool OT::SingleSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -26409,9 +26409,9 @@ 
           <!-- bool OT::SingleSubstFormat2::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26420,7 +26420,7 @@ 
           <!-- const OT::Coverage& OT::SingleSubstFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -26429,9 +26429,9 @@ 
           <!-- void OT::SingleSubstFormat2::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26440,9 +26440,9 @@ 
           <!-- void OT::SingleSubstFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26462,7 +26462,7 @@ 
           <!-- bool OT::SingleSubstFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -26488,14 +26488,14 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1676'>
+      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1682'>
         <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26506,7 +26506,7 @@ 
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26515,14 +26515,14 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1679'>
+      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1685'>
         <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1060'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26533,7 +26533,7 @@ 
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26547,32 +26547,32 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1062'/>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1682'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1688'>
         <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1064'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
             <!-- parameter of type 'const hb_tag_t&' -->
-            <parameter type-id='type-id-1735'/>
+            <parameter type-id='type-id-1741'/>
             <!-- int -->
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1685'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1691'>
         <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
             <!-- parameter of type 'const hb_tag_t&' -->
-            <parameter type-id='type-id-1735'/>
+            <parameter type-id='type-id-1741'/>
             <!-- int -->
             <return type-id='type-id-11'/>
           </function-decl>
@@ -26586,9 +26586,9 @@ 
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26597,9 +26597,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -26608,9 +26608,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26619,9 +26619,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26630,7 +26630,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -26650,11 +26650,11 @@ 
           <!-- bool OT::SubstLookup::would_apply(OT::hb_would_apply_context_t*, const hb_set_digest_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT11SubstLookup11would_applyEPNS_24hb_would_apply_context_tEPK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES3_IS4_ImLj0EES4_ImLj9EEEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'const hb_set_digest_t*' -->
-            <parameter type-id='type-id-1734'/>
+            <parameter type-id='type-id-1740'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26674,7 +26674,7 @@ 
           <!-- bool OT::SubstLookup::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT11SubstLookup10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26683,7 +26683,7 @@ 
           <!-- bool OT::SubstLookup::apply_once(OT::hb_apply_context_t*) -->
           <function-decl name='apply_once' mangled-name='_ZNK2OT11SubstLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -26694,9 +26694,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT11SubstLookup7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1169' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26705,9 +26705,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11SubstLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1176' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26716,18 +26716,18 @@ 
           <!-- const OT::SubstLookupSubTable& OT::SubstLookup::get_subtable(unsigned int) -->
           <function-decl name='get_subtable' mangled-name='_ZNK2OT11SubstLookup12get_subtableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1155' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch_recurse_func<OT::hb_collect_glyphs_context_t>(unsigned int) -->
           <function-decl name='dispatch_recurse_func&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -26738,7 +26738,7 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch_recurse_func<OT::hb_closure_context_t>(unsigned int) -->
           <function-decl name='dispatch_recurse_func&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
@@ -26760,9 +26760,9 @@ 
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26883,7 +26883,7 @@ 
             </data-member>
             <data-member access='public'>
               <!-- OT::ExtensionSubst extension -->
-              <var-decl name='extension' type-id='type-id-1454' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-1460' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
@@ -26903,9 +26903,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
@@ -26916,9 +26916,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_24hb_would_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
@@ -26942,9 +26942,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -26955,9 +26955,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
@@ -26968,7 +26968,7 @@ 
           <!-- OT::hb_apply_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'unsigned int' -->
@@ -26981,9 +26981,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
@@ -27027,7 +27027,7 @@ 
           <!-- bool OT::ValueFormat::has_device() -->
           <function-decl name='has_device' mangled-name='_ZNK2OT11ValueFormat10has_deviceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27036,25 +27036,25 @@ 
           <!-- const OT::SHORT& OT::ValueFormat::get_short() -->
           <function-decl name='get_short' mangled-name='_ZN2OT11ValueFormat9get_shortEPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::Value*' -->
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <!-- const OT::SHORT& -->
-            <return type-id='type-id-1655'/>
+            <return type-id='type-id-1661'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& OT::ValueFormat::get_device() -->
           <function-decl name='get_device' mangled-name='_ZN2OT11ValueFormat10get_deviceEPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::Value*' -->
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1566'/>
+            <return type-id='type-id-1572'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::ValueFormat::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT11ValueFormat8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -27110,7 +27110,7 @@ 
           <!-- unsigned int OT::ValueFormat::get_len() -->
           <function-decl name='get_len' mangled-name='_ZNK2OT11ValueFormat7get_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -27138,15 +27138,15 @@ 
           <!-- void OT::ValueFormat::apply_value(hb_font_t*, hb_direction_t, void*, const OT::Value*, hb_glyph_position_t&) -->
           <function-decl name='apply_value' mangled-name='_ZNK2OT11ValueFormat11apply_valueEP9hb_font_t14hb_direction_tPKvPKNS_7IntTypeItLj2EEER19hb_glyph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const OT::Value*' -->
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <!-- parameter of type 'hb_glyph_position_t&' -->
             <parameter type-id='type-id-98'/>
             <!-- void -->
@@ -27178,8 +27178,8 @@ 
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
-              <typedef-decl name='match_func_t' type-id='type-id-1342' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
+              <!-- typedef bool(*)(hb_codepoint_t, const OT::USHORT&, void*) OT::hb_apply_context_t::matcher_t::match_func_t -->
+              <typedef-decl name='match_func_t' type-id='type-id-1346' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::matcher_t::lookup_props -->
@@ -27290,11 +27290,11 @@ 
               <!-- OT::hb_apply_context_t::matcher_t::may_match_t OT::hb_apply_context_t::matcher_t::may_match(const hb_glyph_info_t&, const OT::USHORT*) -->
               <function-decl name='may_match' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t9may_matchERK15hb_glyph_info_tPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1704' is-artificial='yes'/>
+                <parameter type-id='type-id-1710' is-artificial='yes'/>
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
                 <parameter type-id='type-id-94'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
                 <return type-id='type-id-1886'/>
               </function-decl>
@@ -27303,9 +27303,9 @@ 
               <!-- OT::hb_apply_context_t::matcher_t::may_skip_t OT::hb_apply_context_t::matcher_t::may_skip(const OT::hb_apply_context_t*, const hb_glyph_info_t&) -->
               <function-decl name='may_skip' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t8may_skipEPKS0_RK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1704' is-artificial='yes'/>
+                <parameter type-id='type-id-1710' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-1702'/>
+                <parameter type-id='type-id-1708'/>
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
                 <parameter type-id='type-id-94'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
@@ -27325,7 +27325,7 @@ 
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1327'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1329'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
@@ -27340,7 +27340,7 @@ 
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_backward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::num_items -->
@@ -27350,7 +27350,7 @@ 
               <!-- OT::hb_apply_context_t::skipping_backward_iterator_t::skipping_backward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1324'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27367,7 +27367,7 @@ 
               <!-- bool OT::hb_apply_context_t::skipping_backward_iterator_t::has_no_chance() -->
               <function-decl name='has_no_chance' mangled-name='_ZNK2OT18hb_apply_context_t28skipping_backward_iterator_t13has_no_chanceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='494' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1706' is-artificial='yes'/>
+                <parameter type-id='type-id-1712' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27376,13 +27376,13 @@ 
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*, const OT::USHORT*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
                 <parameter type-id='type-id-1837'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-19'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -27391,7 +27391,7 @@ 
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::set_lookup_props(unsigned int) -->
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-18'/>
                 <!-- void -->
@@ -27402,7 +27402,7 @@ 
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::reject() -->
               <function-decl name='reject' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t6rejectEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -27411,7 +27411,7 @@ 
               <!-- bool OT::hb_apply_context_t::skipping_backward_iterator_t::prev() -->
               <function-decl name='prev' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27420,7 +27420,7 @@ 
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1329'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1331'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
@@ -27435,7 +27435,7 @@ 
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_forward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::num_items -->
@@ -27449,7 +27449,7 @@ 
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1324'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27466,7 +27466,7 @@ 
               <!-- bool OT::hb_apply_context_t::skipping_forward_iterator_t::has_no_chance() -->
               <function-decl name='has_no_chance' mangled-name='_ZNK2OT18hb_apply_context_t27skipping_forward_iterator_t13has_no_chanceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1708' is-artificial='yes'/>
+                <parameter type-id='type-id-1714' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27475,13 +27475,13 @@ 
               <!-- void OT::hb_apply_context_t::skipping_forward_iterator_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*, const OT::USHORT*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
                 <parameter type-id='type-id-1837'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-19'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -27490,7 +27490,7 @@ 
               <!-- bool OT::hb_apply_context_t::skipping_forward_iterator_t::next() -->
               <function-decl name='next' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='426' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27499,7 +27499,7 @@ 
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1888'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27515,8 +27515,8 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1740' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
+          <!-- typedef OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) OT::hb_apply_context_t::recurse_func_t -->
+          <typedef-decl name='recurse_func_t' type-id='type-id-1328' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_apply_context_t::max_debug_depth -->
@@ -27528,7 +27528,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_font_t* OT::hb_apply_context_t::font -->
-          <var-decl name='font' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
+          <var-decl name='font' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_face_t* OT::hb_apply_context_t::face -->
@@ -27536,7 +27536,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_buffer_t* OT::hb_apply_context_t::buffer -->
-          <var-decl name='buffer' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
+          <var-decl name='buffer' type-id='type-id-152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- hb_direction_t OT::hb_apply_context_t::direction -->
@@ -27564,7 +27564,7 @@ 
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <!-- const OT::GDEF& OT::hb_apply_context_t::gdef -->
-          <var-decl name='gdef' type-id='type-id-1467' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1473' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <!-- bool OT::hb_apply_context_t::has_glyph_classes -->
@@ -27582,9 +27582,9 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -27595,7 +27595,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27606,7 +27606,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27617,7 +27617,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27628,7 +27628,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27639,7 +27639,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27650,7 +27650,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27661,7 +27661,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27672,7 +27672,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27683,7 +27683,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27694,7 +27694,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27705,7 +27705,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27716,7 +27716,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27727,7 +27727,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27738,7 +27738,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27749,7 +27749,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27760,7 +27760,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27771,7 +27771,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27782,7 +27782,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27793,7 +27793,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27804,7 +27804,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27813,7 +27813,7 @@ 
           <!-- bool OT::hb_apply_context_t::match_properties_mark(hb_codepoint_t, unsigned int, unsigned int) -->
           <function-decl name='match_properties_mark' mangled-name='_ZNK2OT18hb_apply_context_t21match_properties_markEjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27844,7 +27844,7 @@ 
           <!-- void OT::hb_apply_context_t::output_glyph_for_component(hb_codepoint_t, unsigned int) -->
           <function-decl name='output_glyph_for_component' mangled-name='_ZNK2OT18hb_apply_context_t26output_glyph_for_componentEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27857,7 +27857,7 @@ 
           <!-- void OT::hb_apply_context_t::replace_glyph_inplace(hb_codepoint_t) -->
           <function-decl name='replace_glyph_inplace' mangled-name='_ZNK2OT18hb_apply_context_t21replace_glyph_inplaceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- void -->
@@ -27868,7 +27868,7 @@ 
           <!-- void OT::hb_apply_context_t::replace_glyph_with_ligature(hb_codepoint_t, unsigned int) -->
           <function-decl name='replace_glyph_with_ligature' mangled-name='_ZNK2OT18hb_apply_context_t27replace_glyph_with_ligatureEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27892,7 +27892,7 @@ 
           <!-- bool OT::hb_apply_context_t::stop_sublookup_iteration(OT::hb_apply_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT18hb_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_apply_context_t::return_t' -->
             <parameter type-id='type-id-379'/>
             <!-- bool -->
@@ -27936,7 +27936,7 @@ 
           <!-- void OT::hb_apply_context_t::_set_glyph_props(hb_codepoint_t, unsigned int, bool, bool) -->
           <function-decl name='_set_glyph_props' mangled-name='_ZNK2OT18hb_apply_context_t16_set_glyph_propsEjjbb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27953,7 +27953,7 @@ 
           <!-- void OT::hb_apply_context_t::replace_glyph(hb_codepoint_t) -->
           <function-decl name='replace_glyph' mangled-name='_ZNK2OT18hb_apply_context_t13replace_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- void -->
@@ -27964,9 +27964,9 @@ 
           <!-- bool OT::hb_apply_context_t::check_glyph_property(const hb_glyph_info_t*, unsigned int) -->
           <function-decl name='check_glyph_property' mangled-name='_ZNK2OT18hb_apply_context_t20check_glyph_propertyEPK15hb_glyph_info_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'const hb_glyph_info_t*' -->
-            <parameter type-id='type-id-1716'/>
+            <parameter type-id='type-id-1722'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- bool -->
@@ -27979,7 +27979,7 @@ 
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Lookup&' -->
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1508'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -27992,9 +27992,9 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28007,9 +28007,9 @@ 
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28027,10 +28027,10 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::hb_closure_context_t -->
-      <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1331'>
+      <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1333'>
         <member-type access='public'>
-          <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1742' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
+          <!-- typedef OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) OT::hb_closure_context_t::recurse_func_t -->
+          <typedef-decl name='recurse_func_t' type-id='type-id-1336' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
@@ -28064,7 +28064,7 @@ 
           <!-- OT::hb_closure_context_t::hb_closure_context_t(hb_face_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -28079,9 +28079,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28090,9 +28090,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28101,9 +28101,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28112,9 +28112,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28123,9 +28123,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28134,9 +28134,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28145,9 +28145,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28156,9 +28156,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28167,9 +28167,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28178,9 +28178,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28189,9 +28189,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28200,9 +28200,9 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28211,7 +28211,7 @@ 
           <!-- const char* OT::hb_closure_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT20hb_closure_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -28227,7 +28227,7 @@ 
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT20hb_closure_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
@@ -28238,7 +28238,7 @@ 
           <!-- bool OT::hb_closure_context_t::stop_sublookup_iteration(OT::hb_closure_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT20hb_closure_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1710' is-artificial='yes'/>
+            <parameter type-id='type-id-1716' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_closure_context_t::return_t' -->
             <parameter type-id='type-id-1819'/>
             <!-- bool -->
@@ -28249,7 +28249,7 @@ 
           <!-- void OT::hb_closure_context_t::set_recurse_func(OT::hb_closure_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT20hb_closure_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_closure_context_t::recurse_func_t' -->
             <parameter type-id='type-id-1891'/>
             <!-- void -->
@@ -28258,10 +28258,10 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::hb_collect_glyphs_context_t -->
-      <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1333'>
+      <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1337'>
         <member-type access='public'>
-          <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1744' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
+          <!-- typedef OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) OT::hb_collect_glyphs_context_t::recurse_func_t -->
+          <typedef-decl name='recurse_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_collect_glyphs_context_t::max_debug_depth -->
@@ -28307,7 +28307,7 @@ 
           <!-- OT::hb_collect_glyphs_context_t::hb_collect_glyphs_context_t(hb_face_t*, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -28328,7 +28328,7 @@ 
           <!-- OT::hb_collect_glyphs_context_t::~hb_collect_glyphs_context_t(int) -->
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-11' is-artificial='yes'/>
             <!-- void -->
@@ -28339,9 +28339,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28350,9 +28350,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28361,9 +28361,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28372,9 +28372,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28383,9 +28383,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28394,9 +28394,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28405,9 +28405,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28416,9 +28416,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28427,9 +28427,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28438,9 +28438,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28449,9 +28449,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28460,9 +28460,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28471,9 +28471,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28482,9 +28482,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28493,9 +28493,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28504,9 +28504,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28515,9 +28515,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28526,9 +28526,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28537,9 +28537,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28548,9 +28548,9 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28559,7 +28559,7 @@ 
           <!-- const char* OT::hb_collect_glyphs_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT27hb_collect_glyphs_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -28575,7 +28575,7 @@ 
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT27hb_collect_glyphs_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -28586,7 +28586,7 @@ 
           <!-- bool OT::hb_collect_glyphs_context_t::stop_sublookup_iteration(OT::hb_collect_glyphs_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT27hb_collect_glyphs_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <parameter type-id='type-id-1718' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_collect_glyphs_context_t::return_t' -->
             <parameter type-id='type-id-1819'/>
             <!-- bool -->
@@ -28597,7 +28597,7 @@ 
           <!-- void OT::hb_collect_glyphs_context_t::set_recurse_func(OT::hb_collect_glyphs_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT27hb_collect_glyphs_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_collect_glyphs_context_t::recurse_func_t' -->
             <parameter type-id='type-id-1892'/>
             <!-- void -->
@@ -28606,7 +28606,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct OT::hb_get_coverage_context_t -->
-      <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1335'>
+      <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1341'>
         <member-type access='public'>
           <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
           <typedef-decl name='return_t' type-id='type-id-943' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1818'/>
@@ -28623,7 +28623,7 @@ 
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28632,9 +28632,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28643,9 +28643,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28654,9 +28654,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28665,9 +28665,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28676,9 +28676,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28687,9 +28687,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28698,9 +28698,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28709,9 +28709,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28720,9 +28720,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28731,9 +28731,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28742,9 +28742,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28753,9 +28753,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28764,9 +28764,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28775,9 +28775,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28786,9 +28786,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28797,9 +28797,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28808,9 +28808,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28819,9 +28819,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28830,9 +28830,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28841,9 +28841,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28852,7 +28852,7 @@ 
           <!-- const char* OT::hb_get_coverage_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT25hb_get_coverage_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -28868,7 +28868,7 @@ 
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28877,9 +28877,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28888,9 +28888,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28899,9 +28899,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28910,9 +28910,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28921,9 +28921,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28932,9 +28932,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28943,9 +28943,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28954,9 +28954,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28965,9 +28965,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28976,9 +28976,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28987,9 +28987,9 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28998,16 +28998,16 @@ 
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::hb_would_apply_context_t -->
-      <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1337'>
+      <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1343'>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_would_apply_context_t::max_debug_depth -->
           <var-decl name='max_debug_depth' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='108' column='1'/>
@@ -29036,7 +29036,7 @@ 
           <!-- OT::hb_would_apply_context_t::hb_would_apply_context_t(hb_face_t*, const hb_codepoint_t*, unsigned int, bool) -->
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-160'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
@@ -29053,9 +29053,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29064,9 +29064,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29075,9 +29075,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29086,9 +29086,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29097,9 +29097,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29108,9 +29108,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29119,9 +29119,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29130,9 +29130,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29141,9 +29141,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29152,9 +29152,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29163,9 +29163,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29174,9 +29174,9 @@ 
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29185,7 +29185,7 @@ 
           <!-- const char* OT::hb_would_apply_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT24hb_would_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -29201,7 +29201,7 @@ 
           <!-- bool OT::hb_would_apply_context_t::stop_sublookup_iteration(OT::hb_would_apply_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT24hb_would_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <parameter type-id='type-id-1720' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_would_apply_context_t::return_t' -->
             <parameter type-id='type-id-379'/>
             <!-- bool -->
@@ -29211,12 +29211,12 @@ 
       </class-decl>
       <!-- typedef OT::USHORT OT::Value -->
       <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
-      <!-- typedef OT::Value[1] OT::ValueRecord -->
+      <!-- typedef Value[1] OT::ValueRecord -->
       <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1871'/>
-      <!-- typedef void (hb_set_t*, const OT::USHORT&, void*)* OT::collect_glyphs_func_t -->
+      <!-- typedef void(*)(hb_set_t*, const OT::USHORT&, void*) OT::collect_glyphs_func_t -->
       <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1747' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1839'/>
-      <!-- typedef bool (hb_set_t*, const OT::USHORT&, void*)* OT::intersects_func_t -->
-      <typedef-decl name='intersects_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
+      <!-- typedef bool(*)(hb_set_t*, const OT::USHORT&, void*) OT::intersects_func_t -->
+      <typedef-decl name='intersects_func_t' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
       <!-- struct OT::Supplier<OT::EntryExitRecord> -->
       <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1748'/>
       <!-- struct OT::Supplier<OT::Index> -->
@@ -29378,7 +29378,7 @@ 
     <!-- unsigned int hb_ot_layout_get_ligature_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, int*) -->
     <function-decl name='hb_ot_layout_get_ligature_carets' mangled-name='hb_ot_layout_get_ligature_carets' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_ligature_carets'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -29427,7 +29427,7 @@ 
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-184' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
+      <parameter type-id='type-id-1742' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='232' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
@@ -29602,11 +29602,11 @@ 
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-184' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
+      <parameter type-id='type-id-1742' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
+      <parameter type-id='type-id-1742' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
+      <parameter type-id='type-id-1742' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-964' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <!-- void -->
@@ -29689,7 +29689,7 @@ 
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1739'>
+    <function-type size-in-bits='64' id='type-id-1327'>
       <!-- parameter of type 'OT::hb_apply_context_t*' -->
       <parameter type-id='type-id-1324'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29698,40 +29698,40 @@ 
       <return type-id='type-id-379'/>
     </function-type>
     <!-- bool (hb_set_t*, const OT::USHORT&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1339'>
+    <function-type size-in-bits='64' id='type-id-1347'>
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-964'/>
       <!-- parameter of type 'const OT::USHORT&' -->
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- bool (hb_codepoint_t, const OT::USHORT&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1341'>
+    <function-type size-in-bits='64' id='type-id-1345'>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72'/>
       <!-- parameter of type 'const OT::USHORT&' -->
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1741'>
+    <function-type size-in-bits='64' id='type-id-1335'>
       <!-- parameter of type 'OT::hb_closure_context_t*' -->
-      <parameter type-id='type-id-1332'/>
+      <parameter type-id='type-id-1334'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18'/>
       <!-- typedef OT::hb_closure_context_t::return_t -->
       <return type-id='type-id-1819'/>
     </function-type>
     <!-- OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1743'>
+    <function-type size-in-bits='64' id='type-id-1339'>
       <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-      <parameter type-id='type-id-1334'/>
+      <parameter type-id='type-id-1338'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18'/>
       <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -29742,9 +29742,9 @@ 
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
       <parameter type-id='type-id-962'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
-      <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-153'/>
+      <!-- parameter of type 'hb_buffer_t*' -->
+      <parameter type-id='type-id-152'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-type>
@@ -29753,7 +29753,7 @@ 
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-964'/>
       <!-- parameter of type 'const OT::USHORT&' -->
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- void -->
@@ -30219,13 +30219,13 @@ 
     <!-- OT::SingleSubstFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-561'/>
     <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-551'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1682' size-in-bits='64' id='type-id-551'/>
     <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1682' size-in-bits='64' id='type-id-549'/>
     <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1679' size-in-bits='64' id='type-id-555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1685' size-in-bits='64' id='type-id-555'/>
     <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-553'/>
+    <pointer-type-def type-id='type-id-1685' size-in-bits='64' id='type-id-553'/>
     <!-- OT::SubstLookup* const -->
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-1924'/>
     <!-- OT::SubstLookup* const& -->
@@ -30635,7 +30635,7 @@ 
           <!-- implicit parameter of type 'const indic_shape_plan_t*' -->
           <parameter type-id='type-id-1999' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
+          <parameter type-id='type-id-153'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-119'/>
           <!-- bool -->
@@ -30768,23 +30768,23 @@ 
         <var-decl name='name' type-id='type-id-2013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void (hb_ot_shape_planner_t*)* hb_ot_complex_shaper_t::collect_features -->
+        <!-- void(*hb_ot_complex_shaper_t::collect_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='collect_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (hb_ot_shape_planner_t*)* hb_ot_complex_shaper_t::override_features -->
+        <!-- void(*hb_ot_complex_shaper_t::override_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='override_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void* (const hb_ot_shape_plan_t*)* hb_ot_complex_shaper_t::data_create -->
+        <!-- void*(*hb_ot_complex_shaper_t::data_create)(const hb_ot_shape_plan_t*) -->
         <var-decl name='data_create' type-id='type-id-2018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void (void*)* hb_ot_complex_shaper_t::data_destroy -->
+        <!-- void(*hb_ot_complex_shaper_t::data_destroy)(void*) -->
         <var-decl name='data_destroy' type-id='type-id-44' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* hb_ot_complex_shaper_t::preprocess_text -->
+        <!-- void(*hb_ot_complex_shaper_t::preprocess_text)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='preprocess_text' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
@@ -30792,15 +30792,15 @@ 
         <var-decl name='normalization_preference' type-id='type-id-2014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* hb_ot_complex_shaper_t::decompose -->
+        <!-- bool(*hb_ot_complex_shaper_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* hb_ot_complex_shaper_t::compose -->
+        <!-- bool(*hb_ot_complex_shaper_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* hb_ot_complex_shaper_t::setup_masks -->
+        <!-- void(*hb_ot_complex_shaper_t::setup_masks)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='setup_masks' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
@@ -30820,27 +30820,27 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_buffer_t* hb_ot_shape_normalize_context_t::buffer -->
-        <var-decl name='buffer' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
+        <var-decl name='buffer' type-id='type-id-152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_font_t* hb_ot_shape_normalize_context_t::font -->
-        <var-decl name='font' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
+        <var-decl name='font' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- hb_unicode_funcs_t* hb_ot_shape_normalize_context_t::unicode -->
         <var-decl name='unicode' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* hb_ot_shape_normalize_context_t::decompose -->
+        <!-- bool(*hb_ot_shape_normalize_context_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* hb_ot_shape_normalize_context_t::compose -->
+        <!-- bool(*hb_ot_shape_normalize_context_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_ot_shape_plan_t -->
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1723'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1729'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
         <var-decl name='props' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
@@ -30908,9 +30908,9 @@ 
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -30921,9 +30921,9 @@ 
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -31001,9 +31001,9 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* -->
+    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2020'/>
-    <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* -->
+    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2029' size-in-bits='64' id='type-id-2021'/>
     <!-- const hb_ot_complex_shaper_t -->
     <qualified-type-def type-id='type-id-2016' const='yes' id='type-id-2030'/>
@@ -31022,18 +31022,18 @@ 
     <!-- const hb_shape_plan_t* -->
     <pointer-type-def type-id='type-id-2034' size-in-bits='64' id='type-id-2025'/>
     <!-- hb_ot_shape_plan_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1723' size-in-bits='64' id='type-id-2027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1729' size-in-bits='64' id='type-id-2027'/>
     <!-- hb_ot_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1723' size-in-bits='64' id='type-id-1816'/>
+    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-1816'/>
     <!-- hb_ot_shape_planner_t& -->
     <reference-type-def kind='lvalue' type-id='type-id-2023' size-in-bits='64' id='type-id-2035'/>
     <!-- hb_ot_shape_planner_t* -->
     <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2024'/>
-    <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* -->
+    <!-- void(*)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
     <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-2019'/>
-    <!-- void (hb_ot_shape_planner_t*)* -->
+    <!-- void(*)(hb_ot_shape_planner_t*) -->
     <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2017'/>
-    <!-- void* (const hb_ot_shape_plan_t*)* -->
+    <!-- void*(*)(const hb_ot_shape_plan_t*) -->
     <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-2018'/>
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
@@ -31049,9 +31049,9 @@ 
     <!-- void hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, hb_set_t*) -->
     <function-decl name='hb_ot_shape_glyphs_closure' mangled-name='hb_ot_shape_glyphs_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_glyphs_closure'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31092,9 +31092,9 @@ 
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
       <parameter type-id='type-id-962'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-152'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-type>
@@ -31766,9 +31766,9 @@ 
       <!-- parameter of type 'hb_shape_plan_t*' -->
       <parameter type-id='type-id-194' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31834,9 +31834,9 @@ 
     <!-- hb_bool_t hb_shape_full(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31849,9 +31849,9 @@ 
     <!-- void hb_shape(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) -->
     <function-decl name='hb_shape' mangled-name='hb_shape' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <!-- parameter of type 'unsigned int' -->
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index adff58f8..f29ab0bf 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -7255,7 +7255,7 @@ 
     <typedef-decl name='_IO_lock_t' type-id='type-id-18' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-115'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-100' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-116'/>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-117' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-118'/>
     <!-- typedef int __int32_t -->
     <typedef-decl name='__int32_t' type-id='type-id-13' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-119'/>
@@ -7429,7 +7429,7 @@ 
     <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-44'/>
     <!-- fpos_t* -->
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-192'/>
-    <!-- int (void*, void*)* -->
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-117'/>
     <!-- int& -->
     <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-40'/>
@@ -7465,7 +7465,7 @@ 
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-208'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-41'/>
-    <!-- void ()* -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
     <!-- vtkImageDataLIC2D* -->
     <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-17'/>
@@ -10627,9 +10627,9 @@ 
       <!-- void -->
       <return type-id='type-id-18'/>
     </function-decl>
-    <!-- int atexit(void ()*) -->
+    <!-- int atexit(void (*)(void)) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-210'/>
       <!-- int -->
       <return type-id='type-id-13'/>
@@ -12069,7 +12069,7 @@ 
     <qualified-type-def type-id='type-id-240' const='yes' id='type-id-293'/>
     <!-- const vtkWeakPointer<vtkImageDataLIC2D>* -->
     <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-289'/>
-    <!-- std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)* -->
+    <!-- std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&) -->
     <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
     <!-- vtkImageDataLIC2D& -->
     <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-296'/>
@@ -12400,11 +12400,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-312' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -16332,11 +16332,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-468' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -18085,11 +18085,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-558' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -19329,11 +19329,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-625'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-626' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -22597,11 +22597,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-707' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -26533,11 +26533,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-899'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-900' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 97490f59..67e0c80b 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -2732,13 +2732,13 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* ListAllProcessThreadsCallBack -->
+    <!-- typedef int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) ListAllProcessThreadsCallBack -->
     <typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-77' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-78'/>
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-79'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-79' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-80'/>
-    <!-- int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* -->
+    <!-- int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) -->
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-77'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-82'/>
@@ -3869,9 +3869,9 @@ 
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-decl>
-    <!-- int atexit(void ()*) -->
+    <!-- int atexit(void(*)(void)) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void(*)(void)' -->
       <parameter type-id='type-id-162'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -4237,11 +4237,11 @@ 
         <var-decl name='kHashMultiplier' type-id='type-id-191' visibility='default' filepath='src/addressmap-inl.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <!-- void* (unsigned long int)* AddressMap<HeapProfileTable::AllocValue>::alloc_ -->
+        <!-- void*(*AddressMap<HeapProfileTable::AllocValue>::alloc_)(unsigned long int) -->
         <var-decl name='alloc_' type-id='type-id-192' visibility='default' filepath='src/addressmap-inl.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <!-- void (void*)* AddressMap<HeapProfileTable::AllocValue>::dealloc_ -->
+        <!-- void(*AddressMap<HeapProfileTable::AllocValue>::dealloc_)(void*) -->
         <var-decl name='dealloc_' type-id='type-id-193' visibility='default' filepath='src/addressmap-inl.h' line='252' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
@@ -4249,13 +4249,13 @@ 
         <var-decl name='allocated_' type-id='type-id-194' visibility='default' filepath='src/addressmap-inl.h' line='253' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (unsigned long int)*, void (void*)*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
         <function-decl name='AddressMap' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void (void*)*' -->
+          <!-- parameter of type 'void(*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4273,26 +4273,26 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*)*, void (void*, const HeapProfileTable::AllocInfo&)*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)), void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
         <function-decl name='Iterate&lt;void (*)(const void*, const HeapProfileTable::AllocInfo&amp;)&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&))' -->
           <parameter type-id='type-id-197'/>
-          <!-- parameter of type 'void (void*, const HeapProfileTable::AllocInfo&)*' -->
+          <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
           <parameter type-id='type-id-198'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (unsigned long int)*, void (void*)*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
         <function-decl name='AddressMap' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void (void*)*' -->
+          <!-- parameter of type 'void(*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4310,11 +4310,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void (void*, HeapProfileTable::AllocValue*, char*)*, char*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void(*)(void*, HeapProfileTable::AllocValue*, char*), char*) -->
         <function-decl name='Iterate&lt;char*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, char*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, char*)' -->
           <parameter type-id='type-id-199'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-3'/>
@@ -4334,11 +4334,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)*, HeapProfileTable::AddNonLiveArgs*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*), HeapProfileTable::AddNonLiveArgs*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::AddNonLiveArgs*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)' -->
           <parameter type-id='type-id-201'/>
           <!-- parameter of type 'HeapProfileTable::AddNonLiveArgs*' -->
           <parameter type-id='type-id-202'/>
@@ -4347,11 +4347,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)*, HeapProfileTable::Snapshot*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*), HeapProfileTable::Snapshot*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)' -->
           <parameter type-id='type-id-203'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot*' -->
           <parameter type-id='type-id-204'/>
@@ -4382,11 +4382,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)*, const HeapProfileTable::DumpArgs&) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&), const HeapProfileTable::DumpArgs&) -->
         <function-decl name='Iterate&lt;const HeapProfileTable::DumpArgs&amp;&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)' -->
           <parameter type-id='type-id-207'/>
           <!-- parameter of type 'const HeapProfileTable::DumpArgs&' -->
           <parameter type-id='type-id-208'/>
@@ -4395,11 +4395,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)*, HeapProfileTable::Snapshot::ReportState*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*), HeapProfileTable::Snapshot::ReportState*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot::ReportState*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)' -->
           <parameter type-id='type-id-209'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot::ReportState*' -->
           <parameter type-id='type-id-210'/>
@@ -4437,11 +4437,11 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(typedef size_t (const HeapProfileTable::AllocValue&)*, unsigned long int, void*, void**) -->
+        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(size_t(*)(const HeapProfileTable::AllocValue&), unsigned long int, void*, void**) -->
         <function-decl name='FindInside' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEE10FindInsideEPFmRKS1_EmPKvPS8_' filepath='src/addressmap-inl.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t (const HeapProfileTable::AllocValue&)*' -->
+          <!-- parameter of type 'size_t(*)(const HeapProfileTable::AllocValue&)' -->
           <parameter type-id='type-id-212'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-19'/>
@@ -4507,7 +4507,7 @@ 
     <!-- class GoogleInitializer -->
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-215'>
       <member-type access='private'>
-        <!-- typedef void ()* GoogleInitializer::VoidFunction -->
+        <!-- typedef void(*)(void) GoogleInitializer::VoidFunction -->
         <typedef-decl name='VoidFunction' type-id='type-id-162' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-216'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -4730,7 +4730,7 @@ 
     <!-- class HeapCleaner -->
     <class-decl name='HeapCleaner' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='403' column='1' id='type-id-220'>
       <member-type access='private'>
-        <!-- typedef void ()* HeapCleaner::void_function -->
+        <!-- typedef void(*)(void) HeapCleaner::void_function -->
         <typedef-decl name='void_function' type-id='type-id-162' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-221'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -5734,11 +5734,11 @@ 
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void (const HeapProfileTable::AllocContextInfo&)* HeapProfileTable::AllocContextIterator -->
+        <!-- typedef void(*)(const HeapProfileTable::AllocContextInfo&) HeapProfileTable::AllocContextIterator -->
         <typedef-decl name='AllocContextIterator' type-id='type-id-278' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-277'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void (void*, const HeapProfileTable::AllocInfo&)* HeapProfileTable::AllocIterator -->
+        <!-- typedef void(*)(void*, const HeapProfileTable::AllocInfo&) HeapProfileTable::AllocIterator -->
         <typedef-decl name='AllocIterator' type-id='type-id-198' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-279'/>
       </member-type>
       <member-type access='private'>
@@ -5746,11 +5746,11 @@ 
         <typedef-decl name='AllocationMap' type-id='type-id-182' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-270'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void* (typedef size_t)* HeapProfileTable::Allocator -->
+        <!-- typedef void*(*)(size_t) HeapProfileTable::Allocator -->
         <typedef-decl name='Allocator' type-id='type-id-192' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-271'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void (void*)* HeapProfileTable::DeAllocator -->
+        <!-- typedef void(*)(void*) HeapProfileTable::DeAllocator -->
         <typedef-decl name='DeAllocator' type-id='type-id-193' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-272'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -6601,7 +6601,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::IterateBuckets<HeapProfileTable::BufferArgs*>(HeapProfileTable::BufferArgs*) -->
         <function-decl name='IterateBuckets&lt;HeapProfileTable::BufferArgs*&gt;' filepath='src/memory_region_map.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)*' -->
+          <!-- parameter of type 'void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*)' -->
           <parameter type-id='type-id-314'/>
           <!-- parameter of type 'HeapProfileTable::BufferArgs*' -->
           <parameter type-id='type-id-257'/>
@@ -6612,7 +6612,7 @@ 
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::HandleSavedRegionsLocked() -->
         <function-decl name='HandleSavedRegionsLocked' mangled-name='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE' filepath='src/memory_region_map.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE'>
-          <!-- parameter of type 'void (const MemoryRegionMap::Region&)*' -->
+          <!-- parameter of type 'void(*)(const MemoryRegionMap::Region&)' -->
           <parameter type-id='type-id-315'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -7722,13 +7722,13 @@ 
     <typedef-decl name='LibraryLiveObjectsStacks' type-id='type-id-379' filepath='src/heap-checker.cc' line='397' column='1' id='type-id-380'/>
     <!-- typedef std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > LiveObjectsStack -->
     <typedef-decl name='LiveObjectsStack' type-id='type-id-381' filepath='src/heap-checker.cc' line='384' column='1' id='type-id-382'/>
-    <!-- typedef void (void*)* MallocHook_DeleteHook -->
+    <!-- typedef void(*)(void*) MallocHook_DeleteHook -->
     <typedef-decl name='MallocHook_DeleteHook' type-id='type-id-193' filepath='./src/gperftools/malloc_hook_c.h' line='76' column='1' id='type-id-383'/>
-    <!-- typedef void (void*, void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_MmapHook -->
+    <!-- typedef void(*)(void*, void*, size_t, int, int, int, off_t) MallocHook_MmapHook -->
     <typedef-decl name='MallocHook_MmapHook' type-id='type-id-384' filepath='./src/gperftools/malloc_hook_c.h' line='99' column='1' id='type-id-385'/>
-    <!-- typedef void (void*, typedef size_t)* MallocHook_NewHook -->
+    <!-- typedef void(*)(void*, size_t) MallocHook_NewHook -->
     <typedef-decl name='MallocHook_NewHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='70' column='1' id='type-id-387'/>
-    <!-- typedef void (void*, typedef ptrdiff_t)* MallocHook_SbrkHook -->
+    <!-- typedef void(*)(void*, ptrdiff_t) MallocHook_SbrkHook -->
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-388' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-389'/>
     <!-- typedef int RawFD -->
     <typedef-decl name='RawFD' type-id='type-id-1' filepath='./src/base/logging.h' line='251' column='1' id='type-id-85'/>
@@ -8305,189 +8305,189 @@ 
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-191'/>
     <!-- const unsigned long int* -->
     <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
+    <!-- size_t(*)(const HeapProfileTable::AllocValue&) -->
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-212'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-641'/>
+    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
+    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-643'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>* -->
-    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-646'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-647'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>* -->
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-648'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-650'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-651'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>* -->
-    <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-652'/>
+    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
     <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-653'/>
+    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-654'/>
     <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-654'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-655'/>
     <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>* -->
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-657'/>
     <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-658'/>
     <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>* -->
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-658'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-659'/>
     <!-- std::_Rb_tree_const_iterator<long unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-659'/>
+    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-660'/>
     <!-- std::_Rb_tree_const_iterator<long unsigned int>* -->
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-660'/>
+    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-661'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-662'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-662'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-663'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-664'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >* -->
-    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-665'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-666'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-667'/>
     <!-- std::_Rb_tree_iterator<long unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-668'/>
     <!-- std::_Rb_tree_iterator<long unsigned int>* -->
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-669'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-669'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-670'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-671'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-672'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >* -->
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-672'/>
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-673'/>
     <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-674'/>
     <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-674'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-675'/>
     <!-- std::_Rb_tree_node_base* -->
-    <pointer-type-def type-id='type-id-552' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-552' size-in-bits='64' id='type-id-676'/>
     <!-- std::_Rb_tree_node_base*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
+    <reference-type-def kind='lvalue' type-id='type-id-676' size-in-bits='64' id='type-id-677'/>
     <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-677'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-678'/>
     <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
+    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-680'/>
     <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >* -->
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-680'/>
+    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-681'/>
     <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-683'/>
     <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-683'/>
+    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-684'/>
     <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
+    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
     <!-- std::allocator<void (*)()>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-686'/>
+    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-687'/>
     <!-- std::allocator<void (*)()>* -->
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-687'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-688'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-689'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-690'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider* -->
-    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-692'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& -->
-    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-693'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep* -->
-    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-694'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
-    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-695'/>
     <!-- std::char_traits<char>::char_type& -->
-    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-696'/>
     <!-- std::char_traits<char>::char_type* -->
-    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-696'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-697'/>
     <!-- std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-698'/>
     <!-- std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-699'/>
     <!-- std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-700'/>
     <!-- std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-701'/>
     <!-- std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-702'/>
     <!-- std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-702'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-703'/>
     <!-- std::pair<const long unsigned int, HeapLeakChecker::RangeValue>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-704'/>
     <!-- std::pair<const long unsigned int, HeapLeakChecker::RangeValue>* -->
     <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-353'/>
     <!-- std::pair<const long unsigned int, long unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-705'/>
     <!-- std::pair<const long unsigned int, long unsigned int>* -->
     <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-358'/>
     <!-- std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-706'/>
     <!-- std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >* -->
     <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-363'/>
     <!-- std::pair<long unsigned int, HeapLeakChecker::RangeValue>* -->
-    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-706'/>
+    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-707'/>
     <!-- std::pair<long unsigned int, long unsigned int>* -->
-    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-707'/>
+    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-708'/>
     <!-- std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>* -->
-    <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
     <!-- std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>* -->
-    <pointer-type-def type-id='type-id-710' size-in-bits='64' id='type-id-711'/>
+    <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>* -->
-    <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>* -->
-    <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-715'/>
+    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-716'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>* -->
-    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-717'/>
+    <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-718'/>
     <!-- std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-719'/>
     <!-- std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-720'/>
     <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-721'/>
     <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-722'/>
     <!-- std::vector<void (*)(), std::allocator<void (*)()> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-723'/>
     <!-- std::vector<void (*)(), std::allocator<void (*)()> >* -->
     <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-222'/>
     <!-- std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-723'/>
+    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-724'/>
     <!-- std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-724'/>
-    <!-- typedef size_t (const HeapProfileTable::AllocValue&)* -->
-    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-725'/>
     <!-- unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-726'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-333'/>
-    <!-- void ()* const -->
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-727'/>
-    <!-- void ()* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-728'/>
-    <!-- void ()* const* -->
-    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-729'/>
-    <!-- void ()*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-730'/>
-    <!-- void ()** -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
-    <!-- void ()** const -->
-    <qualified-type-def type-id='type-id-731' const='yes' id='type-id-732'/>
-    <!-- void ()** const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-732' size-in-bits='64' id='type-id-733'/>
-    <!-- void (const HeapProfileTable::AllocContextInfo&)* -->
-    <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-278'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*)* -->
+    <!-- void(*)(const HeapProfileTable::AllocContextInfo&) -->
+    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-278'/>
+    <!-- void(*)(void) const -->
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-728'/>
+    <!-- void(*)(void) const& -->
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
+    <!-- void(*)(void) const* -->
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-730'/>
+    <!-- void(*)(void)& -->
+    <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
+    <!-- void(*)(void)* -->
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-732'/>
+    <!-- void(*)(void)* const -->
+    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
+    <!-- void(*)(void)* const& -->
+    <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-197'/>
-    <!-- void (void*, const HeapProfileTable::AllocInfo&)* -->
+    <!-- void(*)(void*, const HeapProfileTable::AllocInfo&) -->
     <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-198'/>
-    <!-- void (void*, typedef ptrdiff_t)* -->
+    <!-- void(*)(void*, ptrdiff_t) -->
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-388'/>
-    <!-- void (void*, typedef ptrdiff_t)** -->
+    <!-- void(*)(void*, ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-738'/>
-    <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* -->
+    <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-384'/>
-    <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)** -->
+    <!-- void(*)(void*, void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-740'/>
     <!-- void* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-369'/>
@@ -8537,7 +8537,7 @@ 
       <class-decl name='_Rb_tree&lt;long unsigned int, long unsigned int, std::_Identity&lt;long unsigned int&gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;long unsigned int, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-498'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-643'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-644'>
             <!-- class STL_Allocator<std::_Rb_tree_node<long unsigned int>, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-335'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -8556,7 +8556,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8565,7 +8565,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl(const std::less<long unsigned int>&, const STL_Allocator<std::_Rb_tree_node<long unsigned int>, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<long unsigned int>&' -->
                 <parameter type-id='type-id-595'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<long unsigned int>, HeapLeakChecker::Allocator>&' -->
@@ -8578,7 +8578,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE13_Rb_tree_implIS3_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8587,13 +8587,13 @@ 
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-643' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-644' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -8602,7 +8602,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<long unsigned int>&, const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&' -->
@@ -8615,7 +8615,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-500'/>
             <!-- void -->
@@ -8626,7 +8626,7 @@ 
           <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -8664,7 +8664,7 @@ 
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8673,7 +8673,7 @@ 
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8682,7 +8682,7 @@ 
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8691,7 +8691,7 @@ 
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8700,7 +8700,7 @@ 
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<long unsigned int>*, std::_Rb_tree_node<long unsigned int>*, const unsigned long int&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeImESB_RKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
@@ -8715,7 +8715,7 @@ 
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::lower_bound(const unsigned long int&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11lower_boundERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<long unsigned int> -->
@@ -8753,7 +8753,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -8764,7 +8764,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -8775,7 +8775,7 @@ 
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8793,7 +8793,7 @@ 
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_create_node(const unsigned long int&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE14_M_create_nodeERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
@@ -8804,7 +8804,7 @@ 
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<long unsigned int> -->
             <return type-id='type-id-536'/>
           </function-decl>
@@ -8813,18 +8813,18 @@ 
           <!-- std::pair<std::_Rb_tree_iterator<long unsigned int>, bool> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_insert_unique(const unsigned long int&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE16_M_insert_uniqueERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<long unsigned int>, bool> -->
-            <return type-id='type-id-710'/>
+            <return type-id='type-id-711'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeImE'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -8835,7 +8835,7 @@ 
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const unsigned long int&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKm'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -8851,7 +8851,7 @@ 
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-502'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-647'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-648'>
             <!-- class STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-338'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -8870,7 +8870,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8879,7 +8879,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl(const std::less<long unsigned int>&, const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<long unsigned int>&' -->
                 <parameter type-id='type-id-595'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, HeapLeakChecker::Allocator>&' -->
@@ -8892,7 +8892,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE13_Rb_tree_implIS8_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8901,13 +8901,13 @@ 
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-647' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-648' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -8916,7 +8916,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&' -->
@@ -8929,7 +8929,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-504'/>
             <!-- void -->
@@ -8940,7 +8940,7 @@ 
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -8951,7 +8951,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
             <return type-id='type-id-540'/>
           </function-decl>
@@ -8978,7 +8978,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -8987,7 +8987,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -8996,7 +8996,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -9005,7 +9005,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -9014,7 +9014,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_upper_bound(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, const unsigned long int&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS4_ESF_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
@@ -9029,7 +9029,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11upper_boundERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -9049,7 +9049,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, const unsigned long int&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS4_ESF_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
@@ -9073,7 +9073,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE4findERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -9093,7 +9093,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -9111,7 +9111,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -9122,7 +9122,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_create_node(const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_create_nodeERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&' -->
             <parameter type-id='type-id-354'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
@@ -9133,7 +9133,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
             <return type-id='type-id-540'/>
           </function-decl>
@@ -9142,18 +9142,18 @@ 
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_insert_unique(const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE16_M_insert_uniqueERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&' -->
             <parameter type-id='type-id-354'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> -->
-            <return type-id='type-id-712'/>
+            <return type-id='type-id-713'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -9164,7 +9164,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS4_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -9175,7 +9175,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -9191,7 +9191,7 @@ 
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, long unsigned int&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-506'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-651'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-652'>
             <!-- class STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-342'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9210,7 +9210,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9219,7 +9219,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl(const std::less<long unsigned int>&, const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<long unsigned int>&' -->
                 <parameter type-id='type-id-595'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >, HeapLeakChecker::Allocator>&' -->
@@ -9232,7 +9232,7 @@ 
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE13_Rb_tree_implIS6_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9241,13 +9241,13 @@ 
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-651' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-652' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -9256,7 +9256,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&' -->
@@ -9269,7 +9269,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-508'/>
             <!-- void -->
@@ -9280,7 +9280,7 @@ 
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -9291,7 +9291,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -9300,7 +9300,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -9327,7 +9327,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9336,7 +9336,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9345,7 +9345,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9354,7 +9354,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9363,7 +9363,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_upper_bound(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, const unsigned long int&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS2_ESE_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
@@ -9378,7 +9378,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11upper_boundERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -9398,7 +9398,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, const unsigned long int&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS2_ESE_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
@@ -9422,7 +9422,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE4findERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -9451,7 +9451,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -9462,7 +9462,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -9473,7 +9473,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9482,7 +9482,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_create_node(const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_create_nodeERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, long unsigned int>&' -->
             <parameter type-id='type-id-359'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
@@ -9493,18 +9493,18 @@ 
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_insert_unique(const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE16_M_insert_uniqueERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, long unsigned int>&' -->
             <parameter type-id='type-id-359'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> -->
-            <return type-id='type-id-714'/>
+            <return type-id='type-id-715'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::erase(std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE5eraseESt17_Rb_tree_iteratorIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >' -->
             <parameter type-id='type-id-544'/>
             <!-- void -->
@@ -9515,7 +9515,7 @@ 
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS2_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -9526,7 +9526,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS2_'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -9542,7 +9542,7 @@ 
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, STL_Allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-510'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-655'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-656'>
             <!-- class STL_Allocator<std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-346'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9561,7 +9561,7 @@ 
               <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>*' -->
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9570,7 +9570,7 @@ 
               <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>::_Rb_tree_impl(const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&, const STL_Allocator<std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>*' -->
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&' -->
                 <parameter type-id='type-id-599'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, HeapLeakChecker::Allocator>&' -->
@@ -9583,7 +9583,7 @@ 
               <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE13_Rb_tree_implISH_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>*' -->
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9592,13 +9592,13 @@ 
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-655' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-656' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -9607,7 +9607,7 @@ 
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&, const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-599'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&' -->
@@ -9620,7 +9620,7 @@ 
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-512'/>
             <!-- void -->
@@ -9631,7 +9631,7 @@ 
           <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -9642,7 +9642,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -9651,7 +9651,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -9705,7 +9705,7 @@ 
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_put_nodeEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -9716,7 +9716,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9725,7 +9725,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9734,7 +9734,7 @@ 
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE15_M_destroy_nodeEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -9745,7 +9745,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9754,7 +9754,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9772,7 +9772,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9781,7 +9781,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*, std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*, const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE14_M_lower_boundEPSt13_Rb_tree_nodeISD_ESM_RS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
@@ -9796,7 +9796,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::lower_bound(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11lower_boundERS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
@@ -9816,7 +9816,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_create_node(const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE14_M_create_nodeERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-364'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
@@ -9836,18 +9836,18 @@ 
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_rightmost() -->
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_leftmost() -->
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -9863,7 +9863,7 @@ 
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -9874,7 +9874,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSM_RKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSM_RKSD_'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -9889,18 +9889,18 @@ 
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_insert_unique(const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE16_M_insert_uniqueERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE16_M_insert_uniqueERKSD_'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-364'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool> -->
-            <return type-id='type-id-716'/>
+            <return type-id='type-id-717'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_insert_unique_(std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISD_ERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISD_ERKSD_'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >' -->
             <parameter type-id='type-id-529'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
@@ -9918,7 +9918,7 @@ 
           <!-- void std::allocator<void (*)()>::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<void (*)()>*' -->
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -9927,7 +9927,7 @@ 
           <!-- void std::allocator<void (*)()>::allocator(const std::allocator<void (*)()>&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<void (*)()>*' -->
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
             <!-- void -->
@@ -9938,7 +9938,7 @@ 
           <!-- std::allocator<void (*)()>::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<void (*)()>*' -->
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -9950,7 +9950,7 @@ 
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='105' column='1' id='type-id-576'>
         <member-type access='private'>
           <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider -->
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-690'>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-691'>
             <!-- class STL_Allocator<char, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-325'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9961,7 +9961,7 @@ 
               <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider::_Alloc_hider(char*, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider*' -->
-                <parameter type-id='type-id-691' is-artificial='yes'/>
+                <parameter type-id='type-id-692' is-artificial='yes'/>
                 <!-- parameter of type 'char*' -->
                 <parameter type-id='type-id-3'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
@@ -9993,14 +9993,14 @@ 
               <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_S_empty_rep() -->
               <function-decl name='_S_empty_rep' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep12_S_empty_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& -->
-                <return type-id='type-id-692'/>
+                <return type-id='type-id-693'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_set_sharable() -->
               <function-decl name='_M_set_sharable' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep15_M_set_sharableEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -10009,7 +10009,7 @@ 
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_refdata() -->
               <function-decl name='_M_refdata' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_refdataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- char* -->
                 <return type-id='type-id-3'/>
               </function-decl>
@@ -10018,7 +10018,7 @@ 
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_dispose(const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_M_dispose' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_disposeERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- void -->
@@ -10029,7 +10029,7 @@ 
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_set_length_and_sharable(unsigned long int) -->
               <function-decl name='_M_set_length_and_sharable' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep26_M_set_length_and_sharableEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'unsigned long int' -->
                 <parameter type-id='type-id-19'/>
                 <!-- void -->
@@ -10049,7 +10049,7 @@ 
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_refcopy() -->
               <function-decl name='_M_refcopy' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_refcopyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- char* -->
                 <return type-id='type-id-3'/>
               </function-decl>
@@ -10058,7 +10058,7 @@ 
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_clone(const STL_Allocator<char, HeapLeakChecker::Allocator>&, unsigned long int) -->
               <function-decl name='_M_clone' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep8_M_cloneERKS4_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='624' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- parameter of type 'unsigned long int' -->
@@ -10071,7 +10071,7 @@ 
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_grab(const STL_Allocator<char, HeapLeakChecker::Allocator>&, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_M_grab' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep7_M_grabERKS4_S8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
@@ -10084,7 +10084,7 @@ 
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_destroy(const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_M_destroy' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_destroyERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_destroyERKS4_'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- void -->
@@ -10101,7 +10101,7 @@ 
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep* -->
-                <return type-id='type-id-693'/>
+                <return type-id='type-id-694'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -10116,13 +10116,13 @@ 
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_M_dataplus -->
-          <var-decl name='_M_dataplus' type-id='type-id-690' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string() -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10131,7 +10131,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-327'/>
             <!-- void -->
@@ -10142,7 +10142,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC1ERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC1ERKS5_'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- void -->
@@ -10153,7 +10153,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&, unsigned long int, unsigned long int) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -10168,7 +10168,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&, unsigned long int, unsigned long int, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -10185,7 +10185,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const char*, unsigned long int, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-2'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -10200,7 +10200,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const char*, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC2EPKcRKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='213' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC2EPKcRKS4_'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-2'/>
             <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
@@ -10213,7 +10213,7 @@ 
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(unsigned long int, char, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'char' -->
@@ -10228,7 +10228,7 @@ 
           <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::~basic_string(int) -->
           <function-decl name='~basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEED1Ev' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEED1Ev'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -10293,7 +10293,7 @@ 
             <!-- implicit parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
             <parameter type-id='type-id-579' is-artificial='yes'/>
             <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep* -->
-            <return type-id='type-id-693'/>
+            <return type-id='type-id-694'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10331,7 +10331,7 @@ 
           <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_S_empty_rep() -->
           <function-decl name='_S_empty_rep' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE12_S_empty_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& -->
-            <return type-id='type-id-692'/>
+            <return type-id='type-id-693'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -10402,7 +10402,7 @@ 
           <!-- void std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10411,7 +10411,7 @@ 
           <!-- void std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::map(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&' -->
@@ -10424,7 +10424,7 @@ 
           <!-- void std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::map(const std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-602'/>
             <!-- void -->
@@ -10435,18 +10435,18 @@ 
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::insert(const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE6insertERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&' -->
             <parameter type-id='type-id-354'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> -->
-            <return type-id='type-id-712'/>
+            <return type-id='type-id-713'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE4findERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -10457,7 +10457,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE11upper_boundERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -10468,7 +10468,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
             <return type-id='type-id-540'/>
           </function-decl>
@@ -10488,7 +10488,7 @@ 
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10497,7 +10497,7 @@ 
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::map(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&' -->
@@ -10510,7 +10510,7 @@ 
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::map(const std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-605'/>
             <!-- void -->
@@ -10521,7 +10521,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE4findERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -10532,7 +10532,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -10541,7 +10541,7 @@ 
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::erase(std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >) -->
           <function-decl name='erase' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE5eraseESt17_Rb_tree_iteratorIS5_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >' -->
             <parameter type-id='type-id-544'/>
             <!-- void -->
@@ -10552,7 +10552,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -10561,7 +10561,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE11upper_boundERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -10572,11 +10572,11 @@ 
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::insert(const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE6insertERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, long unsigned int>&' -->
             <parameter type-id='type-id-359'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> -->
-            <return type-id='type-id-714'/>
+            <return type-id='type-id-715'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10594,7 +10594,7 @@ 
           <!-- void std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10603,7 +10603,7 @@ 
           <!-- void std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::map(const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&, const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-599'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&' -->
@@ -10616,7 +10616,7 @@ 
           <!-- void std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::map(const std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-608'/>
             <!-- void -->
@@ -10627,7 +10627,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -10636,7 +10636,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -10645,7 +10645,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::lower_bound(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE11lower_boundERSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
@@ -10665,7 +10665,7 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::insert(std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE6insertESt17_Rb_tree_iteratorISF_ERKSF_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >' -->
             <parameter type-id='type-id-548'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
@@ -10678,11 +10678,11 @@ 
           <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >& std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::operator[](const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='operator[]' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EEixERSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='442' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >& -->
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10696,7 +10696,7 @@ 
           <!-- void std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::set() -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10705,7 +10705,7 @@ 
           <!-- void std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::set(const std::less<long unsigned int>&, const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&' -->
@@ -10718,7 +10718,7 @@ 
           <!-- void std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::set(const std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-626'/>
             <!-- void -->
@@ -10729,7 +10729,7 @@ 
           <!-- std::_Rb_tree_const_iterator<long unsigned int> std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::lower_bound(const unsigned long int&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt3setImSt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11lower_boundERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_const_iterator<long unsigned int> -->
@@ -10749,11 +10749,11 @@ 
           <!-- std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool> std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::insert(const unsigned long int&) -->
           <function-decl name='insert' mangled-name='_ZNSt3setImSt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE6insertERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool> -->
-            <return type-id='type-id-708'/>
+            <return type-id='type-id-709'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10765,7 +10765,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10774,7 +10774,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector(const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-321'/>
             <!-- void -->
@@ -10785,7 +10785,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector(unsigned long int, const AllocObject&, const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const AllocObject&' -->
@@ -10800,7 +10800,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector(const std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-629'/>
             <!-- void -->
@@ -10811,7 +10811,7 @@ 
           <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -10822,7 +10822,7 @@ 
           <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-410'/>
           </function-decl>
@@ -10831,7 +10831,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_erase_at_end(AllocObject*) -->
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE15_M_erase_at_endEPS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1148' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'AllocObject*' -->
             <parameter type-id='type-id-322'/>
             <!-- void -->
@@ -10891,7 +10891,7 @@ 
           <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-410'/>
           </function-decl>
@@ -10900,7 +10900,7 @@ 
           <!-- AllocObject& std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::back() -->
           <function-decl name='back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- AllocObject& -->
             <return type-id='type-id-394'/>
           </function-decl>
@@ -10909,7 +10909,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::pop_back() -->
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10927,7 +10927,7 @@ 
           <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::erase(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
           <function-decl name='erase' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5eraseEN9__gnu_cxx17__normal_iteratorIPS0_S5_EE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >' -->
             <parameter type-id='type-id-410'/>
             <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
@@ -10938,9 +10938,9 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::swap(std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='swap' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE4swapERS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&' -->
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-721'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10949,7 +10949,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='950' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10958,7 +10958,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_insert_aux(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, const AllocObject&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >' -->
             <parameter type-id='type-id-410'/>
             <!-- parameter of type 'const AllocObject&' -->
@@ -10971,7 +10971,7 @@ 
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::push_back(const AllocObject&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE9push_backERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'const AllocObject&' -->
             <parameter type-id='type-id-324'/>
             <!-- void -->
@@ -11004,14 +11004,14 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void ()* const&, const std::allocator<void (*)()>&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void(*)(void) const&, const std::allocator<void (*)()>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
             <!-- void -->
@@ -11041,14 +11041,14 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()*& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
+          <!-- void(*)(void)& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPFvvESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void ()*& -->
-            <return type-id='type-id-730'/>
+            <!-- void(*)(void)& -->
+            <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11101,25 +11101,25 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void ()* const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void(*)(void) const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void ()* const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void(*)(void) const&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >' -->
             <parameter type-id='type-id-416'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11133,7 +11133,7 @@ 
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11142,7 +11142,7 @@ 
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector(const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-367'/>
             <!-- void -->
@@ -11153,7 +11153,7 @@ 
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector(unsigned long int, void* const&, const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'void* const&' -->
@@ -11168,7 +11168,7 @@ 
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector(const std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-637'/>
             <!-- void -->
@@ -11179,7 +11179,7 @@ 
           <!-- std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -11221,7 +11221,7 @@ 
           <!-- __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-419'/>
           </function-decl>
@@ -11230,7 +11230,7 @@ 
           <!-- __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-419'/>
           </function-decl>
@@ -11239,7 +11239,7 @@ 
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::push_back(void* const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE9push_backERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-369'/>
             <!-- void -->
@@ -11250,7 +11250,7 @@ 
           <!-- void*& std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void*& -->
@@ -11261,7 +11261,7 @@ 
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > >, void* const&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > >' -->
             <parameter type-id='type-id-419'/>
             <!-- parameter of type 'void* const&' -->
@@ -11305,7 +11305,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11314,7 +11314,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-748'/>
             <!-- void -->
@@ -11325,7 +11325,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<MemoryRegionMap::Region>&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<MemoryRegionMap::Region>&' -->
             <parameter type-id='type-id-535'/>
             <!-- void -->
@@ -11345,9 +11345,9 @@ 
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>& std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorIN15MemoryRegionMap6RegionEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>& -->
-            <return type-id='type-id-657'/>
+            <return type-id='type-id-658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11365,7 +11365,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11374,7 +11374,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- void -->
@@ -11385,7 +11385,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<MemoryRegionMap::Region>&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<MemoryRegionMap::Region>&' -->
             <parameter type-id='type-id-535'/>
             <!-- void -->
@@ -11412,7 +11412,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<long unsigned int>::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11421,7 +11421,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<long unsigned int>::_Rb_tree_const_iterator(const std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-752'/>
             <!-- void -->
@@ -11432,7 +11432,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<long unsigned int>::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<long unsigned int>&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<long unsigned int>&' -->
             <parameter type-id='type-id-538'/>
             <!-- void -->
@@ -11470,7 +11470,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11479,7 +11479,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-756'/>
             <!-- void -->
@@ -11490,7 +11490,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&' -->
             <parameter type-id='type-id-542'/>
             <!-- void -->
@@ -11528,7 +11528,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11537,7 +11537,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-760'/>
             <!-- void -->
@@ -11548,7 +11548,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&' -->
             <parameter type-id='type-id-546'/>
             <!-- void -->
@@ -11568,9 +11568,9 @@ 
           <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >& std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKmmEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-            <return type-id='type-id-663'/>
+            <return type-id='type-id-664'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11595,7 +11595,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11604,7 +11604,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-764'/>
             <!-- void -->
@@ -11615,7 +11615,7 @@ 
           <!-- void std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&' -->
             <parameter type-id='type-id-550'/>
             <!-- void -->
@@ -11626,18 +11626,18 @@ 
           <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-665'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-665'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11651,7 +11651,7 @@ 
           <!-- void std::_Rb_tree_iterator<long unsigned int>::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11660,7 +11660,7 @@ 
           <!-- void std::_Rb_tree_iterator<long unsigned int>::_Rb_tree_iterator(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -11682,9 +11682,9 @@ 
           <!-- std::_Rb_tree_iterator<long unsigned int>& std::_Rb_tree_iterator<long unsigned int>::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorImEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<long unsigned int>& -->
-            <return type-id='type-id-667'/>
+            <return type-id='type-id-668'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11698,7 +11698,7 @@ 
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11707,7 +11707,7 @@ 
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -11729,9 +11729,9 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKmN15HeapLeakChecker10RangeValueEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& -->
-            <return type-id='type-id-669'/>
+            <return type-id='type-id-670'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11754,7 +11754,7 @@ 
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11763,7 +11763,7 @@ 
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -11785,9 +11785,9 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >& std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKmmEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-            <return type-id='type-id-671'/>
+            <return type-id='type-id-672'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11821,7 +11821,7 @@ 
           <!-- void std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11830,7 +11830,7 @@ 
           <!-- void std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -11850,9 +11850,9 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-673'/>
+            <return type-id='type-id-674'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11881,9 +11881,9 @@ 
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-673'/>
+            <return type-id='type-id-674'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11892,7 +11892,7 @@ 
             <!-- implicit parameter of type 'const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-551' is-artificial='yes'/>
             <!-- std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >& -->
-            <return type-id='type-id-705'/>
+            <return type-id='type-id-706'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11900,7 +11900,7 @@ 
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-552'>
         <member-type access='public'>
           <!-- typedef std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Base_ptr -->
-          <typedef-decl name='_Base_ptr' type-id='type-id-675' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-777'/>
+          <typedef-decl name='_Base_ptr' type-id='type-id-676' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-777'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef const std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Const_Base_ptr -->
@@ -11975,7 +11975,7 @@ 
       <class-decl name='_Vector_base&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-564'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-678'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-679'>
             <!-- class STL_Allocator<AllocObject, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-319'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -11994,7 +11994,7 @@ 
               <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -12003,7 +12003,7 @@ 
               <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl(const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-321'/>
                 <!-- void -->
@@ -12014,13 +12014,13 @@ 
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-678' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-679' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12029,7 +12029,7 @@ 
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_base(const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-321'/>
             <!-- void -->
@@ -12040,7 +12040,7 @@ 
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_base(unsigned long int, const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
@@ -12053,7 +12053,7 @@ 
           <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12064,7 +12064,7 @@ 
           <!-- STL_Allocator<AllocObject, HeapLeakChecker::Allocator>& std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- STL_Allocator<AllocObject, HeapLeakChecker::Allocator>& -->
             <return type-id='type-id-403'/>
           </function-decl>
@@ -12082,7 +12082,7 @@ 
           <!-- AllocObject* std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- AllocObject* -->
@@ -12093,7 +12093,7 @@ 
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_deallocate(AllocObject*, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_deallocateEPS0_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'AllocObject*' -->
             <parameter type-id='type-id-322'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -12107,26 +12107,26 @@ 
       <class-decl name='_Vector_base&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-567'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-681'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-682'>
             <!-- class std::allocator<void (*)()> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-573'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
-              <var-decl name='_M_start' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
+              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
+              <var-decl name='_M_start' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
-              <var-decl name='_M_finish' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
+              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
+              <var-decl name='_M_finish' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
-              <var-decl name='_M_end_of_storage' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
+              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
+              <var-decl name='_M_end_of_storage' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl*' -->
-                <parameter type-id='type-id-682' is-artificial='yes'/>
+                <parameter type-id='type-id-683' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -12135,7 +12135,7 @@ 
               <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_Vector_impl(const std::allocator<void (*)()>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl*' -->
-                <parameter type-id='type-id-682' is-artificial='yes'/>
+                <parameter type-id='type-id-683' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<void (*)()>&' -->
                 <parameter type-id='type-id-575'/>
                 <!-- void -->
@@ -12146,13 +12146,13 @@ 
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-681' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-682' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12161,7 +12161,7 @@ 
           <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_base(const std::allocator<void (*)()>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
             <!-- void -->
@@ -12172,7 +12172,7 @@ 
           <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_base(unsigned long int, const std::allocator<void (*)()>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
@@ -12185,7 +12185,7 @@ 
           <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12202,12 +12202,12 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void ()**, unsigned long int) -->
+          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void(*)(void)*, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void -->
@@ -12218,20 +12218,20 @@ 
           <!-- std::allocator<void (*)()>& std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- std::allocator<void (*)()>& -->
-            <return type-id='type-id-686'/>
+            <return type-id='type-id-687'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
+          <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12239,7 +12239,7 @@ 
       <class-decl name='_Vector_base&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-570'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-684'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-685'>
             <!-- class STL_Allocator<void*, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-365'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -12258,7 +12258,7 @@ 
               <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-686' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -12267,7 +12267,7 @@ 
               <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl(const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-686' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-367'/>
                 <!-- void -->
@@ -12278,13 +12278,13 @@ 
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-684' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-685' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12293,7 +12293,7 @@ 
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_base(const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-367'/>
             <!-- void -->
@@ -12304,7 +12304,7 @@ 
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_base(unsigned long int, const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
@@ -12317,7 +12317,7 @@ 
           <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12337,7 +12337,7 @@ 
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_deallocate(void**, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_deallocateEPS0_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'void**' -->
             <parameter type-id='type-id-174'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -12350,7 +12350,7 @@ 
           <!-- STL_Allocator<void*, HeapLeakChecker::Allocator>& std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- STL_Allocator<void*, HeapLeakChecker::Allocator>& -->
             <return type-id='type-id-408'/>
           </function-decl>
@@ -12359,7 +12359,7 @@ 
           <!-- void** std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void** -->
@@ -12459,12 +12459,12 @@ 
       <!-- struct std::__miter_base<void (**)(), false> -->
       <class-decl name='__miter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-788'>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__miter_base<void (**)(), false>::__b() -->
+          <!-- void(*)(void)* std::__miter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12507,12 +12507,12 @@ 
       <!-- struct std::__niter_base<void (**)(), false> -->
       <class-decl name='__niter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-792'>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__niter_base<void (**)(), false>::__b() -->
+          <!-- void(*)(void)* std::__niter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12555,7 +12555,7 @@ 
           <!-- void std::char_traits<char>::assign(const std::char_traits<char>::char_type&) -->
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::char_traits<char>::char_type&' -->
-            <parameter type-id='type-id-695'/>
+            <parameter type-id='type-id-696'/>
             <!-- parameter of type 'const std::char_traits<char>::char_type&' -->
             <parameter type-id='type-id-588'/>
             <!-- void -->
@@ -12575,13 +12575,13 @@ 
           <!-- std::char_traits<char>::char_type* std::char_traits<char>::copy(const std::char_traits<char>::char_type*, size_t) -->
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::char_traits<char>::char_type*' -->
-            <parameter type-id='type-id-696'/>
+            <parameter type-id='type-id-697'/>
             <!-- parameter of type 'const std::char_traits<char>::char_type*' -->
             <parameter type-id='type-id-589'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-7'/>
             <!-- std::char_traits<char>::char_type* -->
-            <return type-id='type-id-696'/>
+            <return type-id='type-id-697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -12776,7 +12776,7 @@ 
           <!-- void std::pair<long unsigned int, HeapLeakChecker::RangeValue>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, HeapLeakChecker::RangeValue>*' -->
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12785,7 +12785,7 @@ 
           <!-- void std::pair<long unsigned int, HeapLeakChecker::RangeValue>::pair(const unsigned long int&, const HeapLeakChecker::RangeValue&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, HeapLeakChecker::RangeValue>*' -->
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- parameter of type 'const HeapLeakChecker::RangeValue&' -->
@@ -12809,7 +12809,7 @@ 
           <!-- void std::pair<long unsigned int, long unsigned int>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, long unsigned int>*' -->
-            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12818,7 +12818,7 @@ 
           <!-- void std::pair<long unsigned int, long unsigned int>::pair(const unsigned long int&, const unsigned long int&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, long unsigned int>*' -->
-            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- parameter of type 'const unsigned long int&' -->
@@ -12829,7 +12829,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-708'>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-709'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_const_iterator<long unsigned int> std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>::first -->
           <var-decl name='first' type-id='type-id-517' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12842,7 +12842,7 @@ 
           <!-- void std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12851,7 +12851,7 @@ 
           <!-- void std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>::pair(const std::_Rb_tree_const_iterator<long unsigned int>&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_const_iterator<long unsigned int>&' -->
             <parameter type-id='type-id-519'/>
             <!-- parameter of type 'const bool&' -->
@@ -12862,7 +12862,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<long unsigned int>, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-710'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-711'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<long unsigned int> std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>::first -->
           <var-decl name='first' type-id='type-id-536' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12875,7 +12875,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12884,7 +12884,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>::pair(const std::_Rb_tree_iterator<long unsigned int>&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<long unsigned int>&' -->
             <parameter type-id='type-id-538'/>
             <!-- parameter of type 'const bool&' -->
@@ -12895,7 +12895,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-712'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-713'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>::first -->
           <var-decl name='first' type-id='type-id-540' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12908,7 +12908,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>*' -->
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12917,7 +12917,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>*' -->
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&' -->
             <parameter type-id='type-id-542'/>
             <!-- parameter of type 'const bool&' -->
@@ -12928,7 +12928,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-714'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-715'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>::first -->
           <var-decl name='first' type-id='type-id-544' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12941,7 +12941,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>*' -->
-            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-716' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12950,7 +12950,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>*' -->
-            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-716' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&' -->
             <parameter type-id='type-id-546'/>
             <!-- parameter of type 'const bool&' -->
@@ -12961,7 +12961,7 @@ 
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-716'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-717'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>::first -->
           <var-decl name='first' type-id='type-id-548' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12974,7 +12974,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>*' -->
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-718' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12983,7 +12983,7 @@ 
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>*' -->
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-718' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&' -->
             <parameter type-id='type-id-550'/>
             <!-- parameter of type 'const bool&' -->
@@ -13189,16 +13189,16 @@ 
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_a<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::__copy_move_a2<false, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
       <function-decl name='__copy_move_a2&lt;false, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13211,16 +13211,16 @@ 
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_a2<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::copy<__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
       <function-decl name='copy&lt;__gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13233,16 +13233,16 @@ 
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void ()** std::copy<void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__copy_move_backward_a<false, AllocObject*, AllocObject*>(AllocObject*, AllocObject*, AllocObject*) -->
       <function-decl name='__copy_move_backward_a&lt;false, AllocObject*, AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13255,16 +13255,16 @@ 
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_backward_a<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_backward_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_backward_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a<false, void**, void**>(void**, void**, void**) -->
       <function-decl name='__copy_move_backward_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13288,16 +13288,16 @@ 
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_backward_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a2<false, void**, void**>(void**, void**, void**) -->
       <function-decl name='__copy_move_backward_a2&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13321,16 +13321,16 @@ 
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::copy_backward<void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::copy_backward<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='copy_backward&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::copy_backward<void**, void**>(void**, void**, void**) -->
       <function-decl name='copy_backward&lt;void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13343,12 +13343,12 @@ 
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)()>(void ()**, void ()**) -->
+      <!-- void std::_Destroy<void (**)()>(void(*)(void)*, void(*)(void)*) -->
       <function-decl name='_Destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
@@ -13374,14 +13374,14 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)(), void (*)()>(void ()**, void ()**, std::allocator<void (*)()>&) -->
+      <!-- void std::_Destroy<void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='_Destroy&lt;void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
-        <parameter type-id='type-id-686'/>
+        <parameter type-id='type-id-687'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
@@ -13430,16 +13430,16 @@ 
         <!-- struct std::pair<long unsigned int, long unsigned int> -->
         <return type-id='type-id-622'/>
       </function-decl>
-      <!-- void ()** std::uninitialized_copy<void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_copy_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
       <function-decl name='__uninitialized_copy_a&lt;AllocObject*, AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13480,18 +13480,18 @@ 
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void ()** std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void ()**, void ()**, void ()**, std::allocator<void (*)()>&) -->
+      <!-- void(*)(void)* std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_copy_a&lt;void (**)(), void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
-        <parameter type-id='type-id-686'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-687'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_move_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
       <function-decl name='__uninitialized_move_a&lt;AllocObject*, AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13506,18 +13506,18 @@ 
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void ()**, void ()**, void ()**, std::allocator<void (*)()>&) -->
+      <!-- void(*)(void)* std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_move_a&lt;void (**)(), void (**)(), std::allocator&lt;void (*)()&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
-        <parameter type-id='type-id-686'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-687'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__uninitialized_move_a<void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator> >(void**, void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
       <function-decl name='__uninitialized_move_a&lt;void**, void**, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13910,8 +13910,8 @@ 
       <!-- class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > > -->
       <class-decl name='__normal_iterator&lt;void (**)(), std::vector&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-416'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <!-- void ()** __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
-          <var-decl name='_M_current' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
+          <!-- void(*)(void)* __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
+          <var-decl name='_M_current' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator() -->
@@ -13923,32 +13923,32 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void ()** const&) -->
+          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void(*)(void)* const&) -->
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-418' is-artificial='yes'/>
-            <!-- parameter of type 'void ()** const&' -->
-            <parameter type-id='type-id-733'/>
+            <!-- parameter of type 'void(*)(void)* const&' -->
+            <parameter type-id='type-id-734'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()** const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
+          <!-- void(*)(void)* const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void ()** const& -->
-            <return type-id='type-id-733'/>
+            <!-- void(*)(void)* const& -->
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()*& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
+          <!-- void(*)(void)& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void ()*& -->
-            <return type-id='type-id-730'/>
+            <!-- void(*)(void)& -->
+            <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14042,12 +14042,12 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void ()**, unsigned long int) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void(*)(void)*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void -->
@@ -14055,7 +14055,7 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()** __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
+          <!-- void(*)(void)* __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
@@ -14063,30 +14063,30 @@ 
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-73'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void ()**, void ()* const&) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void(*)(void)*, void(*)(void) const&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void ()**) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void(*)(void)*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -14242,20 +14242,20 @@ 
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
+            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* -->
+              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void (void*, void*, typedef size_t, int, int, int, typedef off_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)**' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-740'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14282,33 +14282,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (void*, void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
-              <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* -->
+              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void (void*, void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void (void*, void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14326,20 +14326,20 @@ 
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void (void*, typedef ptrdiff_t)* base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
+            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- void (void*, typedef ptrdiff_t)* -->
+              <!-- void(*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void (void*, typedef ptrdiff_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void(*)(void*, ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)**' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)*' -->
               <parameter type-id='type-id-738'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14366,33 +14366,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef ptrdiff_t)* base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void (void*, typedef ptrdiff_t)*) -->
+            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void(*)(void*, ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
-              <!-- void (void*, typedef ptrdiff_t)* -->
+              <!-- void(*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void (void*, typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void(*)(void*, ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void (void*, typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void(*)(void*, ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14490,26 +14490,26 @@ 
       <return type-id='type-id-75'/>
     </function-decl>
     <!-- size_t (const HeapProfileTable::AllocValue&) -->
-    <function-type size-in-bits='64' id='type-id-725'>
+    <function-type size-in-bits='64' id='type-id-641'>
       <!-- parameter of type 'const HeapProfileTable::AllocValue&' -->
       <parameter type-id='type-id-276'/>
       <!-- typedef size_t -->
       <return type-id='type-id-7'/>
     </function-type>
     <!-- void (const HeapProfileTable::AllocContextInfo&) -->
-    <function-type size-in-bits='64' id='type-id-734'>
+    <function-type size-in-bits='64' id='type-id-727'>
       <!-- parameter of type 'const HeapProfileTable::AllocContextInfo&' -->
       <parameter type-id='type-id-442'/>
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-type>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*) -->
+    <!-- void (void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <function-type size-in-bits='64' id='type-id-735'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-73'/>
       <!-- parameter of type 'HeapProfileTable::AllocValue*' -->
       <parameter type-id='type-id-213'/>
-      <!-- parameter of type 'void (void*, const HeapProfileTable::AllocInfo&)*' -->
+      <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
       <parameter type-id='type-id-198'/>
       <!-- void -->
       <return type-id='type-id-75'/>
@@ -14583,7 +14583,7 @@ 
     <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-860'/>
     <!-- __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
     <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <!-- bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)* -->
+    <!-- bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*) -->
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-127'/>
@@ -14693,17 +14693,17 @@ 
     <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-924'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>* -->
     <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
-    <!-- void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)* -->
+    <!-- void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*) -->
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-314'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*) -->
     <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-201'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*) -->
     <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-203'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*) -->
     <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-209'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, char*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, char*) -->
     <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-199'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&) -->
     <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-207'/>
     <!-- AddressMap<HeapProfileTable::AllocValue>::Cluster* -->
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-205'/>
@@ -14889,7 +14889,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
             <return type-id='type-id-940'/>
           </function-decl>
@@ -14898,7 +14898,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
             <return type-id='type-id-940'/>
           </function-decl>
@@ -15022,7 +15022,7 @@ 
             <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
             <parameter type-id='type-id-910' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -15031,7 +15031,7 @@ 
             <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
             <parameter type-id='type-id-910' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -15889,7 +15889,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -15898,7 +15898,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -15991,7 +15991,7 @@ 
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -16000,7 +16000,7 @@ 
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -16382,7 +16382,7 @@ 
         <!-- const HeapProfileTable::Snapshot::Entry& -->
         <return type-id='type-id-267'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__median&lt;HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
@@ -16390,7 +16390,7 @@ 
         <parameter type-id='type-id-855'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket* const& -->
         <return type-id='type-id-855'/>
@@ -16406,7 +16406,7 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__heap_select&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1'/>
@@ -16414,7 +16414,7 @@ 
         <parameter type-id='type-id-280' name='__middle' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1914' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16428,13 +16428,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_linear_insert&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2079' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16448,13 +16448,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16468,13 +16468,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2154' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16488,13 +16488,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__final_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2188' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16510,7 +16510,7 @@ 
         <!-- HeapProfileTable::Snapshot::Entry* -->
         <return type-id='type-id-265'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16518,7 +16518,7 @@ 
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket** -->
         <return type-id='type-id-280'/>
@@ -16534,7 +16534,7 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__introsort_loop&lt;HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1'/>
@@ -16542,7 +16542,7 @@ 
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2278' column='1'/>
         <!-- parameter of type 'long int' -->
         <parameter type-id='type-id-18' name='__depth_limit' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16565,7 +16565,7 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='partial_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5095' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16573,7 +16573,7 @@ 
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16587,13 +16587,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5244' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16750,7 +16750,7 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__push_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16760,7 +16760,7 @@ 
         <parameter type-id='type-id-18'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16789,7 +16789,7 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__adjust_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1'/>
@@ -16799,12 +16799,12 @@ 
         <parameter type-id='type-id-18' name='__len' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255' name='__value' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__pop_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16812,7 +16812,7 @@ 
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16826,13 +16826,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='make_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16846,13 +16846,13 @@ 
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -17278,7 +17278,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
     <!-- tcmalloc::Logger* -->
     <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
-    <!-- void (const char*, int)* -->
+    <!-- void(*)(const char*, int) -->
     <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
@@ -17384,7 +17384,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- void (const char*, int)* tcmalloc::log_message_writer -->
+      <!-- void(*tcmalloc::log_message_writer)(const char*, int) -->
       <var-decl name='log_message_writer' type-id='type-id-1018' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
       <!-- void tcmalloc::Log(tcmalloc::LogMode, const char*, int, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem) -->
       <function-decl name='Log' mangled-name='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_' filepath='src/internal_logging.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_'>
@@ -18013,17 +18013,17 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int (void*, typedef size_t, int, int, int, typedef off_t, void**)* MallocHook_MmapReplacement -->
+    <!-- typedef int(*)(void*, size_t, int, int, int, off_t, void**) MallocHook_MmapReplacement -->
     <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-1047' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-1048'/>
-    <!-- typedef void (void*, void*, typedef size_t, typedef size_t, int, void*)* MallocHook_MremapHook -->
+    <!-- typedef void(*)(void*, void*, size_t, size_t, int, void*) MallocHook_MremapHook -->
     <typedef-decl name='MallocHook_MremapHook' type-id='type-id-1049' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-1050'/>
-    <!-- typedef void (void*, typedef size_t)* MallocHook_MunmapHook -->
+    <!-- typedef void(*)(void*, size_t) MallocHook_MunmapHook -->
     <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-1051'/>
-    <!-- typedef int (void*, typedef size_t, int*)* MallocHook_MunmapReplacement -->
+    <!-- typedef int(*)(void*, size_t, int*) MallocHook_MunmapReplacement -->
     <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-1052' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-1053'/>
-    <!-- typedef void (void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_PreMmapHook -->
+    <!-- typedef void(*)(void*, size_t, int, int, int, off_t) MallocHook_PreMmapHook -->
     <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-1054' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-1055'/>
-    <!-- typedef void (typedef ptrdiff_t)* MallocHook_PreSbrkHook -->
+    <!-- typedef void(*)(ptrdiff_t) MallocHook_PreSbrkHook -->
     <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-1056' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-1057'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
@@ -18055,25 +18055,25 @@ 
     <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1076'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)>* -->
     <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <!-- int (void*, typedef size_t, int*)* -->
+    <!-- int(*)(void*, size_t, int*) -->
     <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1052'/>
-    <!-- int (void*, typedef size_t, int*)** -->
+    <!-- int(*)(void*, size_t, int*)* -->
     <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1079'/>
-    <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* -->
+    <!-- int(*)(void*, size_t, int, int, int, off_t, void**) -->
     <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1047'/>
-    <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)** -->
+    <!-- int(*)(void*, size_t, int, int, int, off_t, void**)* -->
     <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1081'/>
-    <!-- void (typedef ptrdiff_t)* -->
+    <!-- void(*)(ptrdiff_t) -->
     <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1056'/>
-    <!-- void (typedef ptrdiff_t)** -->
+    <!-- void(*)(ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1083'/>
-    <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
+    <!-- void(*)(void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1054'/>
-    <!-- void (void*, typedef size_t, int, int, int, typedef off_t)** -->
+    <!-- void(*)(void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1085'/>
-    <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
+    <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
     <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1049'/>
-    <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)** -->
+    <!-- void(*)(void*, void*, size_t, size_t, int, void*)* -->
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1087'/>
     <!-- volatile base::subtle::Atomic64* -->
     <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-108'/>
@@ -18200,11 +18200,11 @@ 
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int (void*, typedef size_t, int*)**, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int(*)(void*, size_t, int*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE8TraverseEPS6_i' filepath='src/malloc_hook.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1069' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int*)**' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int*)*' -->
               <parameter type-id='type-id-1079'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18222,11 +18222,11 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int (void*, typedef size_t, int*)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int(*)(void*, size_t, int*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE6RemoveES6_' filepath='src/malloc_hook.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18242,11 +18242,11 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int (void*, typedef size_t, int*)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int(*)(void*, size_t, int*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE3AddES6_' filepath='src/malloc_hook.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18264,11 +18264,11 @@ 
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int (void*, typedef size_t, int, int, int, typedef off_t, void**)**, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int(*)(void*, size_t, int, int, int, off_t, void**)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE8TraverseEPS7_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1071' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)**' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)*' -->
               <parameter type-id='type-id-1081'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18295,22 +18295,22 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE6RemoveES7_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE3AddES7_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18330,11 +18330,11 @@ 
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void (void*, void*, typedef size_t, typedef size_t, int, void*)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void(*)(void*, void*, size_t, size_t, int, void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1073' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)**' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)*' -->
               <parameter type-id='type-id-1087'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18361,33 +18361,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
+            <!-- void(*)(void*, void*, size_t, size_t, int, void*) base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void(*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
-              <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
+              <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
               <return type-id='type-id-1049'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void(*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void(*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18407,11 +18407,11 @@ 
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void (void*, typedef size_t, int, int, int, typedef off_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1075' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)**' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-1085'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18438,33 +18438,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- void(*)(void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
-              <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
+              <!-- void(*)(void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-1054'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18482,11 +18482,11 @@ 
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void (typedef ptrdiff_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void(*)(ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvlEE8TraverseEPS3_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1077' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)**' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)*' -->
               <parameter type-id='type-id-1083'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18513,33 +18513,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (typedef ptrdiff_t)* base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void (typedef ptrdiff_t)*) -->
+            <!-- void(*)(ptrdiff_t) base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void(*)(ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvlEE16ExchangeSingularES3_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
-              <!-- void (typedef ptrdiff_t)* -->
+              <!-- void(*)(ptrdiff_t) -->
               <return type-id='type-id-1056'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void (typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void(*)(ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvlEE6RemoveES3_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void (typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void(*)(ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvlEE3AddES3_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18916,11 +18916,11 @@ 
     <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
     <!-- pthread_once_t* -->
     <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
-    <!-- int perftools_pthread_key_create(pthread_key_t*, void (void*)*) -->
+    <!-- int perftools_pthread_key_create(pthread_key_t*, void(*)(void*)) -->
     <function-decl name='perftools_pthread_key_create' mangled-name='_Z28perftools_pthread_key_createPjPFvPvE' filepath='src/maybe_threads.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_createPjPFvPvE'>
       <!-- parameter of type 'pthread_key_t*' -->
       <parameter type-id='type-id-1099' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void(*)(void*)' -->
       <parameter type-id='type-id-193' name='destr_function' filepath='src/maybe_threads.cc' line='91' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -18948,11 +18948,11 @@ 
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- int perftools_pthread_once(pthread_once_t*, void ()*) -->
+    <!-- int perftools_pthread_once(pthread_once_t*, void(*)(void)) -->
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <!-- parameter of type 'pthread_once_t*' -->
       <parameter type-id='type-id-1101' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void(*)(void)' -->
       <parameter type-id='type-id-162' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -19320,7 +19320,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-1144'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1145'/>
-    <!-- void (const MemoryRegionMap::Region&)* -->
+    <!-- void(*)(const MemoryRegionMap::Region&) -->
     <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-315'/>
     <!-- const std::_Rb_tree_node<MemoryRegionMap::Region> -->
     <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1148'/>
@@ -19478,7 +19478,7 @@ 
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-821'/>
           </function-decl>
@@ -19487,7 +19487,7 @@ 
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-821'/>
           </function-decl>
@@ -20487,7 +20487,7 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (int, siginfo_t*, void*, void*)* ProfileHandlerCallback -->
+    <!-- typedef void(*)(int, siginfo_t*, void*, void*) ProfileHandlerCallback -->
     <typedef-decl name='ProfileHandlerCallback' type-id='type-id-1186' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1179'/>
     <!-- typedef int pthread_once_t -->
     <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-1100'/>
@@ -20575,7 +20575,7 @@ 
     <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1230'/>
     <!-- timer_id_holder* -->
     <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-1185'/>
-    <!-- void (int, siginfo_t*, void*, void*)* -->
+    <!-- void(*)(int, siginfo_t*, void*, void*) -->
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1186'/>
     <!-- const std::_List_node<ProfileHandlerToken*> -->
     <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
@@ -21259,7 +21259,7 @@ 
         <var-decl name='collector_' type-id='type-id-1251' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <!-- int (void*)* CpuProfiler::filter_ -->
+        <!-- int(*CpuProfiler::filter_)(void*) -->
         <var-decl name='filter_' type-id='type-id-1252' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
@@ -21691,7 +21691,7 @@ 
     <!-- struct ProfilerOptions -->
     <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1272'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int (void*)* ProfilerOptions::filter_in_thread -->
+        <!-- int(*ProfilerOptions::filter_in_thread)(void*) -->
         <var-decl name='filter_in_thread' type-id='type-id-1252' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -21923,7 +21923,7 @@ 
     <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1291'/>
     <!-- const ProfilerOptions* -->
     <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1255'/>
-    <!-- int (void*)* -->
+    <!-- int(*)(void*) -->
     <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1252'/>
     <!-- siginfo_t* -->
     <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1177'/>
@@ -22977,7 +22977,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -22986,7 +22986,7 @@ 
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -23079,7 +23079,7 @@ 
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -23088,7 +23088,7 @@ 
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -26215,15 +26215,15 @@ 
         <var-decl name='root_' type-id='type-id-1429' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <!-- void* (unsigned long int)* TCMalloc_PageMap3<35>::allocator_ -->
+        <!-- void*(*TCMalloc_PageMap3<35>::allocator_)(unsigned long int) -->
         <var-decl name='allocator_' type-id='type-id-192' visibility='default' filepath='src/pagemap.h' line='230' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26241,22 +26241,22 @@ 
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26857,7 +26857,7 @@ 
     <typedef-decl name='_IO_lock_t' type-id='type-id-75' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1458'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-149' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1459'/>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int(*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-1460' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-163'/>
     <!-- typedef long int __off64_t -->
     <typedef-decl name='__off64_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-156'/>
@@ -27141,7 +27141,7 @@ 
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-6'/>
     <!-- const wchar_t** -->
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-14'/>
-    <!-- int (void*, void*)* -->
+    <!-- int(*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1460'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1023'/>
@@ -27213,25 +27213,25 @@ 
     <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-23'/>
     <!-- uint64_t* -->
     <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1578'/>
-    <!-- void ()* -->
+    <!-- void(*)(void) -->
     <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-162'/>
-    <!-- void (void*)* -->
+    <!-- void(*)(void*) -->
     <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-193'/>
-    <!-- void (void*)** -->
+    <!-- void(*)(void*)* -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-1580'/>
-    <!-- void (void*, typedef size_t)* -->
+    <!-- void(*)(void*, size_t) -->
     <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-386'/>
-    <!-- void (void*, typedef size_t)** -->
+    <!-- void(*)(void*, size_t)* -->
     <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-1582'/>
-    <!-- void (void*, void*)* -->
+    <!-- void(*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
-    <!-- void* (typedef size_t, typedef size_t, void*)* -->
+    <!-- void*(*)(size_t, size_t, void*) -->
     <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
-    <!-- void* (typedef size_t, void*)* -->
+    <!-- void*(*)(size_t, void*) -->
     <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
-    <!-- void* (unsigned long int)* -->
+    <!-- void*(*)(unsigned long int) -->
     <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-192'/>
-    <!-- void* (void*, typedef size_t, void*)* -->
+    <!-- void*(*)(void*, size_t, void*) -->
     <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-174'/>
@@ -27631,12 +27631,12 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void ()**) -->
+          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void(*)(void)*) -->
           <function-decl name='__destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -27865,16 +27865,16 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void ()* const*, void ()**) -->
+          <!-- void(*)(void)* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
           <function-decl name='__copy_m&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -27933,16 +27933,16 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void ()* const*, void ()**) -->
+          <!-- void(*)(void)* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
           <function-decl name='__copy_move_b&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -28012,16 +28012,16 @@ 
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void ()**, void ()**) -->
+          <!-- void(*)(void)* std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*) -->
           <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -28148,7 +28148,7 @@ 
               <!-- char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep::_M_refdata() -->
               <function-decl name='_M_refdata' mangled-name='_ZNSs4_Rep10_M_refdataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep*' -->
-                <parameter type-id='type-id-694' is-artificial='yes'/>
+                <parameter type-id='type-id-695' is-artificial='yes'/>
                 <!-- char* -->
                 <return type-id='type-id-3'/>
               </function-decl>
@@ -28157,7 +28157,7 @@ 
               <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep::_M_dispose(const std::allocator<char>&) -->
               <function-decl name='_M_dispose' mangled-name='_ZNSs4_Rep10_M_disposeERKSaIcE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep*' -->
-                <parameter type-id='type-id-694' is-artificial='yes'/>
+                <parameter type-id='type-id-695' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<char>&' -->
                 <parameter type-id='type-id-837'/>
                 <!-- void -->
@@ -28436,7 +28436,7 @@ 
             <!-- implicit parameter of type 'const std::basic_string<char, std::char_traits<char>, std::allocator<char> >*' -->
             <parameter type-id='type-id-1512' is-artificial='yes'/>
             <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
-            <return type-id='type-id-694'/>
+            <return type-id='type-id-695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29414,20 +29414,20 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*)* base::internal::HookList<void (*)(const void*)>::GetSingular() -->
+            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- void (void*)* -->
+              <!-- void(*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void (void*)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void(*)(void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)**' -->
+              <!-- parameter of type 'void(*)(void*)*' -->
               <parameter type-id='type-id-1580'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29445,33 +29445,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*)* base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void (void*)*) -->
+            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void(*)(void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)*' -->
+              <!-- parameter of type 'void(*)(void*)' -->
               <parameter type-id='type-id-193'/>
-              <!-- void (void*)* -->
+              <!-- void(*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void (void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void(*)(void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)*' -->
+              <!-- parameter of type 'void(*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void (void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void(*)(void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)*' -->
+              <!-- parameter of type 'void(*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -29498,11 +29498,11 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
+            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- void (void*, typedef size_t)* -->
+              <!-- void(*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
@@ -29516,11 +29516,11 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void (void*, typedef size_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void(*)(void*, size_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)**' -->
+              <!-- parameter of type 'void(*)(void*, size_t)*' -->
               <parameter type-id='type-id-1582'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29529,33 +29529,33 @@ 
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void (void*, typedef size_t)*) -->
+            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void(*)(void*, size_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
-              <!-- void (void*, typedef size_t)* -->
+              <!-- void(*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void (void*, typedef size_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void(*)(void*, size_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void (void*, typedef size_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void(*)(void*, size_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -33076,13 +33076,13 @@ 
         <return type-id='type-id-73'/>
       </function-decl>
     </namespace-decl>
-    <!-- void* (typedef size_t, void*)* __malloc_hook -->
+    <!-- void*(*__malloc_hook)(size_t, void*) -->
     <var-decl name='__malloc_hook' type-id='type-id-1588' mangled-name='__malloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='135' column='1' elf-symbol-id='__malloc_hook'/>
-    <!-- void* (void*, typedef size_t, void*)* __realloc_hook -->
+    <!-- void*(*__realloc_hook)(void*, size_t, void*) -->
     <var-decl name='__realloc_hook' type-id='type-id-1590' mangled-name='__realloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='137' column='1' elf-symbol-id='__realloc_hook'/>
-    <!-- void (void*, void*)* __free_hook -->
+    <!-- void(*__free_hook)(void*, void*) -->
     <var-decl name='__free_hook' type-id='type-id-1584' mangled-name='__free_hook' visibility='default' filepath='src/libc_override_glibc.h' line='139' column='1' elf-symbol-id='__free_hook'/>
-    <!-- void* (typedef size_t, typedef size_t, void*)* __memalign_hook -->
+    <!-- void*(*__memalign_hook)(size_t, size_t, void*) -->
     <var-decl name='__memalign_hook' type-id='type-id-1586' mangled-name='__memalign_hook' visibility='default' filepath='src/libc_override_glibc.h' line='141' column='1' elf-symbol-id='__memalign_hook'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 3de32474..a6759aa3 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -4000,7 +4000,7 @@ 
     <typedef-decl name='_IO_lock_t' type-id='type-id-13' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-153'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-137' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-154'/>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-155' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-156'/>
     <!-- typedef int __int32_t -->
     <typedef-decl name='__int32_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-157'/>
@@ -4334,7 +4334,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-105' size-in-bits='64' id='type-id-94'/>
     <!-- fpos_t* -->
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-309'/>
-    <!-- int (void*, void*)* -->
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-155'/>
     <!-- int& -->
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-93'/>
@@ -4396,7 +4396,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-339'/>
     <!-- std::allocator<unsigned char>* -->
     <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-340'/>
-    <!-- std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)* -->
+    <!-- std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&) -->
     <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-265' size-in-bits='64' id='type-id-343'/>
@@ -4442,7 +4442,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-35' size-in-bits='64' id='type-id-98'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-358'/>
-    <!-- void ()* -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
     <!-- vtkBoundingBox& -->
     <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-361'/>
@@ -7802,11 +7802,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-450'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-451' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -8923,9 +8923,9 @@ 
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
-    <!-- int atexit(void ()*) -->
+    <!-- int atexit(void (*)(void)) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-360'/>
       <!-- int -->
       <return type-id='type-id-19'/>
@@ -10519,7 +10519,7 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (void*, void*, int, int)* vtkRMIFunctionType -->
+    <!-- typedef void (*)(void*, void*, int, int) vtkRMIFunctionType -->
     <typedef-decl name='vtkRMIFunctionType' type-id='type-id-494' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-495'/>
     <!-- char*** -->
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-493'/>
@@ -10529,7 +10529,7 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-490'/>
     <!-- const vtkDummyController* -->
     <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-491'/>
-    <!-- void (void*, void*, int, int)* -->
+    <!-- void (*)(void*, void*, int, int) -->
     <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-494'/>
     <!-- vtkDummyController* -->
     <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-489'/>
@@ -10649,11 +10649,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-512' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -11722,11 +11722,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-563'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-564' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -12707,7 +12707,7 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (vtkMultiProcessController*, void*)* vtkProcessFunctionType -->
+    <!-- typedef void (*)(vtkMultiProcessController*, void*) vtkProcessFunctionType -->
     <typedef-decl name='vtkProcessFunctionType' type-id='type-id-585' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='53' column='1' id='type-id-523'/>
     <!-- __gnu_cxx::__normal_iterator<const vtkMultiProcessController::vtkInternal::vtkRMICallback*, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-586'/>
@@ -13325,13 +13325,13 @@ 
     <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-958'/>
     <!-- unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-4' size-in-bits='64' id='type-id-959'/>
-    <!-- void (vtkMultiProcessController*, void*)* -->
+    <!-- void (*)(vtkMultiProcessController*, void*) -->
     <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-585'/>
-    <!-- void (vtkMultiProcessController*, void*)* const -->
+    <!-- void (*)(vtkMultiProcessController*, void*) const -->
     <qualified-type-def type-id='type-id-585' const='yes' id='type-id-961'/>
-    <!-- void (vtkMultiProcessController*, void*)* const& -->
+    <!-- void (*)(vtkMultiProcessController*, void*) const& -->
     <reference-type-def kind='lvalue' type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
-    <!-- void (vtkMultiProcessController*, void*)*& -->
+    <!-- void (*)(vtkMultiProcessController*, void*)& -->
     <reference-type-def kind='lvalue' type-id='type-id-585' size-in-bits='64' id='type-id-963'/>
     <!-- void* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
@@ -17704,7 +17704,7 @@ 
           <var-decl name='first' type-id='type-id-200' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <!-- void (vtkMultiProcessController*, void*)* std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::second -->
+          <!-- void (* std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::second)(vtkMultiProcessController*, void*) -->
           <var-decl name='second' type-id='type-id-585' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='73' column='1'/>
         </data-member>
         <member-function access='public'>
@@ -17717,13 +17717,13 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::pair(const int&, void (vtkMultiProcessController*, void*)* const&) -->
+          <!-- void std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::pair(const int&, void (*)(vtkMultiProcessController*, void*) const&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<const int, void (*)(vtkMultiProcessController*, void*)>*' -->
             <parameter type-id='type-id-940' is-artificial='yes'/>
             <!-- parameter of type 'const int&' -->
             <parameter type-id='type-id-431'/>
-            <!-- parameter of type 'void (vtkMultiProcessController*, void*)* const&' -->
+            <!-- parameter of type 'void (*)(vtkMultiProcessController*, void*) const&' -->
             <parameter type-id='type-id-962'/>
             <!-- void -->
             <return type-id='type-id-13'/>
@@ -17855,11 +17855,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1103'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1104' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -19305,13 +19305,13 @@ 
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void (vtkMultiProcessController*, void*)*& vtksys::hash_map<int, void (*)(vtkMultiProcessController*, void*), vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >::operator[](const int&) -->
+          <!-- void (*)(vtkMultiProcessController*, void*)& vtksys::hash_map<int, void (*)(vtkMultiProcessController*, void*), vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >::operator[](const int&) -->
           <function-decl name='operator[]' mangled-name='_ZN6vtksys8hash_mapIiPFvP25vtkMultiProcessControllerPvENS_4hashIiEESt8equal_toIiESaIcEEixERKi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'vtksys::hash_map<int, void (*)(vtkMultiProcessController*, void*), vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >*' -->
             <parameter type-id='type-id-982' is-artificial='yes'/>
             <!-- parameter of type 'const int&' -->
             <parameter type-id='type-id-431'/>
-            <!-- void (vtkMultiProcessController*, void*)*& -->
+            <!-- void (*)(vtkMultiProcessController*, void*)& -->
             <return type-id='type-id-963'/>
           </function-decl>
         </member-function>
@@ -21731,7 +21731,7 @@ 
       <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-1155'>
         <member-type access='protected'>
-          <!-- enum {_S_initial_map_size = 8,} -->
+          <!-- enum {_S_initial_map_size=8, } -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-1184'>
             <underlying-type type-id='type-id-28'/>
             <enumerator name='_S_initial_map_size' value='8'/>
@@ -24016,11 +24016,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1221'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1222' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -24416,11 +24416,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1237' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -28072,11 +28072,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1480' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -29701,11 +29701,11 @@ 
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1519' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -30462,11 +30462,11 @@ 
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1540'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 5e94e912..3f28dbde 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -1282,11 +1282,11 @@ 
         <var-decl name='end_diagnostic' type-id='type-id-54' visibility='default' filepath='../.././gcc/diagnostic.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- void (diagnostic_context*, const char*, va_list*)* diagnostic_context::internal_error -->
+        <!-- void (* diagnostic_context::internal_error)(diagnostic_context*, const char*, va_list*) -->
         <var-decl name='internal_error' type-id='type-id-55' visibility='default' filepath='../.././gcc/diagnostic.h' line='147' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- int (int, void*)* diagnostic_context::option_enabled -->
+        <!-- int (* diagnostic_context::option_enabled)(int, void*) -->
         <var-decl name='option_enabled' type-id='type-id-56' visibility='default' filepath='../.././gcc/diagnostic.h' line='151' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -1294,7 +1294,7 @@ 
         <var-decl name='option_state' type-id='type-id-39' visibility='default' filepath='../.././gcc/diagnostic.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <!-- char* (diagnostic_context*, int, typedef diagnostic_t, typedef diagnostic_t)* diagnostic_context::option_name -->
+        <!-- char* (* diagnostic_context::option_name)(diagnostic_context*, int, diagnostic_t, diagnostic_t) -->
         <var-decl name='option_name' type-id='type-id-57' visibility='default' filepath='../.././gcc/diagnostic.h' line='163' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
@@ -1442,11 +1442,11 @@ 
         <var-decl name='alignment_mask' type-id='type-id-2' visibility='default' filepath='../.././gcc/../include/obstack.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- _obstack_chunk* (void*, long int)* obstack::chunkfun -->
+        <!-- _obstack_chunk* (* obstack::chunkfun)(void*, long int) -->
         <var-decl name='chunkfun' type-id='type-id-71' visibility='default' filepath='../.././gcc/../include/obstack.h' line='176' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- void (void*, _obstack_chunk*)* obstack::freefun -->
+        <!-- void (* obstack::freefun)(void*, _obstack_chunk*) -->
         <var-decl name='freefun' type-id='type-id-72' visibility='default' filepath='../.././gcc/../include/obstack.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
@@ -1691,7 +1691,7 @@ 
     <typedef-decl name='__off64_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-38'/>
     <!-- typedef long int __off_t -->
     <typedef-decl name='__off_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-35'/>
-    <!-- typedef void (int)* __sighandler_t -->
+    <!-- typedef void (*)(int) __sighandler_t -->
     <typedef-decl name='__sighandler_t' type-id='type-id-104' filepath='/usr/include/signal.h' line='84' column='1' id='type-id-105'/>
     <!-- typedef long int __time_t -->
     <typedef-decl name='__time_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-96'/>
@@ -1712,7 +1712,7 @@ 
     <typedef-decl name='diagnostic_info' type-id='type-id-59' filepath='../.././gcc/diagnostic.h' line='42' column='1' id='type-id-108'/>
     <!-- typedef diagnostic_prefixing_rule_t diagnostic_prefixing_rule_t -->
     <typedef-decl name='diagnostic_prefixing_rule_t' type-id='type-id-19' filepath='../.././gcc/pretty-print.h' line='52' column='1' id='type-id-18'/>
-    <!-- typedef void (diagnostic_context*, diagnostic_info*)* diagnostic_starter_fn -->
+    <!-- typedef void (*)(diagnostic_context*, diagnostic_info*) diagnostic_starter_fn -->
     <typedef-decl name='diagnostic_starter_fn' type-id='type-id-109' filepath='../.././gcc/diagnostic.h' line='55' column='1' id='type-id-53'/>
     <!-- typedef diagnostic_t diagnostic_t -->
     <typedef-decl name='diagnostic_t' type-id='type-id-22' filepath='../.././gcc/diagnostic-core.h' line='40' column='1' id='type-id-21'/>
@@ -1728,7 +1728,7 @@ 
     <typedef-decl name='pp_wrapping_mode_t' type-id='type-id-78' filepath='../.././gcc/pretty-print.h' line='120' column='1' id='type-id-77'/>
     <!-- typedef pretty_print_info pretty_printer -->
     <typedef-decl name='pretty_printer' type-id='type-id-79' filepath='../.././gcc/pretty-print.h' line='135' column='1' id='type-id-110'/>
-    <!-- typedef bool (pretty_printer*, text_info*, const char*, int, bool, bool, bool)* printer_fn -->
+    <!-- typedef bool (*)(pretty_printer*, text_info*, const char*, int, bool, bool, bool) printer_fn -->
     <typedef-decl name='printer_fn' type-id='type-id-111' filepath='../.././gcc/pretty-print.h' line='136' column='1' id='type-id-81'/>
     <!-- typedef unsigned long int size_t -->
     <typedef-decl name='size_t' type-id='type-id-101' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/prev-gcc/include/stddef.h' line='213' column='1' id='type-id-4'/>
@@ -1756,13 +1756,13 @@ 
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-33'/>
     <!-- _obstack_chunk* -->
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-42'/>
-    <!-- _obstack_chunk* (void*, long int)* -->
+    <!-- _obstack_chunk* (*)(void*, long int) -->
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-71'/>
-    <!-- bool (pretty_printer*, text_info*, const char*, int, bool, bool, bool)* -->
+    <!-- bool (*)(pretty_printer*, text_info*, const char*, int, bool, bool, bool) -->
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-111'/>
     <!-- char* -->
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-3'/>
-    <!-- char* (diagnostic_context*, int, typedef diagnostic_t, typedef diagnostic_t)* -->
+    <!-- char* (*)(diagnostic_context*, int, diagnostic_t, diagnostic_t) -->
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-57'/>
     <!-- char* const -->
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-116'/>
@@ -1794,7 +1794,7 @@ 
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-125'/>
     <!-- diagnostic_t* -->
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-49'/>
-    <!-- int (int, void*)* -->
+    <!-- int (*)(int, void*) -->
     <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-56'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-51'/>
@@ -1818,19 +1818,19 @@ 
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-131'/>
     <!-- va_list* -->
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-93'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
-    <!-- void (diagnostic_context*, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-55'/>
-    <!-- void (diagnostic_context*, diagnostic_info*)* -->
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
-    <!-- void (int)* -->
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-104'/>
-    <!-- void (void*)* -->
+    <!-- void (*)(diagnostic_context*, const char*, va_list*) -->
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-55'/>
+    <!-- void (*)(diagnostic_context*, diagnostic_info*) -->
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-109'/>
+    <!-- void (*)(int) -->
+    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-104'/>
+    <!-- void (*)(void) -->
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-138'/>
-    <!-- void (void*, _obstack_chunk*)* -->
+    <!-- void (*)(void*, _obstack_chunk*) -->
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-72'/>
-    <!-- void* (long int)* -->
+    <!-- void* (*)(long int) -->
     <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-95'/>
@@ -2114,7 +2114,7 @@ 
       <!-- void -->
       <return type-id='type-id-99'/>
     </function-decl>
-    <!-- int _obstack_begin(obstack*, int, int, void* (long int)*, void (void*)*) -->
+    <!-- int _obstack_begin(obstack*, int, int, void* (*)(long int), void (*)(void*)) -->
     <function-decl name='_obstack_begin' filepath='../.././gcc/../include/obstack.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'obstack*' -->
       <parameter type-id='type-id-75'/>
@@ -2122,9 +2122,9 @@ 
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
-      <!-- parameter of type 'void* (long int)*' -->
+      <!-- parameter of type 'void* (*)(long int)' -->
       <parameter type-id='type-id-141'/>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-138'/>
       <!-- int -->
       <return type-id='type-id-2'/>
@@ -2372,10 +2372,10 @@ 
       <!-- long int -->
       <return type-id='type-id-28'/>
     </function-decl>
-    <!-- int atexit(void ()*) -->
+    <!-- int atexit(void (*)(void)) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <!-- parameter of type 'void ()*' -->
-      <parameter type-id='type-id-133'/>
+      <!-- parameter of type 'void (*)(void)' -->
+      <parameter type-id='type-id-136'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
@@ -2541,13 +2541,8 @@ 
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-type>
-    <!-- void () -->
-    <function-type size-in-bits='64' id='type-id-132'>
-      <!-- void -->
-      <return type-id='type-id-99'/>
-    </function-type>
     <!-- void (diagnostic_context*, const char*, va_list*) -->
-    <function-type size-in-bits='64' id='type-id-134'>
+    <function-type size-in-bits='64' id='type-id-132'>
       <!-- parameter of type 'diagnostic_context*' -->
       <parameter type-id='type-id-123'/>
       <!-- parameter of type 'const char*' -->
@@ -2558,7 +2553,7 @@ 
       <return type-id='type-id-99'/>
     </function-type>
     <!-- void (diagnostic_context*, diagnostic_info*) -->
-    <function-type size-in-bits='64' id='type-id-135'>
+    <function-type size-in-bits='64' id='type-id-133'>
       <!-- parameter of type 'diagnostic_context*' -->
       <parameter type-id='type-id-124'/>
       <!-- parameter of type 'diagnostic_info*' -->
@@ -2567,12 +2562,17 @@ 
       <return type-id='type-id-99'/>
     </function-type>
     <!-- void (int) -->
-    <function-type size-in-bits='64' id='type-id-136'>
+    <function-type size-in-bits='64' id='type-id-134'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
       <return type-id='type-id-99'/>
     </function-type>
+    <!-- void () -->
+    <function-type size-in-bits='64' id='type-id-135'>
+      <!-- void -->
+      <return type-id='type-id-99'/>
+    </function-type>
     <!-- void (void*) -->
     <function-type size-in-bits='64' id='type-id-137'>
       <!-- parameter of type 'void*' -->
@@ -2684,9 +2684,9 @@ 
     </class-decl>
     <!-- typedef expanded_location expanded_location -->
     <typedef-decl name='expanded_location' type-id='type-id-151' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-150'/>
-    <!-- typedef void* (void*, typedef size_t)* line_map_realloc -->
+    <!-- typedef void* (*)(void*, size_t) line_map_realloc -->
     <typedef-decl name='line_map_realloc' type-id='type-id-157' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-154'/>
-    <!-- typedef typedef size_t (typedef size_t)* line_map_round_alloc_size_func -->
+    <!-- typedef size_t (*)(size_t) line_map_round_alloc_size_func -->
     <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-158' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-155'/>
     <!-- const line_map** -->
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-159'/>
@@ -2694,9 +2694,9 @@ 
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-156'/>
     <!-- line_maps* -->
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-160'/>
-    <!-- typedef size_t (typedef size_t)* -->
+    <!-- size_t (*)(size_t) -->
     <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-158'/>
-    <!-- void* (void*, typedef size_t)* -->
+    <!-- void* (*)(void*, size_t) -->
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-157'/>
     <!-- unsigned long int concat_length(const char*, ...) -->
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3993,7 +3993,7 @@ 
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
     <!-- size_t* -->
     <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-174'/>
-    <!-- void* (typedef size_t)* -->
+    <!-- void* (*)(size_t) -->
     <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-176'/>
     <!-- char* xstrerror(int) -->
     <function-decl name='xstrerror' filepath='../.././gcc/../include/libiberty.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4182,9 +4182,9 @@ 
       <!-- void -->
       <return type-id='type-id-99'/>
     </function-decl>
-    <!-- void* (typedef size_t)* identifier_to_locale_alloc -->
+    <!-- void* (* identifier_to_locale_alloc)(size_t) -->
     <var-decl name='identifier_to_locale_alloc' type-id='type-id-176' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
-    <!-- void (void*)* identifier_to_locale_free -->
+    <!-- void (* identifier_to_locale_free)(void*) -->
     <var-decl name='identifier_to_locale_free' type-id='type-id-138' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <!-- const char* identifier_to_locale(const char*) -->
     <function-decl name='identifier_to_locale' mangled-name='_Z20identifier_to_localePKc' filepath='../.././gcc/pretty-print.c' line='873' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20identifier_to_localePKc'>
@@ -4397,19 +4397,19 @@ 
     <typedef-decl name='file' type-id='type-id-179' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-196'/>
     <!-- typedef unsigned int hashval_t -->
     <typedef-decl name='hashval_t' type-id='type-id-52' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-197'/>
-    <!-- typedef void* (typedef size_t, typedef size_t)* htab_alloc -->
+    <!-- typedef void* (*)(size_t, size_t) htab_alloc -->
     <typedef-decl name='htab_alloc' type-id='type-id-198' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-187'/>
-    <!-- typedef void* (void*, typedef size_t, typedef size_t)* htab_alloc_with_arg -->
+    <!-- typedef void* (*)(void*, size_t, size_t) htab_alloc_with_arg -->
     <typedef-decl name='htab_alloc_with_arg' type-id='type-id-199' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-189'/>
-    <!-- typedef void (void*)* htab_del -->
+    <!-- typedef void (*)(void*) htab_del -->
     <typedef-decl name='htab_del' type-id='type-id-138' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-186'/>
-    <!-- typedef int (void*, void*)* htab_eq -->
+    <!-- typedef int (*)(void*, void*) htab_eq -->
     <typedef-decl name='htab_eq' type-id='type-id-200' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-185'/>
-    <!-- typedef void (void*)* htab_free -->
+    <!-- typedef void (*)(void*) htab_free -->
     <typedef-decl name='htab_free' type-id='type-id-138' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-188'/>
-    <!-- typedef void (void*, void*)* htab_free_with_arg -->
+    <!-- typedef void (*)(void*, void*) htab_free_with_arg -->
     <typedef-decl name='htab_free_with_arg' type-id='type-id-201' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-190'/>
-    <!-- typedef typedef hashval_t (void*)* htab_hash -->
+    <!-- typedef hashval_t (*)(void*) htab_hash -->
     <typedef-decl name='htab_hash' type-id='type-id-202' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-184'/>
     <!-- typedef htab* htab_t -->
     <typedef-decl name='htab_t' type-id='type-id-203' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-204'/>
@@ -4421,21 +4421,21 @@ 
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-192'/>
     <!-- file_stack_entry* -->
     <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-182'/>
+    <!-- hashval_t (*)(void*) -->
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-202'/>
     <!-- htab* -->
     <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-203'/>
-    <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-200'/>
+    <!-- int (*)(void*, void*) -->
+    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-200'/>
     <!-- symbol* -->
     <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-194'/>
     <!-- symbol_stack_entry* -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
-    <!-- typedef hashval_t (void*)* -->
-    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-202'/>
-    <!-- void (void*, void*)* -->
+    <!-- void (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-201'/>
-    <!-- void* (typedef size_t, typedef size_t)* -->
+    <!-- void* (*)(size_t, size_t) -->
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-198'/>
-    <!-- void* (void*, typedef size_t, typedef size_t)* -->
+    <!-- void* (*)(void*, size_t, size_t) -->
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-199'/>
     <!-- char* cplus_demangle(const char*, int) -->
     <function-decl name='cplus_demangle' filepath='../.././gcc/../include/demangle.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4542,7 +4542,7 @@ 
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-206'>
+    <function-type size-in-bits='64' id='type-id-207'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-39'/>
       <!-- parameter of type 'void*' -->
@@ -4551,7 +4551,7 @@ 
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hashval_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-207'>
+    <function-type size-in-bits='64' id='type-id-206'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-39'/>
       <!-- typedef hashval_t -->
@@ -4913,11 +4913,11 @@ 
     </enum-decl>
     <!-- typedef cpp_callbacks cpp_callbacks -->
     <typedef-decl name='cpp_callbacks' type-id='type-id-236' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-237'/>
-    <!-- typedef int (cpp_reader*, cpp_hashnode*, void*)* cpp_cb -->
+    <!-- typedef int (*)(cpp_reader*, cpp_hashnode*, void*) cpp_cb -->
     <typedef-decl name='cpp_cb' type-id='type-id-238' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-239'/>
     <!-- typedef cpp_options cpp_options -->
     <typedef-decl name='cpp_options' type-id='type-id-240' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-241'/>
-    <!-- typedef void (cpp_reader*)* pragma_cb -->
+    <!-- typedef void (*)(cpp_reader*) pragma_cb -->
     <typedef-decl name='pragma_cb' type-id='type-id-242' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-243'/>
     <!-- cpp_callbacks* -->
     <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-244'/>
@@ -4925,7 +4925,7 @@ 
     <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-245'/>
     <!-- cpp_string* -->
     <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-226'/>
-    <!-- int (cpp_reader*, cpp_hashnode*, void*)* -->
+    <!-- int (*)(cpp_reader*, cpp_hashnode*, void*) -->
     <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-238'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-229'/>
@@ -5867,11 +5867,11 @@ 
         <var-decl name='d_name' type-id='type-id-266' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-200' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-269'/>
     <!-- typedef long int __ssize_t -->
     <typedef-decl name='__ssize_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-270'/>
-    <!-- typedef int (void**, void*)* htab_trav -->
+    <!-- typedef int (*)(void**, void*) htab_trav -->
     <typedef-decl name='htab_trav' type-id='type-id-271' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-272'/>
     <!-- typedef __off_t off_t -->
     <typedef-decl name='off_t' type-id='type-id-35' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-273'/>
@@ -5881,7 +5881,7 @@ 
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-232'/>
     <!-- dirent* -->
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-275'/>
-    <!-- int (void**, void*)* -->
+    <!-- int (*)(void**, void*) -->
     <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-271'/>
     <!-- off_t* -->
     <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-233'/>
@@ -6314,9 +6314,9 @@ 
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
+    <!-- typedef int (*)(cpp_reader*, hashnode, void*) ht_cb -->
     <typedef-decl name='ht_cb' type-id='type-id-281' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-282'/>
-    <!-- int (cpp_reader*, typedef hashnode, void*)* -->
+    <!-- int (*)(cpp_reader*, hashnode, void*) -->
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-281'/>
     <!-- void _cpp_init_hashtable(cpp_reader*, hash_table*) -->
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
@@ -7541,43 +7541,43 @@ 
     <!-- struct cpp_callbacks -->
     <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-236'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
+        <!-- void (* cpp_callbacks::line_change)(cpp_reader*, const cpp_token*, int) -->
         <var-decl name='line_change' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
+        <!-- void (* cpp_callbacks::file_change)(cpp_reader*, const line_map*) -->
         <var-decl name='file_change' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
+        <!-- void (* cpp_callbacks::dir_change)(cpp_reader*, const char*) -->
         <var-decl name='dir_change' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
+        <!-- void (* cpp_callbacks::include)(cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
         <var-decl name='include' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
+        <!-- void (* cpp_callbacks::define)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='define' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
+        <!-- void (* cpp_callbacks::undef)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='undef' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
+        <!-- void (* cpp_callbacks::ident)(cpp_reader*, source_location, const cpp_string*) -->
         <var-decl name='ident' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
+        <!-- void (* cpp_callbacks::def_pragma)(cpp_reader*, source_location) -->
         <var-decl name='def_pragma' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
+        <!-- int (* cpp_callbacks::valid_pch)(cpp_reader*, const char*, int) -->
         <var-decl name='valid_pch' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
+        <!-- void (* cpp_callbacks::read_pch)(cpp_reader*, const char*, int, const char*) -->
         <var-decl name='read_pch' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
@@ -7585,31 +7585,31 @@ 
         <var-decl name='missing_header' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
+        <!-- cpp_hashnode* (* cpp_callbacks::macro_to_expand)(cpp_reader*, const cpp_token*) -->
         <var-decl name='macro_to_expand' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
+        <!-- bool (* cpp_callbacks::error)(cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
         <var-decl name='error' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
+        <!-- void (* cpp_callbacks::used_define)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='used_define' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
+        <!-- void (* cpp_callbacks::used_undef)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='used_undef' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
+        <!-- void (* cpp_callbacks::before_define)(cpp_reader*) -->
         <var-decl name='before_define' type-id='type-id-242' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
+        <!-- void (* cpp_callbacks::used)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='used' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
+        <!-- bool (* cpp_callbacks::user_builtin_macro)(cpp_reader*, cpp_hashnode*) -->
         <var-decl name='user_builtin_macro' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
@@ -7749,7 +7749,7 @@ 
         <var-decl name='name_map' type-id='type-id-253' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
+        <!-- char* (* cpp_dir::construct)(const char*, cpp_dir*) -->
         <var-decl name='construct' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
@@ -8354,11 +8354,11 @@ 
         <var-decl name='entries' type-id='type-id-373' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
+        <!-- hashnode (* ht::alloc_node)(hash_table*) -->
         <var-decl name='alloc_node' type-id='type-id-374' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <!-- void* (typedef size_t)* ht::alloc_subobject -->
+        <!-- void* (* ht::alloc_subobject)(size_t) -->
         <var-decl name='alloc_subobject' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
@@ -8551,7 +8551,7 @@ 
     <typedef-decl name='_cpp_file' type-id='type-id-248' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-381'/>
     <!-- typedef _cpp_line_note _cpp_line_note -->
     <typedef-decl name='_cpp_line_note' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-382'/>
-    <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
+    <!-- typedef bool (*)(iconv_t, const unsigned char*, size_t, _cpp_strbuf*) convert_f -->
     <typedef-decl name='convert_f' type-id='type-id-383' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-369'/>
     <!-- typedef cpp_buffer cpp_buffer -->
     <typedef-decl name='cpp_buffer' type-id='type-id-323' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-384'/>
@@ -8575,7 +8575,7 @@ 
     <typedef-decl name='ino_t' type-id='type-id-84' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-355'/>
     <!-- typedef macro_context macro_context -->
     <typedef-decl name='macro_context' type-id='type-id-376' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-375'/>
-    <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
+    <!-- typedef const char* (*)(cpp_reader*, const char*, cpp_dir**) missing_header_cb -->
     <typedef-decl name='missing_header_cb' type-id='type-id-389' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-338'/>
     <!-- typedef __time_t time_t -->
     <typedef-decl name='time_t' type-id='type-id-96' filepath='/usr/include/time.h' line='76' column='1' id='type-id-390'/>
@@ -8606,15 +8606,15 @@ 
     <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-280'/>
     <!-- _cpp_line_note* -->
     <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-324'/>
-    <!-- bool (cpp_reader*, cpp_hashnode*)* -->
+    <!-- bool (*)(cpp_reader*, cpp_hashnode*) -->
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-341'/>
-    <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
+    <!-- bool (*)(cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-340'/>
-    <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
+    <!-- bool (*)(iconv_t, const unsigned char*, size_t, _cpp_strbuf*) -->
     <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-383'/>
-    <!-- char* (const char*, cpp_dir*)* -->
+    <!-- char* (*)(const char*, cpp_dir*) -->
     <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-354'/>
-    <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
+    <!-- const char* (*)(cpp_reader*, const char*, cpp_dir**) -->
     <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-389'/>
     <!-- const char** -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-253'/>
@@ -8662,7 +8662,7 @@ 
     <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-251'/>
     <!-- cpp_dir** -->
     <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-408'/>
-    <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
+    <!-- cpp_hashnode* (*)(cpp_reader*, const cpp_token*) -->
     <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-339'/>
     <!-- cpp_reader* -->
     <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-285'/>
@@ -8674,49 +8674,49 @@ 
     <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-254'/>
     <!-- hash_table* -->
     <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-284'/>
+    <!-- hashnode (*)(hash_table*) -->
+    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-374'/>
     <!-- hashnode* -->
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-373'/>
     <!-- ht* -->
     <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-365'/>
     <!-- ht_identifier* -->
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-388'/>
-    <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-336'/>
+    <!-- int (*)(cpp_reader*, const char*, int) -->
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-336'/>
     <!-- macro_context* -->
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-347'/>
     <!-- op* -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-265'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-412'/>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-413'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-379'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-293'/>
-    <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-374'/>
     <!-- uchar* -->
     <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-231'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-257'/>
-    <!-- void (cpp_reader*)* -->
+    <!-- void (*)(cpp_reader*) -->
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-242'/>
-    <!-- void (cpp_reader*, const char*)* -->
+    <!-- void (*)(cpp_reader*, const char*) -->
     <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-331'/>
-    <!-- void (cpp_reader*, const char*, int, const char*)* -->
+    <!-- void (*)(cpp_reader*, const char*, int, const char*) -->
     <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-337'/>
-    <!-- void (cpp_reader*, const cpp_token*, int)* -->
+    <!-- void (*)(cpp_reader*, const cpp_token*, int) -->
     <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-329'/>
-    <!-- void (cpp_reader*, const line_map*)* -->
+    <!-- void (*)(cpp_reader*, const line_map*) -->
     <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-330'/>
-    <!-- void (cpp_reader*, typedef source_location)* -->
+    <!-- void (*)(cpp_reader*, source_location) -->
     <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-335'/>
-    <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
+    <!-- void (*)(cpp_reader*, source_location, const cpp_string*) -->
     <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-334'/>
-    <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
+    <!-- void (*)(cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
     <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-332'/>
-    <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
+    <!-- void (*)(cpp_reader*, source_location, cpp_hashnode*) -->
     <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-333'/>
     <!-- _cpp_strbuf* -->
     <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-423'/>
@@ -8899,7 +8899,7 @@ 
     <!-- time_t time(time_t*) -->
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'time_t*' -->
-      <parameter type-id='type-id-411'/>
+      <parameter type-id='type-id-412'/>
       <!-- typedef time_t -->
       <return type-id='type-id-390'/>
     </function-decl>
@@ -8908,7 +8908,7 @@ 
       <!-- parameter of type 'const time_t*' -->
       <parameter type-id='type-id-404'/>
       <!-- tm* -->
-      <return type-id='type-id-412'/>
+      <return type-id='type-id-413'/>
     </function-decl>
     <!-- char* asctime(const tm*) -->
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8988,14 +8988,14 @@ 
       <return type-id='type-id-230'/>
     </function-type>
     <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-413'>
+    <function-type size-in-bits='64' id='type-id-410'>
       <!-- parameter of type 'hash_table*' -->
       <parameter type-id='type-id-284'/>
       <!-- typedef hashnode -->
       <return type-id='type-id-286'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-410'>
+    <function-type size-in-bits='64' id='type-id-411'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-222'/>
       <!-- parameter of type 'const char*' -->
@@ -9876,7 +9876,7 @@ 
         <var-decl name='number' type-id='type-id-28' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
+    <!-- typedef void (*)(const char*, size_t, void*) demangle_callbackref -->
     <typedef-decl name='demangle_callbackref' type-id='type-id-467' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-468'/>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
     <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-452'>
@@ -9947,7 +9947,7 @@ 
     <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-449'/>
     <!-- demangle_component** -->
     <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-450'/>
-    <!-- void (const char*, typedef size_t, void*)* -->
+    <!-- void (*)(const char*, size_t, void*) -->
     <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-467'/>
     <!-- int cplus_demangle_fill_name(demangle_component*, const char*, int) -->
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
@@ -10601,39 +10601,39 @@ 
     <!-- struct pex_funcs -->
     <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-490'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
+        <!-- int (* pex_funcs::open_read)(pex_obj*, const char*, int) -->
         <var-decl name='open_read' type-id='type-id-491' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
+        <!-- int (* pex_funcs::open_write)(pex_obj*, const char*, int) -->
         <var-decl name='open_write' type-id='type-id-491' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
+        <!-- pid_t (* pex_funcs::exec_child)(pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
         <var-decl name='exec_child' type-id='type-id-492' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- int (pex_obj*, int)* pex_funcs::close -->
+        <!-- int (* pex_funcs::close)(pex_obj*, int) -->
         <var-decl name='close' type-id='type-id-493' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
+        <!-- pid_t (* pex_funcs::wait)(pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
         <var-decl name='wait' type-id='type-id-494' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
+        <!-- int (* pex_funcs::pipe)(pex_obj*, int*, int) -->
         <var-decl name='pipe' type-id='type-id-495' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
+        <!-- FILE* (* pex_funcs::fdopenr)(pex_obj*, int, int) -->
         <var-decl name='fdopenr' type-id='type-id-496' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
+        <!-- FILE* (* pex_funcs::fdopenw)(pex_obj*, int, int) -->
         <var-decl name='fdopenw' type-id='type-id-496' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- void (pex_obj*)* pex_funcs::cleanup -->
+        <!-- void (* pex_funcs::cleanup)(pex_obj*) -->
         <var-decl name='cleanup' type-id='type-id-497' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
@@ -10739,27 +10739,27 @@ 
     <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-499'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-499' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-500'/>
-    <!-- FILE* (pex_obj*, int, int)* -->
+    <!-- FILE* (*)(pex_obj*, int, int) -->
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-496'/>
     <!-- const pex_funcs -->
     <qualified-type-def type-id='type-id-490' const='yes' id='type-id-502'/>
     <!-- const pex_funcs* -->
     <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-147'/>
-    <!-- int (pex_obj*, const char*, int)* -->
+    <!-- int (*)(pex_obj*, const char*, int) -->
     <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-491'/>
-    <!-- int (pex_obj*, int)* -->
+    <!-- int (*)(pex_obj*, int) -->
     <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-493'/>
-    <!-- int (pex_obj*, int*, int)* -->
+    <!-- int (*)(pex_obj*, int*, int) -->
     <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-495'/>
     <!-- pex_time* -->
     <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-146'/>
-    <!-- pid_t* -->
-    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-145'/>
-    <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
+    <!-- pid_t (*)(pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
     <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-492'/>
-    <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
+    <!-- pid_t (*)(pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
     <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-494'/>
-    <!-- void (pex_obj*)* -->
+    <!-- pid_t* -->
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-145'/>
+    <!-- void (*)(pex_obj*) -->
     <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-497'/>
     <!-- pex_obj* pex_init_common(int, const char*, const char*, const pex_funcs*) -->
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
@@ -11214,8 +11214,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xexit.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <!-- void ()* _xexit_cleanup -->
-    <var-decl name='_xexit_cleanup' type-id='type-id-133' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
+    <!-- void (* _xexit_cleanup)(void) -->
+    <var-decl name='_xexit_cleanup' type-id='type-id-136' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- typedef long int __intptr_t -->
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 1ceb92af..f9120693 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -32,15 +32,15 @@ 
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
+    <!-- int*(*[10])[4] -->
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='640' id='type-id-16'>
+      <!-- <anonymous range>[10] -->
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-17'/>
+    </array-type-def>
     <!-- int*[4] -->
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
+    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='256' id='type-id-19'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-17'/>
-    </array-type-def>
-    <!-- int*[4]*[10] -->
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
-      <!-- <anonymous range>[10] -->
-      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-20'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-20'/>
     </array-type-def>
     <!-- int[5] -->
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
@@ -64,8 +64,8 @@ 
         <var-decl name='c' type-id='type-id-11' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='5' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <!-- int*[4]* S::d[10] -->
-        <var-decl name='d' type-id='type-id-19' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
+        <!-- int*(* S::d[10])[4] -->
+        <var-decl name='d' type-id='type-id-16' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- char S::e[1] -->
@@ -81,9 +81,9 @@ 
     <!-- char* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
     <!-- int* -->
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-15'/>
-    <!-- int*[4]* -->
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-18'/>
+    <!-- int*(*)[4] -->
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-15'/>
     <!-- int foo(S&) -->
     <function-decl name='foo' mangled-name='_Z3fooR1S' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3fooR1S'>
       <!-- parameter of type 'S&' -->
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index 328ce804..224237e2 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -3,14 +3,14 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 79 Added functions:
 
-  [A] 'function lttng_condition* lttng_condition_session_consumed_size_create()'
+  [A] 'function lttng_condition* lttng_condition_session_consumed_size_create(void)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_get_session_name(const lttng_condition*, const char**)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_get_threshold(const lttng_condition*, uint64_t*)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_set_session_name(lttng_condition*, const char*)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_set_threshold(lttng_condition*, uint64_t)'
-  [A] 'function lttng_condition* lttng_condition_session_rotation_completed_create()'
+  [A] 'function lttng_condition* lttng_condition_session_rotation_completed_create(void)'
   [A] 'function lttng_condition_status lttng_condition_session_rotation_get_session_name(const lttng_condition*, const char**)'
-  [A] 'function lttng_condition* lttng_condition_session_rotation_ongoing_create()'
+  [A] 'function lttng_condition* lttng_condition_session_rotation_ongoing_create(void)'
   [A] 'function lttng_condition_status lttng_condition_session_rotation_set_session_name(lttng_condition*, const char*)'
   [A] 'function lttng_error_code lttng_create_session_ext(lttng_session_descriptor*)'
   [A] 'function lttng_error_code lttng_destroy_session_ext(const char*, lttng_destruction_handle**)'
@@ -24,7 +24,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
   [A] 'function lttng_evaluation_status lttng_evaluation_session_consumed_size_get_consumed_size(const lttng_evaluation*, uint64_t*)'
   [A] 'function lttng_evaluation_status lttng_evaluation_session_rotation_completed_get_location(const lttng_evaluation*, const lttng_trace_archive_location**)'
   [A] 'function lttng_evaluation_status lttng_evaluation_session_rotation_get_id(const lttng_evaluation*, uint64_t*)'
-  [A] 'function lttng_event* lttng_event_create()'
+  [A] 'function lttng_event* lttng_event_create(void)'
   [A] 'function void lttng_event_destroy(lttng_event*)'
   [A] 'function const lttng_userspace_probe_location* lttng_event_get_userspace_probe_location(const lttng_event*)'
   [A] 'function int lttng_event_set_userspace_probe_location(lttng_event*, lttng_userspace_probe_location*)'
@@ -35,10 +35,10 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
   [A] 'function lttng_rotation_status lttng_rotation_handle_get_state(lttng_rotation_handle*, lttng_rotation_state*)'
   [A] 'function void lttng_rotation_schedule_destroy(lttng_rotation_schedule*)'
   [A] 'function lttng_rotation_schedule_type lttng_rotation_schedule_get_type(const lttng_rotation_schedule*)'
-  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_periodic_create()'
+  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_periodic_create(void)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_periodic_get_period(const lttng_rotation_schedule*, uint64_t*)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_periodic_set_period(lttng_rotation_schedule*, uint64_t)'
-  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_size_threshold_create()'
+  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_size_threshold_create(void)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_size_threshold_get_threshold(const lttng_rotation_schedule*, uint64_t*)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_size_threshold_set_threshold(lttng_rotation_schedule*, uint64_t)'
   [A] 'function void lttng_rotation_schedules_destroy(lttng_rotation_schedules*)'
@@ -74,9 +74,9 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
   [A] 'function const lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_get_lookup_method(const lttng_userspace_probe_location*)'
   [A] 'function lttng_userspace_probe_location_type lttng_userspace_probe_location_get_type(const lttng_userspace_probe_location*)'
   [A] 'function void lttng_userspace_probe_location_lookup_method_destroy(lttng_userspace_probe_location_lookup_method*)'
-  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_function_elf_create()'
+  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_function_elf_create(void)'
   [A] 'function lttng_userspace_probe_location_lookup_method_type lttng_userspace_probe_location_lookup_method_get_type(const lttng_userspace_probe_location_lookup_method*)'
-  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create()'
+  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create(void)'
   [A] 'function lttng_userspace_probe_location* lttng_userspace_probe_location_tracepoint_create(const char*, const char*, const char*, lttng_userspace_probe_location_lookup_method*)'
   [A] 'function int lttng_userspace_probe_location_tracepoint_get_binary_fd(const lttng_userspace_probe_location*)'
   [A] 'function const char* lttng_userspace_probe_location_tracepoint_get_binary_path(const lttng_userspace_probe_location*)'
@@ -91,12 +91,12 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         type size hasn't changed
         3 data member changes:
           type of 'action_validate_cb validate' changed:
-            underlying type 'bool (lttng_action*)*' changed:
+            underlying type 'bool (*)(lttng_action*)' changed:
               in pointed to type 'function type bool (lttng_action*)':
                 parameter 1 of type 'lttng_action*' has sub-type changes:
                   pointed to type 'struct lttng_action' changed, as being reported
           type of 'action_serialize_cb serialize' changed:
-            underlying type 'typedef ssize_t (lttng_action*, char*)*' changed:
+            underlying type 'ssize_t (*)(lttng_action*, char*)' changed:
               in pointed to type 'function type typedef ssize_t (lttng_action*, char*)':
                 return type changed:
                   entity changed from 'typedef ssize_t' to compatible type 'int'
@@ -109,7 +109,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     entity changed from 'char' to 'struct lttng_dynamic_buffer'
                     type size changed from 8 to 192 (in bits)
           type of 'action_destroy_cb destroy' changed:
-            underlying type 'void (lttng_action*)*' changed:
+            underlying type 'void (*)(lttng_action*)' changed:
               in pointed to type 'function type void (lttng_action*)':
                 parameter 1 of type 'lttng_action*' has sub-type changes:
                   pointed to type 'struct lttng_action' changed, as being reported
@@ -118,7 +118,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
     parameter 1 of type 'lttng_action*' has sub-type changes:
       pointed to type 'struct lttng_action' changed, as reported earlier
 
-  [C] 'function lttng_action* lttng_action_notify_create()' has some indirect sub-type changes:
+  [C] 'function lttng_action* lttng_action_notify_create(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct lttng_action' changed, as reported earlier
 
@@ -146,13 +146,13 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING' value '103'
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED' value '104'
             type of 'condition_validate_cb validate' changed:
-              underlying type 'bool (const lttng_condition*)*' changed:
+              underlying type 'bool (*)(const lttng_condition*)' changed:
                 in pointed to type 'function type bool (const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
             type of 'condition_serialize_cb serialize' changed:
-              underlying type 'typedef ssize_t (const lttng_condition*, char*)*' changed:
+              underlying type 'ssize_t (*)(const lttng_condition*, char*)' changed:
                 in pointed to type 'function type typedef ssize_t (const lttng_condition*, char*)':
                   return type changed:
                     entity changed from 'typedef ssize_t' to compatible type 'int'
@@ -166,7 +166,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
             type of 'condition_equal_cb equal' changed:
-              underlying type 'bool (const lttng_condition*, const lttng_condition*)*' changed:
+              underlying type 'bool (*)(const lttng_condition*, const lttng_condition*)' changed:
                 in pointed to type 'function type bool (const lttng_condition*, const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
@@ -175,7 +175,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
             type of 'condition_destroy_cb destroy' changed:
-              underlying type 'void (lttng_condition*)*' changed:
+              underlying type 'void (*)(lttng_condition*)' changed:
                 in pointed to type 'function type void (lttng_condition*)':
                   parameter 1 of type 'lttng_condition*' has sub-type changes:
                     pointed to type 'struct lttng_condition' changed, as being reported
@@ -200,11 +200,11 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'const lttng_condition':
         unqualified underlying type 'struct lttng_condition' changed, as reported earlier
 
-  [C] 'function lttng_condition* lttng_condition_buffer_usage_high_create()' has some indirect sub-type changes:
+  [C] 'function lttng_condition* lttng_condition_buffer_usage_high_create(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct lttng_condition' changed, as reported earlier
 
-  [C] 'function lttng_condition* lttng_condition_buffer_usage_low_create()' has some indirect sub-type changes:
+  [C] 'function lttng_condition* lttng_condition_buffer_usage_low_create(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct lttng_condition' changed, as reported earlier
 
@@ -269,7 +269,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
           3 data member changes:
             type of 'lttng_condition_type type' changed, as reported earlier
             type of 'evaluation_serialize_cb serialize' changed:
-              underlying type 'typedef ssize_t (lttng_evaluation*, char*)*' changed:
+              underlying type 'ssize_t (*)(lttng_evaluation*, char*)' changed:
                 in pointed to type 'function type typedef ssize_t (lttng_evaluation*, char*)':
                   return type changed:
                     entity changed from 'typedef ssize_t' to compatible type 'int'
@@ -284,7 +284,7 @@  Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
             type of 'evaluation_destroy_cb destroy' changed:
-              underlying type 'void (lttng_evaluation*)*' changed:
+              underlying type 'void (*)(lttng_evaluation*)' changed:
                 in pointed to type 'function type void (lttng_evaluation*)':
                   parameter 1 of type 'lttng_evaluation*' has sub-type changes:
                     pointed to type 'struct lttng_evaluation' changed, as being reported
diff --git a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
index c5a6e0a3..5d082418 100644
--- a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
+++ b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
@@ -6,6 +6,6 @@  architecture changed from 'elf-intel-80386' to 'elf-amd-x86_64'
 
 1 function with some indirect sub-type change:
 
-  [C] 'function int foo()' has some indirect sub-type changes:
+  [C] 'function int foo(void)' has some indirect sub-type changes:
     address size of function changed from 32 bits to 64 bits
 
diff --git a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
index 9683d745..672aa27f 100644
--- a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
+++ b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'
+  [A] 'function void bar(void)'
 
diff --git a/tests/data/test-diff-dwarf/test19-soname-report-0.txt b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
index 45df5856..19b43add 100644
--- a/tests/data/test-diff-dwarf/test19-soname-report-0.txt
+++ b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
@@ -6,5 +6,5 @@  SONAME changed from 'libtest19-soname-0' to 'libtest19-soname-1'
 
 1 Added function:
 
-  [A] 'function void func1()'
+  [A] 'function void func1(void)'
 
diff --git a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
index e270f48b..7a30831f 100644
--- a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void fun()' has some indirect sub-type changes:
+  [C] 'function void fun(void)' has some indirect sub-type changes:
     parameter 1 of type 'unsigned int' was added
     parameter 2 of type 'char' was added
     parameter 3 of type 'int' was added
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 3238e4c9..2ba0e64a 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -11,15 +11,15 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C] 'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0(void)' has some indirect sub-type changes:
     return type changed:
-      underlying type 'int (int)*' changed:
+      underlying type 'int (*)(int)' changed:
         in pointed to type 'function type int (int)':
           return type changed:
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C] 'function double (int)* fn1()' has some indirect sub-type changes:
+  [C] 'function double (*fn1(void))(int)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'function type double (int)':
         return type changed:
@@ -30,14 +30,14 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
-        type of 'int ()* fnptr0' changed:
-          in pointed to type 'function type int ()':
+        type of 'int (* fnptr0)(void)' changed:
+          in pointed to type 'function type int (void)':
             parameter 1 of type 'double' was added
-        type of 'int ()* fnptr1' changed:
-          in pointed to type 'function type int ()':
-            entity changed from 'function type int ()' to 'void'
+        type of 'int (* fnptr1)(void)' changed:
+          in pointed to type 'function type int (void)':
+            entity changed from 'function type int (void)' to 'void'
             type size changed from 64 to 0 (in bits)
-        type of 'int ()* fnptr2' changed:
-          entity changed from 'int ()*' to 'int'
+        type of 'int (* fnptr2)(void)' changed:
+          entity changed from 'int (*)(void)' to 'int'
           type size changed from 64 to 32 (in bits)
 
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index d16753c7..1d76043e 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -11,7 +11,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C] 'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0(void)' has some indirect sub-type changes:
     return type changed:
       underlying type 'int (int)&' changed:
         in referenced type 'function type int (int)':
@@ -19,7 +19,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C] 'function double (int)& fn1()' has some indirect sub-type changes:
+  [C] 'function double (int)& fn1(void)' has some indirect sub-type changes:
     return type changed:
       in referenced type 'function type double (int)':
         return type changed:
@@ -31,15 +31,15 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class S':
         type size hasn't changed
         3 data member changes:
-          type of 'int ()& fnref0' changed:
-            in referenced type 'function type int ()':
+          type of 'int (& fnref0)(void)' changed:
+            in referenced type 'function type int (void)':
               parameter 1 of type 'double' was added
-          type of 'int ()& fnref1' changed:
-            in referenced type 'function type int ()':
-              entity changed from 'function type int ()' to 'int*'
+          type of 'int (& fnref1)(void)' changed:
+            in referenced type 'function type int (void)':
+              entity changed from 'function type int (void)' to 'int*'
               type size hasn't changed
-          type of 'int ()& fnref2' changed:
-            in referenced type 'function type int ()':
-              entity changed from 'function type int ()' to 'int'
+          type of 'int (& fnref2)(void)' changed:
+            in referenced type 'function type int (void)':
+              entity changed from 'function type int (void)' to 'int'
               type size changed from 64 to 32 (in bits)
 
diff --git a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
index fad1ed9a..bc148f3d 100644
--- a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
+++ b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
@@ -32,7 +32,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     implicit parameter 0 of type 'Interface*' has sub-type changes:
       pointed to type 'class Interface' changed, as reported earlier
 
-  [C] 'function Interface* make_interface()' has some indirect sub-type changes:
+  [C] 'function Interface* make_interface(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'class Interface' changed, as reported earlier
 
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index ba721004..9cf2af80 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -10,7 +10,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
           'int m0' access changed from 'private' to 'public'
 
-  [C] 'function C0 foo()' has some indirect sub-type changes:
+  [C] 'function C0 foo(void)' has some indirect sub-type changes:
     return type changed:
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         details were reported earlier
diff --git a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
index 8989efd7..a9ce8065 100644
--- a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
+++ b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
@@ -12,6 +12,6 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'const volatile int[5]' to compatible type 'typedef array_type1' at test-PR26739-2-v1.c:3:1
               array element type 'const volatile int' changed:
                 'const volatile int' changed to 'const int'
-              type name changed from 'const volatile int[5]' to 'const int[5]'
+              type name changed from 'volatile const int[5]' to 'const int[5]'
               type size hasn't changed
 
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
index 2c64c39f..c73ce1aa 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
@@ -11,7 +11,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               1 data member changes (1 filtered):
-                type of 'FooStruct::Embedded* m1' changed:
+                type of 'Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
index 9af85bdc..587688ec 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
@@ -11,12 +11,12 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               2 data member changes:
-                type of 'FooStruct::Embedded* m1' changed:
+                type of 'Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
                       'char m1', at offset 32 (in bits)
-                type of 'FooStruct::Embedded** m2' changed:
+                type of 'Embedded** m2' changed:
                   in pointed to type 'FooStruct::Embedded*':
                     pointed to type 'struct FooStruct::Embedded' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index 77510262..d2ba56bc 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -308,13 +308,13 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator++()'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > > __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator-(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::difference_type) const'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator--()'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, const VarTable::Entry*>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, const VarTable::Entry*&)'
-  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<const VarTable::Entry*, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'function __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'method __gnu_cxx::new_allocator<const VarTable::Entry*>::pointer __gnu_cxx::new_allocator<const VarTable::Entry*>::allocate(__gnu_cxx::new_allocator<const VarTable::Entry*>::size_type, void*)'
@@ -1154,7 +1154,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::pair<std::_Rb_tree_const_iterator<PtrData>, bool> std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::insert(std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::value_type&)'
   [A] 'method void std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::set()'
   [A] 'function std::_Setprecision std::setprecision(int)'
-  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function void std::swap<const VarTable::Entry*>(const VarTable::Entry*&, const VarTable::Entry*&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple(std::tuple<long unsigned int const&>&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple<void, 1u>(const unsigned long int&)'
@@ -1263,7 +1263,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra':
               type size changed from 576 to 640 (in bits)
               2 data member insertions:
@@ -1418,8 +1418,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
@@ -1435,28 +1435,28 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
@@ -1485,10 +1485,10 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 11 Added variables:
 
-  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_INFO*)'
+  [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVENT, COIRESULT, void*), void*, uint64_t)'
+  [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)'
+  [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t, uint64_t*)'
   [A] 'static Stream::StreamMap Stream::all_streams'
   [A] 'static mutex_t Stream::m_stream_lock'
   [A] 'static uint64_t Stream::m_streams_count'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index d555711f..dca2fab7 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -308,13 +308,13 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator++()'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > > __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator-(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::difference_type) const'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator--()'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, const VarTable::Entry*>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, const VarTable::Entry*&)'
-  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<const VarTable::Entry*, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'function __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'method __gnu_cxx::new_allocator<const VarTable::Entry*>::pointer __gnu_cxx::new_allocator<const VarTable::Entry*>::allocate(__gnu_cxx::new_allocator<const VarTable::Entry*>::size_type, void*)'
@@ -1154,7 +1154,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::pair<std::_Rb_tree_const_iterator<PtrData>, bool> std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::insert(std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::value_type&)'
   [A] 'method void std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::set()'
   [A] 'function std::_Setprecision std::setprecision(int)'
-  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function void std::swap<const VarTable::Entry*>(const VarTable::Entry*&, const VarTable::Entry*&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple(std::tuple<long unsigned int const&>&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple<void, 1u>(const unsigned long int&)'
@@ -1263,7 +1263,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
               type size changed from 576 to 640 (in bits)
               2 data member insertions:
@@ -1418,8 +1418,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' at offload_host.cpp:4245:1 has some indirect sub-type changes:
@@ -1435,28 +1435,28 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
@@ -1485,10 +1485,10 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 11 Added variables:
 
-  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_INFO*)'
+  [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVENT, COIRESULT, void*), void*, uint64_t)'
+  [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)'
+  [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t, uint64_t*)'
   [A] 'static Stream::StreamMap Stream::all_streams'
   [A] 'static mutex_t Stream::m_stream_lock'
   [A] 'static uint64_t Stream::m_streams_count'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 7058b67a..1d214576 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -308,13 +308,13 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator++()'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > > __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator-(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::difference_type) const'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator--()'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, const VarTable::Entry*>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, const VarTable::Entry*&)'
-  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<const VarTable::Entry*, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'function __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'method __gnu_cxx::new_allocator<const VarTable::Entry*>::pointer __gnu_cxx::new_allocator<const VarTable::Entry*>::allocate(__gnu_cxx::new_allocator<const VarTable::Entry*>::size_type, void*)'
@@ -1154,7 +1154,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::pair<std::_Rb_tree_const_iterator<PtrData>, bool> std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::insert(std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::value_type&)'
   [A] 'method void std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::set()'
   [A] 'function std::_Setprecision std::setprecision(int)'
-  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function void std::swap<const VarTable::Entry*>(const VarTable::Entry*&, const VarTable::Entry*&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple(std::tuple<long unsigned int const&>&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple<void, 1u>(const unsigned long int&)'
@@ -1263,7 +1263,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
               type size changed from 0x48 to 0x50 (in bytes)
               2 data member insertions:
@@ -1418,8 +1418,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' at offload_host.cpp:4245:1 has some indirect sub-type changes:
@@ -1435,28 +1435,28 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
@@ -1485,10 +1485,10 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 11 Added variables:
 
-  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_INFO*)'
+  [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVENT, COIRESULT, void*), void*, uint64_t)'
+  [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)'
+  [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t, uint64_t*)'
   [A] 'static Stream::StreamMap Stream::all_streams'
   [A] 'static mutex_t Stream::m_stream_lock'
   [A] 'static uint64_t Stream::m_streams_count'
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index 08c01085..6cd782f4 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length(void)'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length(void)'
   [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
   [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
@@ -20,25 +20,25 @@  Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
     note that this adds a new entry to the vtable of class std::bad_array_new_length
   [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  [A] 'function std::new_handler std::get_new_handler()'
-  [A] 'function std::terminate_handler std::get_terminate()'
-  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'function std::new_handler std::get_new_handler(void)'
+  [A] 'function std::terminate_handler std::get_terminate(void)'
+  [A] 'function std::unexpected_handler std::get_unexpected(void)'
   [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception(void)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception':
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __padding', at offset 32 (in bits)
+          'void (* __padding)(void*)', at offset 32 (in bits)
         6 data member changes:
           'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
           'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          '__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
           'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          '__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
           'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index e17ef594..9c333b6e 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length(void)'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length(void)'
   [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
   [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
@@ -20,25 +20,25 @@  Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
     note that this adds a new entry to the vtable of class std::bad_array_new_length
   [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  [A] 'function std::new_handler std::get_new_handler()'
-  [A] 'function std::terminate_handler std::get_terminate()'
-  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'function std::new_handler std::get_new_handler(void)'
+  [A] 'function std::terminate_handler std::get_terminate(void)'
+  [A] 'function std::unexpected_handler std::get_unexpected(void)'
   [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception(void)' at eh_alloc.cc:158:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at unwind-cxx.h:112:1:
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __padding', at offset 32 (in bits) at unwind-cxx.h:120:1
+          'void (* __padding)(void*)', at offset 32 (in bits) at unwind-cxx.h:120:1
         6 data member changes:
           'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
           'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          '__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
           'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          '__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
           'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:116:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index e14819a4..079d4de5 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -179,7 +179,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra':
               type size changed from 576 to 640 (in bits)
               2 data member insertions:
@@ -334,8 +334,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
@@ -351,28 +351,28 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 9e12abd2..42f4a1dd 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -5,8 +5,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index c76cb67d..49eac055 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -40,7 +40,7 @@  Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
     return type changed:
       type size hasn't changed
       1 data member change:
-        type of 'std::__cxx11::string* raw_' changed:
+        type of 'string* raw_' changed:
           in pointed to type 'typedef std::__cxx11::string' at stringfwd.h:74:1:
             underlying type 'class std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >' at basic_string.h:72:1 changed:
               type size hasn't changed
diff --git a/tests/data/test-diff-filter/test6-report.txt b/tests/data/test-diff-filter/test6-report.txt
index 61fb1d93..5327622d 100644
--- a/tests/data/test-diff-filter/test6-report.txt
+++ b/tests/data/test-diff-filter/test6-report.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo(void)' has some indirect sub-type changes:
     return type changed:
       underlying type 'unsigned char' changed:
         type name changed from 'unsigned char' to 'unsigned int'
diff --git a/tests/data/test-diff-filter/test7-report.txt b/tests/data/test-diff-filter/test7-report.txt
index 2a28163f..b1600f86 100644
--- a/tests/data/test-diff-filter/test7-report.txt
+++ b/tests/data/test-diff-filter/test7-report.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'return_type' to 'other_return_type'
       type size hasn't changed
diff --git a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt b/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
index 171d6490..fecc0ce9 100644
--- a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
@@ -126,8 +126,8 @@ 
       type of variable changed:
         type size hasn't changed
         1 data member change:
-          type of 'typedef mp_limb_t (typedef mp_srcptr, typedef mp_size_t, typedef mp_limb_t)* gcd_1' changed:
-            in pointed to type 'function type typedef mp_limb_t (typedef mp_srcptr, typedef mp_size_t, typedef mp_limb_t)':
+          type of 'mp_limb_t (* gcd_1)(mp_srcptr, mp_size_t, mp_limb_t)' changed:
+            in pointed to type 'function type typedef mp_limb_t (mp_srcptr, mp_size_t, mp_limb_t)':
               parameter 1 of type 'typedef mp_srcptr' changed:
                 typedef name changed from mp_srcptr to mp_limb_t
                 underlying type 'const mp_limb_t*' changed:
diff --git a/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt b/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt
index 346d100b..2bf90e76 100644
--- a/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt
+++ b/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt
@@ -4,7 +4,7 @@ 
 
   1 Added function:
 
-    [A] 'function int dwarf_get_str_2()'    {dwarf_get_str_2}
+    [A] 'function int dwarf_get_str_2(void)'    {dwarf_get_str_2}
 
 ================ end of changes of 'libdwarf.so.1.20180129.0'===============
 
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index 5bc7ff2c..868e6ed1 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -11,7 +11,7 @@ 
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
           1 data member change:
-            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* P_BOUNDS' changed:
+            type of 'gl_h__gluint_vec___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB' at gl_h.ads:57:1:
                 type size hasn't changed
                 2 data member changes:
@@ -27,7 +27,7 @@ 
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
           1 data member change:
-            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* P_BOUNDS' changed:
+            type of 'gtk__glarea__attributes_array___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB':
                 type size hasn't changed
                 2 data member changes:
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 87c40934..6f71157b 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -8,7 +8,7 @@ 
     [A] 'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
     [A] 'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
     [A] 'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
-    [A] 'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
+    [A] 'function GType flatpak_query_flags_get_type(void)'    {flatpak_query_flags_get_type}
     [A] 'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
     [A] 'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
     [A] 'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
@@ -33,11 +33,11 @@ 
     [C] 'struct _FlatpakTransactionClass' changed:
       type size changed from 2176 to 2240 (in bits)
       1 data member insertion:
-        'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
+        'gboolean (* end_of_lifed_with_rebase)(FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)', at offset 1408 (in bits) at flatpak-transaction.h:117:1
       4 data member changes (3 filtered):
-        'typedef gboolean (FlatpakTransaction*)* ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+        'gboolean (* ready)(FlatpakTransaction*)' offset changed from 1408 to 1472 (in bits) (by +64 bits)
+        'gboolean (* add_new_remote)(FlatpakTransaction*, FlatpakTransactionRemoteReason, const char*, const char*, const char*)' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+        'gboolean (* run)(FlatpakTransaction*, GCancellable*, GError**)' offset changed from 1536 to 1600 (in bits) (by +64 bits)
         'gpointer padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
 
   6 added types unreachable from any public interface:
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index ec948e26..af560426 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -17,11 +17,11 @@ 
         in pointed to type 'struct sigc::connection':
           type size hasn't changed
           1 data member change:
-            type of 'sigc::slot_base* slot_' changed:
+            type of 'slot_base* slot_' changed:
               in pointed to type 'class sigc::slot_base':
                 type size hasn't changed
                 1 data member change:
-                  type of 'sigc::slot_base::rep_type* rep_' changed:
+                  type of 'rep_type* rep_' changed:
                     in pointed to type 'typedef sigc::slot_base::rep_type':
                       underlying type 'struct sigc::internal::slot_rep' changed:
                         type size hasn't changed
@@ -29,7 +29,7 @@ 
                           'struct sigc::trackable' changed:
                             type size hasn't changed
                             1 data member change:
-                              type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
+                              type of 'trackable_callback_list* callback_list_' changed:
                                 in pointed to type 'struct sigc::internal::trackable_callback_list':
                                   type size changed from 192 to 256 (in bits)
                                   2 data member changes:
diff --git a/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-compat-4.4.18-3.el9.x86_64-report-1.txt b/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-compat-4.4.18-3.el9.x86_64-report-1.txt
index b2030147..e3699d6c 100644
--- a/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-compat-4.4.18-3.el9.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-compat-4.4.18-3.el9.x86_64-report-1.txt
@@ -6,7 +6,7 @@ 
 
     [A] 'function int _crypt_crypt_checksalt(const char*)'    {crypt_checksalt@@XCRYPT_4.3}
     [A] 'function char* _crypt_crypt_gensalt_rn(const char*, unsigned long int, const char*, int, char*, int)'    {xcrypt_gensalt_r@XCRYPT_2.0, aliases crypt_gensalt_r@XCRYPT_2.0, crypt_gensalt_rn@@XCRYPT_2.0}
-    [A] 'function const char* _crypt_crypt_preferred_method()'    {crypt_preferred_method@@XCRYPT_4.4}
+    [A] 'function const char* _crypt_crypt_preferred_method(void)'    {crypt_preferred_method@@XCRYPT_4.4}
     [A] 'function char* _crypt_crypt_r(const char*, const char*, crypt_data*)'    {xcrypt_r@XCRYPT_2.0, aliases crypt_r@@XCRYPT_2.0, crypt_r@GLIBC_2.2.5}
 
 ================ end of changes of 'libcrypt.so.1.1.0'===============
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index b2d0b268..8ccc71cf 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -35,77 +35,77 @@ 
                           underlying type 'struct QXLInterface' at spice.h:230:1 changed:
                             type size hasn't changed
                             15 data member changes:
-                              type of 'void (QXLInstance*, QXLWorker*)* attache_worker' changed:
+                              type of 'void (* attache_worker)(QXLInstance*, QXLWorker*)' changed:
                                 in pointed to type 'function type void (QXLInstance*, QXLWorker*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, int)* set_compression_level' changed:
+                              type of 'void (* set_compression_level)(QXLInstance*, int)' changed:
                                 in pointed to type 'function type void (QXLInstance*, int)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint32_t)* set_mm_time' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint32_t)':
+                              type of 'void (* set_mm_time)(QXLInstance*, uint32_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint32_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, QXLDevInitInfo*)* get_init_info' changed:
+                              type of 'void (* get_init_info)(QXLInstance*, QXLDevInitInfo*)' changed:
                                 in pointed to type 'function type void (QXLInstance*, QXLDevInitInfo*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*, QXLCommandExt*)* get_command' changed:
+                              type of 'int (* get_command)(QXLInstance*, QXLCommandExt*)' changed:
                                 in pointed to type 'function type int (QXLInstance*, QXLCommandExt*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*)* req_cmd_notification' changed:
+                              type of 'int (* req_cmd_notification)(QXLInstance*)' changed:
                                 in pointed to type 'function type int (QXLInstance*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, struct QXLReleaseInfoExt)* release_resource' changed:
-                                in pointed to type 'function type void (QXLInstance*, struct QXLReleaseInfoExt)':
+                              type of 'void (* release_resource)(QXLInstance*, QXLReleaseInfoExt)' changed:
+                                in pointed to type 'function type void (QXLInstance*, QXLReleaseInfoExt)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*, QXLCommandExt*)* get_cursor_command' changed:
+                              type of 'int (* get_cursor_command)(QXLInstance*, QXLCommandExt*)' changed:
                                 in pointed to type 'function type int (QXLInstance*, QXLCommandExt*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*)* req_cursor_notification' changed:
+                              type of 'int (* req_cursor_notification)(QXLInstance*)' changed:
                                 in pointed to type 'function type int (QXLInstance*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint32_t)* notify_update' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint32_t)':
+                              type of 'void (* notify_update)(QXLInstance*, uint32_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint32_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*)* flush_resources' changed:
+                              type of 'int (* flush_resources)(QXLInstance*)' changed:
                                 in pointed to type 'function type int (QXLInstance*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint64_t)* async_complete' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint64_t)':
+                              type of 'void (* async_complete)(QXLInstance*, uint64_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint64_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint32_t, QXLRect*, typedef uint32_t)* update_area_complete' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint32_t, QXLRect*, typedef uint32_t)':
+                              type of 'void (* update_area_complete)(QXLInstance*, uint32_t, QXLRect*, uint32_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint32_t, QXLRect*, uint32_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint8_t, uint8_t*)* set_client_capabilities' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint8_t, uint8_t*)':
+                              type of 'void (* set_client_capabilities)(QXLInstance*, uint8_t, uint8_t*)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint8_t, uint8_t*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*, VDAgentMonitorsConfig*)* client_monitors_config' changed:
+                              type of 'int (* client_monitors_config)(QXLInstance*, VDAgentMonitorsConfig*)' changed:
                                 in pointed to type 'function type int (QXLInstance*, VDAgentMonitorsConfig*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
@@ -128,8 +128,8 @@ 
                                       underlying type 'struct SpiceCoreInterface' at spice.h:82:1 changed:
                                         type size hasn't changed
                                         3 data member changes:
-                                          type of 'SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)* watch_add' changed:
-                                            in pointed to type 'function type SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)':
+                                          type of 'SpiceWatch* (* watch_add)(int, int, SpiceWatchFunc, void*)' changed:
+                                            in pointed to type 'function type SpiceWatch* (int, int, SpiceWatchFunc, void*)':
                                               return type changed:
                                                 in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                   underlying type 'struct SpiceWatch' at red_worker.c:268:1 changed:
@@ -165,7 +165,7 @@ 
                                                                                     type size hasn't changed
                                                                                     10 data member changes:
                                                                                       type of 'channel_configure_socket_proc config_socket' changed:
-                                                                                        underlying type 'int (RedChannelClient*)*' changed:
+                                                                                        underlying type 'int (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type int (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               in pointed to type 'typedef RedChannelClient' at red_channel.h:131:1:
@@ -194,9 +194,9 @@ 
                                                                                                           5 data member deletions:
                                                                                                             'RedsSASL sasl', at offset 256 (in bits) at reds.h:78:1
                                                                                                             'SpiceChannelEventInfo* info', at offset 1024 (in bits) at reds.h:85:1
-                                                                                                            'typedef ssize_t (RedsStream*, void*, typedef size_t)* read', at offset 1088 (in bits) at reds.h:88:1
-                                                                                                            'typedef ssize_t (RedsStream*, void*, typedef size_t)* write', at offset 1152 (in bits) at reds.h:89:1
-                                                                                                            'typedef ssize_t (RedsStream*, const iovec*, int)* writev', at offset 1216 (in bits) at reds.h:90:1
+                                                                                                            'ssize_t (* read)(RedsStream*, void*, size_t)', at offset 1088 (in bits) at reds.h:88:1
+                                                                                                            'ssize_t (* write)(RedsStream*, void*, size_t)', at offset 1152 (in bits) at reds.h:89:1
+                                                                                                            'ssize_t (* writev)(RedsStream*, const iovec*, int)', at offset 1216 (in bits) at reds.h:90:1
                                                                                                           2 data member changes:
                                                                                                             type of 'SSL* ssl' changed:
                                                                                                               in pointed to type 'typedef SSL' at reds_stream.h:32:1:
@@ -213,7 +213,7 @@ 
                                                                                                                     'BIO* bbio', at offset 256 (in bits) at ssl.h:1082:1
                                                                                                                     'int rwstate', at offset 320 (in bits) at ssl.h:1093:1
                                                                                                                     'int in_handshake', at offset 352 (in bits) at ssl.h:1096:1
-                                                                                                                    'int (SSL*)* handshake_func', at offset 384 (in bits) at ssl.h:1097:1
+                                                                                                                    'int (* handshake_func)(SSL*)', at offset 384 (in bits) at ssl.h:1097:1
                                                                                                                     'int server', at offset 448 (in bits) at ssl.h:1107:1
                                                                                                                     'int new_session', at offset 480 (in bits) at ssl.h:1109:1
                                                                                                                     'int quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
@@ -230,7 +230,7 @@ 
                                                                                                                     'ssl3_state_st* s3', at offset 1024 (in bits) at ssl.h:1129:1
                                                                                                                     'dtls1_state_st* d1', at offset 1088 (in bits) at ssl.h:1130:1
                                                                                                                     'int read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
-                                                                                                                    'void (int, int, int, void*, typedef size_t, SSL*, void*)* msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
+                                                                                                                    'void (* msg_callback)(int, int, int, void*, size_t, SSL*, void*)', at offset 1216 (in bits) at ssl.h:1136:1
                                                                                                                     'void* msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
                                                                                                                     'int hit', at offset 1344 (in bits) at ssl.h:1139:1
                                                                                                                     'X509_VERIFY_PARAM* param', at offset 1408 (in bits) at ssl.h:1141:1
@@ -249,13 +249,13 @@ 
                                                                                                                     'SSL_SESSION* session', at offset 2432 (in bits) at ssl.h:1183:1
                                                                                                                     'GEN_SESSION_CB generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
                                                                                                                     'int verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
-                                                                                                                    'int (int, X509_STORE_CTX*)* verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
-                                                                                                                    'void (const SSL*, int, int)* info_callback', at offset 2688 (in bits) at ssl.h:1193:1
+                                                                                                                    'int (* verify_callback)(int, X509_STORE_CTX*)', at offset 2624 (in bits) at ssl.h:1191:1
+                                                                                                                    'void (* info_callback)(const SSL*, int, int)', at offset 2688 (in bits) at ssl.h:1193:1
                                                                                                                     'int error', at offset 2752 (in bits) at ssl.h:1195:1
                                                                                                                     'int error_code', at offset 2784 (in bits) at ssl.h:1196:1
                                                                                                                     'KSSL_CTX* kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
-                                                                                                                    'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
-                                                                                                                    'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
+                                                                                                                    'unsigned int (* psk_client_callback)(SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)', at offset 2880 (in bits) at ssl.h:1203:1
+                                                                                                                    'unsigned int (* psk_server_callback)(SSL*, const char*, unsigned char*, unsigned int)', at offset 2944 (in bits) at ssl.h:1206:1
                                                                                                                     'SSL_CTX* ctx', at offset 3008 (in bits) at ssl.h:1210:1
                                                                                                                     'int debug', at offset 3072 (in bits) at ssl.h:1213:1
                                                                                                                     'long int verify_result', at offset 3136 (in bits) at ssl.h:1216:1
@@ -268,7 +268,7 @@ 
                                                                                                                     'int first_packet', at offset 3648 (in bits) at ssl.h:1226:1
                                                                                                                     'int client_version', at offset 3680 (in bits) at ssl.h:1227:1
                                                                                                                     'unsigned int max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
-                                                                                                                    'void (SSL*, int, int, unsigned char*, int, void*)* tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
+                                                                                                                    'void (* tlsext_debug_cb)(SSL*, int, int, unsigned char*, int, void*)', at offset 3776 (in bits) at ssl.h:1232:1
                                                                                                                     'void* tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
                                                                                                                     'char* tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
                                                                                                                     'int servername_done', at offset 3968 (in bits) at ssl.h:1237:1
@@ -304,48 +304,48 @@ 
                                                                                                               in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                                                                                 underlying type 'struct SpiceWatch' changed, as being reported
                                                                                       type of 'channel_disconnect_proc on_disconnect' changed:
-                                                                                        underlying type 'void (RedChannelClient*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_send_pipe_item_proc send_item' changed:
-                                                                                        underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*, PipeItem*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_hold_pipe_item_proc hold_item' changed:
-                                                                                        underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*, PipeItem*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_release_pipe_item_proc release_item' changed:
-                                                                                        underlying type 'void (RedChannelClient*, PipeItem*, int)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*, PipeItem*, int)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*, PipeItem*, int)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_alloc_msg_recv_buf_proc alloc_recv_buf' changed:
-                                                                                        underlying type 'uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)*' changed:
-                                                                                          in pointed to type 'function type uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)':
+                                                                                        underlying type 'uint8_t* (*)(RedChannelClient*, uint16_t, uint32_t)' changed:
+                                                                                          in pointed to type 'function type uint8_t* (RedChannelClient*, uint16_t, uint32_t)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_release_msg_recv_buf_proc release_recv_buf' changed:
-                                                                                        underlying type 'void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)*' changed:
-                                                                                          in pointed to type 'function type void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)':
+                                                                                        underlying type 'void (*)(RedChannelClient*, uint16_t, uint32_t, uint8_t*)' changed:
+                                                                                          in pointed to type 'function type void (RedChannelClient*, uint16_t, uint32_t, uint8_t*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark' changed:
-                                                                                        underlying type 'int (RedChannelClient*)*' changed:
+                                                                                        underlying type 'int (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type int (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_handle_migrate_data_proc handle_migrate_data' changed:
-                                                                                        underlying type 'int (RedChannelClient*, typedef uint32_t, void*)*' changed:
-                                                                                          in pointed to type 'function type int (RedChannelClient*, typedef uint32_t, void*)':
+                                                                                        underlying type 'int (*)(RedChannelClient*, uint32_t, void*)' changed:
+                                                                                          in pointed to type 'function type int (RedChannelClient*, uint32_t, void*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial' changed:
-                                                                                        underlying type 'typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)*' changed:
-                                                                                          in pointed to type 'function type typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)':
+                                                                                        underlying type 'uint64_t (*)(RedChannelClient*, uint32_t, void*)' changed:
+                                                                                          in pointed to type 'function type typedef uint64_t (RedChannelClient*, uint32_t, void*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                 type of 'ClientCbs client_cbs' changed:
@@ -353,7 +353,7 @@ 
                                                                                     type size hasn't changed
                                                                                     3 data member changes:
                                                                                       type of 'channel_client_connect_proc connect' changed:
-                                                                                        underlying type 'void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)' changed:
                                                                                           in pointed to type 'function type void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)':
                                                                                             parameter 1 of type 'RedChannel*' has sub-type changes:
                                                                                               in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
@@ -363,12 +363,12 @@ 
                                                                                             parameter 3 of type 'RedsStream*' has sub-type changes:
                                                                                               pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
                                                                                       type of 'channel_client_disconnect_proc disconnect' changed:
-                                                                                        underlying type 'void (RedChannelClient*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_client_migrate_proc migrate' changed:
-                                                                                        underlying type 'void (RedChannelClient*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
@@ -575,11 +575,11 @@ 
                                                             'uint64_t* command_counter' offset changed from 15520064 to 14876800 (in bits) (by -643264 bits)
                                                             'int driver_cap_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -643264 bits)
                                                             'int set_client_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) (by -643264 bits)
-                                          type of 'void (SpiceWatch*, int)* watch_update_mask' changed:
+                                          type of 'void (* watch_update_mask)(SpiceWatch*, int)' changed:
                                             in pointed to type 'function type void (SpiceWatch*, int)':
                                               parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-                                          type of 'void (SpiceWatch*)* watch_remove' changed:
+                                          type of 'void (* watch_remove)(SpiceWatch*)' changed:
                                             in pointed to type 'function type void (SpiceWatch*)':
                                               parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
@@ -744,19 +744,19 @@ 
                               underlying type 'struct SpiceCharDeviceCallbacks' at char_device.h:81:1 changed:
                                 type size hasn't changed
                                 4 data member changes:
-                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* read_one_msg_from_device' changed:
+                                  type of 'SpiceCharDeviceMsgToClient* (* read_one_msg_from_device)(SpiceCharDeviceInstance*, void*)' changed:
                                     in pointed to type 'function type SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)':
                                       parameter 1 of type 'SpiceCharDeviceInstance*' has sub-type changes:
                                         pointed to type 'typedef SpiceCharDeviceInstance' changed at spice.h:399:1, as reported earlier
-                                  type of 'void (SpiceCharDeviceMsgToClient*, RedClient*, void*)* send_msg_to_client' changed:
+                                  type of 'void (* send_msg_to_client)(SpiceCharDeviceMsgToClient*, RedClient*, void*)' changed:
                                     in pointed to type 'function type void (SpiceCharDeviceMsgToClient*, RedClient*, void*)':
                                       parameter 2 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, typedef uint32_t, void*)* send_tokens_to_client' changed:
-                                    in pointed to type 'function type void (RedClient*, typedef uint32_t, void*)':
+                                  type of 'void (* send_tokens_to_client)(RedClient*, uint32_t, void*)' changed:
+                                    in pointed to type 'function type void (RedClient*, uint32_t, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, void*)* remove_client' changed:
+                                  type of 'void (* remove_client)(RedClient*, void*)' changed:
                                     in pointed to type 'function type void (RedClient*, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
@@ -846,7 +846,7 @@ 
       parameter 1 of type 'SpiceServer*' has sub-type changes:
         pointed to type 'typedef SpiceServer' changed at spice.h:440:1, as reported earlier
 
-    [C] 'function SpiceServer* spice_server_new()' at reds.c:4089:1 has some indirect sub-type changes:
+    [C] 'function SpiceServer* spice_server_new(void)' at reds.c:4089:1 has some indirect sub-type changes:
       return type changed:
         pointed to type 'typedef SpiceServer' changed at spice.h:440:1, as reported earlier
 
@@ -881,19 +881,19 @@ 
                                   type of 'RedChannelClient* channel_client' changed:
                                     pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                   type of 'snd_channel_handle_message_proc handle_message' changed:
-                                    underlying type 'int (SndChannel*, typedef size_t, typedef uint32_t, void*)*' changed:
-                                      in pointed to type 'function type int (SndChannel*, typedef size_t, typedef uint32_t, void*)':
+                                    underlying type 'int (*)(SndChannel*, size_t, uint32_t, void*)' changed:
+                                      in pointed to type 'function type int (SndChannel*, size_t, uint32_t, void*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
                                   type of 'snd_channel_on_message_done_proc on_message_done' changed:
-                                    underlying type 'void (SndChannel*)*' changed:
+                                    underlying type 'void (*)(SndChannel*)' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
                                   type of 'snd_channel_cleanup_channel_proc cleanup' changed:
-                                    underlying type 'void (SndChannel*)*' changed:
+                                    underlying type 'void (*)(SndChannel*)' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
index 2afe14f8..2d2cbb93 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
@@ -83,7 +83,7 @@  Leaf changes summary: 10 artifacts changed (13 filtered out)
       function int spice_server_migrate_info(SpiceServer*, const char*, int, int, const char*)
       function int spice_server_migrate_start(SpiceServer*)
       function int spice_server_migrate_switch(SpiceServer*)
-      function SpiceServer* spice_server_new()
+      function SpiceServer* spice_server_new(void)
       function void spice_server_playback_get_buffer(SpicePlaybackInstance*, uint32_t**, uint32_t*)
       function void spice_server_playback_put_samples(SpicePlaybackInstance*, uint32_t*)
       function void spice_server_playback_set_mute(SpicePlaybackInstance*, uint8_t)
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index 28cf8588..f6cf99e5 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -6,7 +6,7 @@ 
 
   17 Added functions:
 
-    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot(void)'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
@@ -32,7 +32,7 @@ 
           type size hasn't changed
           no member function changes (4 filtered);
           1 data member changes (4 filtered):
-            type of 'tbb::internal::input_buffer* my_input_buffer' changed:
+            type of 'input_buffer* my_input_buffer' changed:
               in pointed to type 'class tbb::internal::input_buffer' at pipeline.cpp:52:1:
                 type size hasn't changed
                 1 data member change:
@@ -47,7 +47,7 @@ 
           in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
             type size hasn't changed
             1 data member change:
-              type of 'tbb::task_group_context& my_context' changed:
+              type of 'task_group_context& my_context' changed:
                 in referenced type 'class tbb::task_group_context' at task.h:302:1:
                   type size hasn't changed
                   1 data member insertion:
@@ -57,7 +57,7 @@ 
                       type name changed from 'char[80]' to 'char[72]'
                       array type size changed from 640 to 576
                       array type subrange 1 changed length from 80 to 72
-                    type of 'tbb::internal::generic_scheduler* my_owner' changed:
+                    type of 'generic_scheduler* my_owner' changed:
                       in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
                         type size changed from 3136 to 3072 (in bits)
                         1 base class change:
@@ -67,7 +67,7 @@ 
                               'volatile intptr_t* my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
                               'volatile uintptr_t* my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
                             3 data member changes (2 filtered):
-                              type of 'tbb::internal::arena_slot* my_arena_slot' changed:
+                              type of 'arena_slot* my_arena_slot' changed:
                                 in pointed to type 'struct tbb::internal::arena_slot' at scheduler_common.h:316:1:
                                   type size hasn't changed
                                   2 base class deletions:
@@ -76,7 +76,7 @@ 
                                   2 base class insertions:
                                     struct tbb::internal::padded<tbb::internal::arena_slot_line1, 128ul> at tbb_stddef.h:251:1
                                     struct tbb::internal::padded<tbb::internal::arena_slot_line2, 128ul> at tbb_stddef.h:251:1
-                              type of 'tbb::internal::arena* my_arena' changed:
+                              type of 'arena* my_arena' changed:
                                 in pointed to type 'class tbb::internal::arena' at arena.h:160:1:
                                   type size hasn't changed
                                   1 base class deletion:
@@ -87,7 +87,7 @@ 
                               type of 'tbb::internal::mail_inbox my_inbox' changed:
                                 type size hasn't changed
                                 1 data member change:
-                                  type of 'tbb::internal::mail_outbox* my_putter' changed:
+                                  type of 'mail_outbox* my_putter' changed:
                                     in pointed to type 'class tbb::internal::mail_outbox' at mailbox.h:103:1:
                                       type size hasn't changed
                                       1 base class deletion:
@@ -107,7 +107,7 @@ 
                           'volatile uintptr_t* my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
                         18 data member changes:
                           'uintptr_t my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
-                          type of 'tbb::internal::market* my_market' changed:
+                          type of 'market* my_market' changed:
                             in pointed to type 'class tbb::internal::market' at market.h:49:1:
                               type size changed from 1664 to 1728 (in bits)
                               no member function changes (8 filtered);
@@ -134,7 +134,7 @@ 
                                 'intptr_t my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
                                 'intptr_t my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
                                 'uintptr_t my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
-                                type of 'tbb::internal::market::priority_level_info my_priority_levels[3]' changed:
+                                type of 'priority_level_info my_priority_levels[3]' changed:
                                   array element type 'struct tbb::internal::market::priority_level_info' changed:
                                     type size hasn't changed
                                     1 data member change:
@@ -144,15 +144,15 @@ 
                                   type size hasn't changed
                                 and offset changed from 576 to 640 (in bits) (by +64 bits)
                                 'uintptr_t my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-                                'tbb::internal::generic_scheduler* my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+                                'generic_scheduler* my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
                           and offset changed from 768 to 896 (in bits) (by +128 bits)
                           'tbb::internal::FastRandom my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
-                          'tbb::task* my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                          'tbb::task* my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
+                          'task* my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                          'task* my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
                           'long int my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
                           'bool my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
                           'intptr_t my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
-                          'tbb::task* my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
+                          'task* my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
                           'char _padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
                           'tbb::internal::context_list_node_t my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
                           'tbb::spin_mutex my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
@@ -169,7 +169,7 @@ 
           type size hasn't changed
           no member function changes (7 filtered);
           1 data member change:
-            type of 'tbb::internal::concurrent_queue_rep* my_rep' changed:
+            type of 'concurrent_queue_rep* my_rep' changed:
               in pointed to type 'class tbb::internal::concurrent_queue_rep' at concurrent_queue.cpp:129:1:
                 type size hasn't changed
                 1 data member changes (2 filtered):
@@ -258,8 +258,8 @@ 
     [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
     [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
     [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void safer_scalable_free(void*, void (*)(void*))'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, size_t (*)(void*))'    {safer_scalable_msize}
     [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
   27 Added function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index 675d766d..c159479e 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -6,7 +6,7 @@ 
 
   17 Added functions:
 
-    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot(void)'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
@@ -32,7 +32,7 @@ 
           in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
             type size hasn't changed
             1 data member change:
-              type of 'tbb::task_group_context& my_context' changed:
+              type of 'task_group_context& my_context' changed:
                 in referenced type 'class tbb::task_group_context' at task.h:302:1:
                   type size hasn't changed
                   1 data member insertion:
@@ -116,8 +116,8 @@ 
     [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
     [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
     [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void safer_scalable_free(void*, void (*)(void*))'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, size_t (*)(void*))'    {safer_scalable_msize}
     [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
   27 Added function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
@@ -8,7 +8,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
@@ -8,7 +8,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
@@ -8,7 +8,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
@@ -8,7 +8,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 3f9c6fc7..8449e480 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv}
+  [A] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
index 0ab050b2..771dc639 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv}
+  [A] 'function void bar(void)'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 3f9c6fc7..8449e480 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv}
+  [A] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index 59592e3d..4fed710a 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void bar()'    {_Z3barv}
+  [D] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
index 4d7d51cd..ca83ecdc 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void bar()'    {_Z3barv}
+  [D] 'function void bar(void)'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index 59592e3d..4fed710a 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void bar()'    {_Z3barv}
+  [D] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
index ecb6d981..b99e4acf 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar(void)'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
index ecb6d981..b99e4acf 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar(void)'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
index ecb6d981..b99e4acf 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar(void)'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
@@ -3,5 +3,5 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index e273d013..dff96302 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -22,7 +22,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'S::priv_type* priv' changed:
+          type of 'priv_type* priv' changed:
             in pointed to type 'class S::priv_type' at test30-pub-lib-v1.cc:14:1:
               type size changed from 64 to 128 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test32-report-0.txt b/tests/data/test-diff-suppr/test32-report-0.txt
index 2489b56d..c1adfb95 100644
--- a/tests/data/test-diff-suppr/test32-report-0.txt
+++ b/tests/data/test-diff-suppr/test32-report-0.txt
@@ -3,12 +3,12 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function void priv::foo()' has some indirect sub-type changes:
+  [C] 'function void priv::foo(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'int'
       type size changed from 0 to 32 (in bits)
 
-  [C] 'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test32-report-1.txt b/tests/data/test-diff-suppr/test32-report-1.txt
index cffdf3a5..e416a088 100644
--- a/tests/data/test-diff-suppr/test32-report-1.txt
+++ b/tests/data/test-diff-suppr/test32-report-1.txt
@@ -3,7 +3,7 @@  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
index 1b49d600..6dc832ac 100644
--- a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
+++ b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
@@ -3,7 +3,7 @@  Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void test2()'    {test2}
+  [D] 'function void test2(void)'    {test2}
 
 1 Removed variable:
 
diff --git a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
index 8e6fdd4e..de2c4e6b 100644
--- a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
@@ -6,7 +6,7 @@  Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   3 Added functions:
 
-    [A] 'function const char* vte_get_features()'    {vte_get_features}
+    [A] 'function const char* vte_get_features(void)'    {vte_get_features}
     [A] 'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
     [A] 'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
 
diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ctf/test9.o.abi
index 7f1e861b..a1def56f 100644
--- a/tests/data/test-read-ctf/test9.o.abi
+++ b/tests/data/test-read-ctf/test9.o.abi
@@ -16,11 +16,11 @@ 
       <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-11'/>
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-12'/>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='256' alignment-in-bits='64' id='type-id-14'>
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-15'/>
+    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='640' alignment-in-bits='64' id='type-id-14'>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-15'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='640' alignment-in-bits='64' id='type-id-17'>
-      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-18'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='256' alignment-in-bits='64' id='type-id-17'>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-18'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='160' id='type-id-19'>
       <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-10'/>
@@ -36,7 +36,7 @@ 
         <var-decl name='c' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='d' type-id='type-id-17' visibility='default'/>
+        <var-decl name='d' type-id='type-id-14' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <var-decl name='e' type-id='type-id-6' visibility='default'/>
@@ -45,8 +45,8 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' alignment-in-bits='64' id='type-id-21'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' alignment-in-bits='64' id='type-id-13'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' alignment-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' alignment-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' alignment-in-bits='64' id='type-id-13'/>
     <function-decl name='foo' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='foo'>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-12'/>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 501658df..678c67f0 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -335,22 +335,22 @@ 
     <qualified-type-def type-id='type-id-82' restrict='yes' id='type-id-83'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-84'/>
     <qualified-type-def type-id='type-id-84' restrict='yes' id='type-id-85'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-86'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-87'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-88'/>
-    <qualified-type-def type-id='type-id-88' restrict='yes' id='type-id-89'/>
-    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-28'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-91'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-92'/>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-93'/>
-    <qualified-type-def type-id='type-id-93' restrict='yes' id='type-id-94'/>
-    <reference-type-def kind='lvalue' type-id='type-id-95' size-in-bits='64' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-97'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-86'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-87'/>
+    <qualified-type-def type-id='type-id-87' restrict='yes' id='type-id-88'/>
+    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-91'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-92'/>
+    <qualified-type-def type-id='type-id-92' restrict='yes' id='type-id-93'/>
+    <reference-type-def kind='lvalue' type-id='type-id-94' size-in-bits='64' id='type-id-95'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-96'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-97'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-106'/>
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-107'/>
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
     <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-110'/>
@@ -412,7 +412,7 @@ 
     <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-189'/>
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' id='type-id-190'/>
-      <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2112' visibility='default' id='type-id-99'>
+      <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2112' visibility='default' id='type-id-98'>
         <member-function access='public'>
           <function-decl name='rdstate' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE7rdstateEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-191' is-artificial='yes'/>
@@ -421,7 +421,7 @@ 
         </member-function>
         <member-function access='public'>
           <function-decl name='setstate' mangled-name='_ZNSt9basic_iosIcSt11char_traitsIcEE8setstateESt12_Ios_Iostate' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <parameter type-id='type-id-192'/>
             <return type-id='type-id-193'/>
           </function-decl>
@@ -440,104 +440,104 @@ 
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' mangled-name='_ZNSt9basic_iosIcSt11char_traitsIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' id='type-id-101'>
+      <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' id='type-id-100'>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' mangled-name='_ZNSdD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_istream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default' id='type-id-103'>
+      <class-decl name='basic_istream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default' id='type-id-102'>
         <member-function access='public'>
           <function-decl name='gcount' mangled-name='_ZNKSi6gcountEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-194' is-artificial='yes'/>
@@ -546,99 +546,99 @@ 
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' mangled-name='_ZNSiD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_streambuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default' id='type-id-105'>
+      <class-decl name='basic_streambuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default' id='type-id-104'>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' mangled-name='_ZNSt15basic_streambufIcSt11char_traitsIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
@@ -809,7 +809,7 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-211'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-190' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='445' column='1' id='type-id-95'/>
+          <typedef-decl name='allocator_type' type-id='type-id-190' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='445' column='1' id='type-id-94'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_pointer' type-id='type-id-60' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='453' column='1' id='type-id-212'/>
@@ -819,7 +819,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -887,7 +887,7 @@ 
           </member-type>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -911,7 +911,7 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_dispose' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -923,14 +923,14 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_destroy' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_destroyEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -948,13 +948,13 @@ 
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -966,14 +966,14 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='assign' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6assignERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1093' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
@@ -986,32 +986,32 @@ 
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-222'/>
               <return type-id='type-id-193'/>
@@ -1019,7 +1019,7 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-222'/>
@@ -1028,34 +1028,34 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-231'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_local_data' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_local_dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-216'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_length' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_lengthEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_set_length' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_set_lengthEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-232'/>
@@ -1064,7 +1064,7 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct_aux&lt;char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16_M_construct_auxIPcEEvT_S7_St12__false_type' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-233'/>
@@ -1073,7 +1073,7 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <return type-id='type-id-193'/>
@@ -1081,14 +1081,14 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_data' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_M_dataEPc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-216'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_capacity' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_M_capacityEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
@@ -1111,14 +1111,14 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='587' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-231'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;const char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-232'/>
@@ -1127,7 +1127,7 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct_aux&lt;const char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16_M_construct_auxIPKcEEvT_S8_St12__false_type' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-233'/>
@@ -1136,7 +1136,7 @@ 
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;const char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
               <return type-id='type-id-193'/>
@@ -1152,21 +1152,21 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='append' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='982' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator+=' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEpLERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='941' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='append' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1024' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <return type-id='type-id-230'/>
             </function-decl>
@@ -1182,19 +1182,19 @@ 
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='append' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-230'/>
@@ -1202,19 +1202,19 @@ 
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-222'/>
               <return type-id='type-id-193'/>
@@ -1222,26 +1222,26 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-222'/>
@@ -1250,7 +1250,7 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-231'/>
               <return type-id='type-id-193'/>
             </function-decl>
@@ -1265,7 +1265,7 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='replace' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7replaceEmmPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1578' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
@@ -1275,7 +1275,7 @@ 
           </member-function>
           <member-function access='public'>
             <function-decl name='insert' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6insertEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
               <return type-id='type-id-230'/>
@@ -1295,49 +1295,49 @@ 
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' mangled-name='_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' mangled-name='_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -1485,7 +1485,7 @@ 
       <return type-id='type-id-55'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='remove' filepath='/usr/include/stdio.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-60'/>
@@ -1554,13 +1554,13 @@ 
     <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vsprintf' filepath='/usr/include/stdio.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1574,7 +1574,7 @@ 
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1597,18 +1597,18 @@ 
     <function-decl name='vfscanf' filepath='/usr/include/stdio.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vscanf' filepath='/usr/include/stdio.h' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vsscanf' filepath='/usr/include/stdio.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fgetc' filepath='/usr/include/stdio.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1679,7 +1679,7 @@ 
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-89'/>
+      <parameter type-id='type-id-88'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2111,13 +2111,13 @@ 
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2131,21 +2131,21 @@ 
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-63'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='417' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-85'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2213,19 +2213,19 @@ 
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-54'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2248,18 +2248,18 @@ 
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-54'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-83'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fgetwc' filepath='/usr/include/wchar.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2467,7 +2467,7 @@ 
     </function-decl>
     <function-decl name='frexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='ldexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2485,7 +2485,7 @@ 
     </function-decl>
     <function-decl name='modf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-87'/>
+      <parameter type-id='type-id-86'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='expm1' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2814,19 +2814,19 @@ 
     <function-decl name='remquo' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='remquof' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <function-decl name='remquol' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='lrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2942,7 +2942,7 @@ 
     </function-decl>
     <function-decl name='vprintf' filepath='/usr/include/x86_64-linux-gnu/bits/stdio.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='getchar' filepath='/usr/include/x86_64-linux-gnu/bits/stdio.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3412,7 +3412,7 @@ 
     <type-decl name='variadic parameter type' id='type-id-245'/>
     <type-decl name='void' id='type-id-193'/>
     <pointer-type-def type-id='type-id-193' id='type-id-187'/>
-    <function-type size-in-bits='64' id='type-id-90'>
+    <function-type size-in-bits='64' id='type-id-89'>
       <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-187'/>
       <return type-id='type-id-16'/>
@@ -3734,7 +3734,7 @@ 
       <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-414'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -4545,7 +4545,7 @@ 
           <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-430'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -4599,7 +4599,7 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -5002,7 +5002,7 @@ 
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-609'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -5860,7 +5860,7 @@ 
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-621'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -5906,7 +5906,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -7224,7 +7224,7 @@ 
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-889'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -8392,14 +8392,14 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaImEE8allocateERS0_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaImEE10deallocateERS0_Pmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -8489,7 +8489,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JS1_EEEvRS2_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-999'/>
             <parameter type-id='type-id-116'/>
             <return type-id='type-id-193'/>
@@ -8497,14 +8497,14 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE8allocateERS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-1041'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JRS1_EEEvRS2_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-999'/>
             <parameter type-id='type-id-115'/>
             <return type-id='type-id-193'/>
@@ -8512,7 +8512,7 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE10deallocateERS2_PS1_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -9047,7 +9047,7 @@ 
           <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1058'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -9129,7 +9129,7 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -9964,7 +9964,7 @@ 
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1381'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -12080,9 +12080,9 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1455' size-in-bits='64' id='type-id-1461'/>
     <qualified-type-def type-id='type-id-1462' const='yes' id='type-id-1463'/>
     <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
-    <qualified-type-def type-id='type-id-99' const='yes' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-98' const='yes' id='type-id-1465'/>
     <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-191'/>
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1466'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-1466'/>
     <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-1468'/>
     <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
@@ -12409,7 +12409,7 @@ 
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1666'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -12417,7 +12417,7 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIcEE8allocateERS0_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-213'/>
           </function-decl>
@@ -13479,7 +13479,7 @@ 
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1689'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -13539,7 +13539,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -14242,7 +14242,7 @@ 
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1852'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -14829,7 +14829,7 @@ 
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1863'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -14851,7 +14851,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -15399,7 +15399,7 @@ 
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2073'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -15474,7 +15474,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, bool&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJbEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-1086'/>
             <return type-id='type-id-193'/>
@@ -15482,7 +15482,7 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, long long&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJxEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-1902'/>
             <return type-id='type-id-193'/>
@@ -15490,7 +15490,7 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, unsigned int&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJjEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-1905'/>
             <return type-id='type-id-193'/>
@@ -15498,14 +15498,14 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaImEE8allocateERS0_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaImEE10deallocateERS0_Pmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -16712,7 +16712,7 @@ 
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2092'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -16850,7 +16850,7 @@ 
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index 494cefea..e9ce423b 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -9177,161 +9177,169 @@ 
     </array-type-def>
     <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-676'/>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-375'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-515'/>
     <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1053'/>
     <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1050'/>
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-358'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-840'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-1082'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-1083'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-1084'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-1085'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-159'/>
     <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-1084'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-406'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-408'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-602'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-139'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-1092'/>
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-693'/>
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-687'/>
     <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-279'/>
     <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-21'/>
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-305'/>
     <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-291'/>
     <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-705'/>
-    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-1088'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-298'/>
-    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-121'/>
-    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-1090'/>
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-183'/>
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1092'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-453'/>
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
-    <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-968'/>
+    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-1096'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-121'/>
+    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-183'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
+    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-968'/>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-629'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-901'/>
-    <qualified-type-def type-id='type-id-213' const='yes' id='type-id-1098'/>
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-356'/>
-    <qualified-type-def type-id='type-id-230' const='yes' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
-    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-1101'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-237'/>
-    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-260'/>
-    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-1103'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-189'/>
-    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-1104'/>
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
-    <qualified-type-def type-id='type-id-304' const='yes' id='type-id-1106'/>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-278'/>
-    <qualified-type-def type-id='type-id-309' const='yes' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-284'/>
-    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-866'/>
-    <qualified-type-def type-id='type-id-366' const='yes' id='type-id-1109'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-362'/>
-    <qualified-type-def type-id='type-id-369' const='yes' id='type-id-1110'/>
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-353'/>
-    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-401'/>
-    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-1112'/>
-    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-402'/>
-    <qualified-type-def type-id='type-id-438' const='yes' id='type-id-1113'/>
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1114'/>
-    <qualified-type-def type-id='type-id-451' const='yes' id='type-id-1115'/>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-440'/>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-1066'/>
-    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-1116'/>
-    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
-    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-1118'/>
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-482'/>
-    <qualified-type-def type-id='type-id-491' const='yes' id='type-id-1119'/>
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-681'/>
-    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1120'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-493'/>
-    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1121'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1105'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-901'/>
+    <qualified-type-def type-id='type-id-213' const='yes' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-356'/>
+    <qualified-type-def type-id='type-id-230' const='yes' id='type-id-1107'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1108'/>
+    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-237'/>
+    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-260'/>
+    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-1111'/>
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-189'/>
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-1112'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
+    <qualified-type-def type-id='type-id-304' const='yes' id='type-id-1114'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-278'/>
+    <qualified-type-def type-id='type-id-309' const='yes' id='type-id-1115'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-284'/>
+    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-1116'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-866'/>
+    <qualified-type-def type-id='type-id-366' const='yes' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-362'/>
+    <qualified-type-def type-id='type-id-369' const='yes' id='type-id-1118'/>
+    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-1119'/>
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-401'/>
+    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-1120'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-402'/>
+    <qualified-type-def type-id='type-id-438' const='yes' id='type-id-1121'/>
     <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
-    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1123'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-200'/>
-    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-553'/>
-    <qualified-type-def type-id='type-id-560' const='yes' id='type-id-1125'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1078'/>
-    <qualified-type-def type-id='type-id-562' const='yes' id='type-id-1126'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1077'/>
-    <qualified-type-def type-id='type-id-569' const='yes' id='type-id-1127'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-568'/>
-    <qualified-type-def type-id='type-id-599' const='yes' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-363'/>
-    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-1129'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-659'/>
-    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-1130'/>
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-649'/>
-    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-1131'/>
-    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-1132'/>
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-1133'/>
-    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-1134'/>
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
-    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-41'/>
-    <qualified-type-def type-id='type-id-777' const='yes' id='type-id-1137'/>
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-867'/>
-    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-682'/>
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-1139'/>
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-816'/>
-    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-1140'/>
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-865'/>
-    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-1141'/>
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-552'/>
+    <qualified-type-def type-id='type-id-451' const='yes' id='type-id-1123'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-440'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-1124'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
+    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-1126'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-482'/>
+    <qualified-type-def type-id='type-id-491' const='yes' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-681'/>
+    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1128'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-493'/>
+    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1129'/>
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1130'/>
+    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1131'/>
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-200'/>
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-553'/>
+    <qualified-type-def type-id='type-id-560' const='yes' id='type-id-1133'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1078'/>
+    <qualified-type-def type-id='type-id-562' const='yes' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1077'/>
+    <qualified-type-def type-id='type-id-569' const='yes' id='type-id-1135'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-568'/>
+    <qualified-type-def type-id='type-id-599' const='yes' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-363'/>
+    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-659'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-1138'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-649'/>
+    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-1139'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-1140'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-1142'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
+    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-1144'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-41'/>
+    <qualified-type-def type-id='type-id-777' const='yes' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-867'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-1146'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-682'/>
+    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-816'/>
+    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-1148'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-865'/>
+    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-552'/>
     <qualified-type-def type-id='type-id-444' const='yes' id='type-id-483'/>
-    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-1142'/>
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-773'/>
+    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-773'/>
     <qualified-type-def type-id='type-id-170' const='yes' id='type-id-1074'/>
     <qualified-type-def type-id='type-id-120' const='yes' id='type-id-974'/>
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-506'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-506'/>
     <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-1030'/>
     <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-208'/>
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-1144'/>
+    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-1152'/>
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-233'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-396'/>
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-251'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-396'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-452'/>
     <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-995'/>
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-281'/>
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-182'/>
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-286'/>
     <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-280'/>
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1148'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1149'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-1150'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1152'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-888'/>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-426'/>
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1156'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-1160'/>
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1162'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-888'/>
     <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-684'/>
     <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-345'/>
     <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-1156'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-1164'/>
     <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-346'/>
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-1165'/>
     <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-447'/>
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1158'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1166'/>
     <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-411'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-413'/>
-    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1163'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1171'/>
     <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-220'/>
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-420'/>
     <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-421'/>
@@ -9340,178 +9348,183 @@ 
     <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-430'/>
     <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-427'/>
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-428'/>
-    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1164'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1173'/>
     <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-69'/>
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-874'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-685'/>
-    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-142'/>
-    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-138'/>
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-128'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-488'/>
-    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-487'/>
-    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-243'/>
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-410'/>
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-414'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-409'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-415'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-250'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-459'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-880'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-184'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-185'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-316'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1055'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-131'/>
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-374'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-382'/>
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-388'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-127'/>
-    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-379'/>
-    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-380'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-377'/>
-    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-601'/>
-    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-394'/>
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-878'/>
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-460'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-461'/>
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-471'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-464'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-462'/>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-458'/>
-    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-463'/>
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-378'/>
-    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-454'/>
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-334'/>
-    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-472'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-470'/>
-    <pointer-type-def type-id='type-id-1226' size-in-bits='64' id='type-id-877'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-385'/>
-    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-381'/>
-    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-521'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-523'/>
-    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-508'/>
-    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-516'/>
-    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-1059'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-373'/>
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1237'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
-    <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-572'/>
-    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-584'/>
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-580'/>
-    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-583'/>
-    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-582'/>
-    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-668'/>
-    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-667'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-638'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-634'/>
-    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-665'/>
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-636'/>
-    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-666'/>
-    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-702'/>
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-1060'/>
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-140'/>
-    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-126'/>
-    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-827'/>
-    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-884'/>
-    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-524'/>
-    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-520'/>
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-510'/>
-    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-879'/>
-    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-881'/>
-    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-778'/>
-    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-782'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-889'/>
-    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-783'/>
-    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-781'/>
-    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-779'/>
-    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-143'/>
-    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-466'/>
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-455'/>
-    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-885'/>
-    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-963'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-962'/>
-    <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-874'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-142'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-410'/>
+    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-414'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-409'/>
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-880'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-186'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-374'/>
+    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-382'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-377'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-601'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-603'/>
+    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-878'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1226' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-877'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-385'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-521'/>
+    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-1059'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-373'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-1245'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-570'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-1247'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-584'/>
+    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-580'/>
+    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-582'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-667'/>
+    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-638'/>
+    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-634'/>
+    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-665'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-636'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-702'/>
+    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1060'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-135'/>
+    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-126'/>
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-827'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-884'/>
+    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-879'/>
+    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-881'/>
+    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-778'/>
+    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-780'/>
+    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-782'/>
+    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-781'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-889'/>
+    <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-783'/>
+    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-779'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-143'/>
+    <pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-885'/>
+    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-1287' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-1289' size-in-bits='64' id='type-id-685'/>
     <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-907'/>
     <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-476'/>
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-474'/>
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-683'/>
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-921'/>
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-495'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1290'/>
     <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-498'/>
     <pointer-type-def type-id='type-id-519' size-in-bits='64' id='type-id-518'/>
     <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-217'/>
     <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-535'/>
     <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-542'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1282'/>
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1291'/>
+    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1292'/>
     <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-1284'/>
+    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-1293'/>
     <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-197'/>
-    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-1285'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-1286'/>
+    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-1294'/>
+    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-1295'/>
     <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-557'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-1287'/>
-    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-1288'/>
-    <pointer-type-def type-id='type-id-578' size-in-bits='64' id='type-id-1289'/>
-    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-1290'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-1298'/>
+    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-578' size-in-bits='64' id='type-id-1300'/>
+    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-1301'/>
     <pointer-type-def type-id='type-id-588' size-in-bits='64' id='type-id-586'/>
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-589'/>
     <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-595'/>
     <pointer-type-def type-id='type-id-593' size-in-bits='64' id='type-id-591'/>
     <pointer-type-def type-id='type-id-594' size-in-bits='64' id='type-id-81'/>
     <pointer-type-def type-id='type-id-596' size-in-bits='64' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1291'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-389'/>
-    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-376'/>
-    <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-793'/>
-    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-890'/>
+    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-370'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-389'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-376'/>
+    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-793'/>
+    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-890'/>
     <pointer-type-def type-id='type-id-611' size-in-bits='64' id='type-id-854'/>
     <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-654'/>
     <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-642'/>
     <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-655'/>
     <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-632'/>
     <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-615'/>
-    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-1309'/>
     <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-92'/>
     <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-688'/>
     <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-196'/>
     <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-680'/>
-    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-1297'/>
+    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-1310'/>
     <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-714'/>
     <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-911'/>
     <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-1073'/>
     <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-732'/>
-    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-969'/>
     <pointer-type-def type-id='type-id-732' size-in-bits='64' id='type-id-971'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-1299'/>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-1312'/>
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-258'/>
     <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-734'/>
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-1027'/>
@@ -9520,98 +9533,84 @@ 
     <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-674'/>
     <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-272'/>
     <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-955'/>
-    <pointer-type-def type-id='type-id-1300' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-456'/>
     <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-303'/>
     <pointer-type-def type-id='type-id-758' size-in-bits='64' id='type-id-957'/>
     <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-956'/>
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1301'/>
-    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-1302'/>
-    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-1303'/>
-    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-1304'/>
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-1306'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-1315'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-1316'/>
+    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-1317'/>
+    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-1319'/>
     <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-607'/>
     <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-786'/>
     <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-791'/>
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1307'/>
+    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1320'/>
     <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-797'/>
     <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-643'/>
     <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-809'/>
     <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
-    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1308'/>
-    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1309'/>
-    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1310'/>
-    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1311'/>
-    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1312'/>
+    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1321'/>
+    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-133'/>
+    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1323'/>
+    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1324'/>
+    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1325'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1326'/>
     <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-913'/>
     <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-912'/>
+    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-324'/>
     <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-958'/>
     <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-862'/>
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-106'/>
     <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-860'/>
     <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-692'/>
+    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-514'/>
+    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-137'/>
+    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-892'/>
+    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-893'/>
+    <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-699'/>
+    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-386'/>
+    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-886'/>
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-887'/>
     <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-166'/>
     <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-1313'/>
+    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-1344'/>
     <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-937'/>
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-1345'/>
     <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-177'/>
     <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-939'/>
     <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-691'/>
-    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-375'/>
-    <pointer-type-def type-id='type-id-1316' size-in-bits='64' id='type-id-515'/>
-    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-548'/>
-    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-406'/>
-    <pointer-type-def type-id='type-id-1319' size-in-bits='64' id='type-id-408'/>
-    <pointer-type-def type-id='type-id-1320' size-in-bits='64' id='type-id-602'/>
-    <pointer-type-def type-id='type-id-1321' size-in-bits='64' id='type-id-639'/>
-    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-139'/>
-    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-314'/>
-    <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-432'/>
-    <pointer-type-def type-id='type-id-1326' size-in-bits='64' id='type-id-392'/>
-    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-370'/>
-    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-468'/>
-    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-387'/>
-    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-383'/>
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-391'/>
-    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-514'/>
-    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-892'/>
-    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-893'/>
-    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-699'/>
-    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-386'/>
-    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-886'/>
-    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-887'/>
-    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-821'/>
-    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-964'/>
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-1352'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-1346'/>
+    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-821'/>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-323'/>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-285'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-1353'/>
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-823'/>
+    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-823'/>
     <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-561'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-384'/>
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-839'/>
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-384'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-839'/>
+    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-966'/>
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-696'/>
     <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-930'/>
     <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-249'/>
     <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-950'/>
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-964'/>
     <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-697'/>
     <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-199'/>
     <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-252'/>
@@ -9619,13 +9618,13 @@ 
     <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-247'/>
     <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-262'/>
     <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-187'/>
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-317'/>
     <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-311'/>
     <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-321'/>
     <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-331'/>
@@ -9667,18 +9666,19 @@ 
     <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-936'/>
     <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-961'/>
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-697'/>
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-225'/>
     <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-883'/>
     <pointer-type-def type-id='type-id-1417' size-in-bits='64' id='type-id-882'/>
     <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1069'/>
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-407'/>
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-310'/>
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-554'/>
-    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-511'/>
-    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-512'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-554'/>
+    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-397'/>
     <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-600'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-1428'/>
     <qualified-type-def type-id='type-id-85' volatile='yes' id='type-id-898'/>
@@ -9903,20 +9903,20 @@ 
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-1548'/>
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-945'/>
     <function-decl name='sdhci_dumpregs' mangled-name='sdhci_dumpregs' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_dumpregs'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_enable_v4_mode' mangled-name='sdhci_enable_v4_mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_v4_mode'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_reset' mangled-name='sdhci_reset' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
       <parameter type-id='type-id-171' name='mask' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_adma_write_desc' mangled-name='sdhci_adma_write_desc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_adma_write_desc'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
       <parameter type-id='type-id-1428' name='desc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
       <parameter type-id='type-id-803' name='addr' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
       <parameter type-id='type-id-71' name='len' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
@@ -9924,34 +9924,34 @@ 
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_send_command' mangled-name='sdhci_send_command' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_command'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
       <parameter type-id='type-id-642' name='cmd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_calc_clk' mangled-name='sdhci_calc_clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_calc_clk'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
       <parameter type-id='type-id-170' name='clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
       <parameter type-id='type-id-561' name='actual_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1540' column='1'/>
       <return type-id='type-id-444'/>
     </function-decl>
     <function-decl name='sdhci_enable_clk' mangled-name='sdhci_enable_clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_clk'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
       <parameter type-id='type-id-444' name='clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_clock'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
       <parameter type-id='type-id-170' name='clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_power_noreg' mangled-name='sdhci_set_power_noreg' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_power_noreg'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
       <parameter type-id='type-id-216' name='mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
       <parameter type-id='type-id-180' name='vdd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1691' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_power' mangled-name='sdhci_set_power' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_power'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
       <parameter type-id='type-id-216' name='mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
       <parameter type-id='type-id-180' name='vdd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1765' column='1'/>
       <return type-id='type-id-1549'/>
@@ -9962,18 +9962,18 @@ 
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_bus_width' mangled-name='sdhci_set_bus_width' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_bus_width'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
       <parameter type-id='type-id-71' name='width' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_uhs_signaling' mangled-name='sdhci_set_uhs_signaling' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_uhs_signaling'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
       <parameter type-id='type-id-170' name='timing' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_ios' mangled-name='sdhci_set_ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_ios'>
       <parameter type-id='type-id-615' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
-      <parameter type-id='type-id-1296' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
+      <parameter type-id='type-id-1309' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_enable_sdio_irq' mangled-name='sdhci_enable_sdio_irq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_sdio_irq'>
@@ -9983,23 +9983,23 @@ 
     </function-decl>
     <function-decl name='sdhci_start_signal_voltage_switch' mangled-name='sdhci_start_signal_voltage_switch' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_start_signal_voltage_switch'>
       <parameter type-id='type-id-615' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2147' column='1'/>
-      <parameter type-id='type-id-1296' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2148' column='1'/>
+      <parameter type-id='type-id-1309' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2148' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_start_tuning' mangled-name='sdhci_start_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_start_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_end_tuning' mangled-name='sdhci_end_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_end_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_reset_tuning' mangled-name='sdhci_reset_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_send_tuning' mangled-name='sdhci_send_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
       <parameter type-id='type-id-178' name='opcode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
@@ -10009,19 +10009,19 @@ 
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_suspend_host' mangled-name='sdhci_suspend_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_suspend_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_resume_host' mangled-name='sdhci_resume_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_resume_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_runtime_suspend_host' mangled-name='sdhci_runtime_suspend_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_runtime_suspend_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_runtime_resume_host' mangled-name='sdhci_runtime_resume_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_runtime_resume_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
       <parameter type-id='type-id-71' name='soft_reset' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
@@ -10035,7 +10035,7 @@ 
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_cqe_irq' mangled-name='sdhci_cqe_irq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cqe_irq'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-178' name='intmask' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-907' name='cmd_error' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-907' name='data_error' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3450' column='1'/>
@@ -10044,230 +10044,224 @@ 
     <function-decl name='sdhci_alloc_host' mangled-name='sdhci_alloc_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_alloc_host'>
       <parameter type-id='type-id-182' name='dev' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3499' column='1'/>
       <parameter type-id='type-id-161' name='priv_size' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3500' column='1'/>
-      <return type-id='type-id-1308'/>
+      <return type-id='type-id-1321'/>
     </function-decl>
     <function-decl name='__sdhci_read_caps' mangled-name='__sdhci_read_caps' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_read_caps'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
-      <parameter type-id='type-id-1352' name='ver' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
+      <parameter type-id='type-id-1346' name='ver' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <parameter type-id='type-id-1013' name='caps' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <parameter type-id='type-id-1013' name='caps1' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_setup_host' mangled-name='sdhci_setup_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_setup_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_cleanup_host' mangled-name='sdhci_cleanup_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cleanup_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='__sdhci_add_host' mangled-name='__sdhci_add_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_add_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_add_host' mangled-name='sdhci_add_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_add_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_remove_host' mangled-name='sdhci_remove_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_remove_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
       <parameter type-id='type-id-71' name='dead' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_free_host' mangled-name='sdhci_free_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_free_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <typedef-decl name='fl_owner_t' type-id='type-id-124' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1012' column='1' id='type-id-361'/>
     <type-decl name='void' id='type-id-1549'/>
     <pointer-type-def type-id='type-id-1549' id='type-id-124'/>
-    <function-type size-in-bits='64' id='type-id-1317'>
-      <return type-id='type-id-168'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1318'>
+    <function-type size-in-bits='64' id='type-id-1086'>
       <parameter type-id='type-id-401'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1319'>
+    <function-type size-in-bits='64' id='type-id-1087'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1320'>
+    <function-type size-in-bits='64' id='type-id-1088'>
       <parameter type-id='type-id-360'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1321'>
+    <function-type size-in-bits='64' id='type-id-1089'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1084'/>
+      <parameter type-id='type-id-1092'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1322'>
+    <function-type size-in-bits='64' id='type-id-1090'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-1057'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1085'>
+    <function-type size-in-bits='64' id='type-id-1091'>
+      <return type-id='type-id-168'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1093'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1086'>
+    <function-type size-in-bits='64' id='type-id-1094'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1353'/>
+      <parameter type-id='type-id-1351'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1087'>
+    <function-type size-in-bits='64' id='type-id-1095'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1353'/>
-      <parameter type-id='type-id-1288'/>
-      <parameter type-id='type-id-1282'/>
+      <parameter type-id='type-id-1351'/>
+      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1291'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1093'>
+    <function-type size-in-bits='64' id='type-id-1101'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1152'/>
       <return type-id='type-id-153'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1094'>
+    <function-type size-in-bits='64' id='type-id-1102'>
       <parameter type-id='type-id-557'/>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-153'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1096'>
+    <function-type size-in-bits='64' id='type-id-1104'>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-153'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1124'>
+    <function-type size-in-bits='64' id='type-id-1132'>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-200'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1145'>
+    <function-type size-in-bits='64' id='type-id-1153'>
       <parameter type-id='type-id-233'/>
-      <parameter type-id='type-id-1114'/>
+      <parameter type-id='type-id-1122'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1146'>
+    <function-type size-in-bits='64' id='type-id-1154'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1147'>
+    <function-type size-in-bits='64' id='type-id-1155'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1161'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
-      <return type-id='type-id-1150'/>
+      <return type-id='type-id-1160'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-69'/>
-      <return type-id='type-id-1152'/>
+      <return type-id='type-id-1162'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1154'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <parameter type-id='type-id-430'/>
       <return type-id='type-id-48'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1155'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1299'>
+      <parameter type-id='type-id-1300'/>
       <return type-id='type-id-50'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1159'>
+    <function-type size-in-bits='64' id='type-id-1167'>
       <parameter type-id='type-id-401'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1160'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1161'>
+    <function-type size-in-bits='64' id='type-id-1169'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-290'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1162'>
+    <function-type size-in-bits='64' id='type-id-1170'>
       <parameter type-id='type-id-290'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1165'>
+    <function-type size-in-bits='64' id='type-id-1174'>
       <parameter type-id='type-id-166'/>
       <return type-id='type-id-69'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1166'>
-      <return type-id='type-id-71'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1325'>
-      <return type-id='type-id-425'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1167'>
+    <function-type size-in-bits='64' id='type-id-1175'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-732'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1168'>
+    <function-type size-in-bits='64' id='type-id-1176'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1169'>
+    <function-type size-in-bits='64' id='type-id-1177'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-1548'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1170'>
+    <function-type size-in-bits='64' id='type-id-1178'>
       <parameter type-id='type-id-24'/>
-      <parameter type-id='type-id-1117'/>
+      <parameter type-id='type-id-1125'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1171'>
+    <function-type size-in-bits='64' id='type-id-1179'>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-1117'/>
+      <parameter type-id='type-id-1125'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1172'>
-      <parameter type-id='type-id-1100'/>
+    <function-type size-in-bits='64' id='type-id-1180'>
+      <parameter type-id='type-id-1108'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1173'>
-      <parameter type-id='type-id-1100'/>
-      <parameter type-id='type-id-1306'/>
+    <function-type size-in-bits='64' id='type-id-1181'>
+      <parameter type-id='type-id-1108'/>
+      <parameter type-id='type-id-1319'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1174'>
-      <parameter type-id='type-id-1100'/>
+    <function-type size-in-bits='64' id='type-id-1182'>
+      <parameter type-id='type-id-1108'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-1135'/>
+      <parameter type-id='type-id-1143'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1175'>
+    <function-type size-in-bits='64' id='type-id-1183'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-629'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1176'>
+    <function-type size-in-bits='64' id='type-id-1184'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-170'/>
-      <parameter type-id='type-id-1163'/>
+      <parameter type-id='type-id-1171'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1177'>
+    <function-type size-in-bits='64' id='type-id-1185'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-170'/>
@@ -10275,80 +10269,80 @@ 
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1178'>
+    <function-type size-in-bits='64' id='type-id-1186'>
       <parameter type-id='type-id-401'/>
-      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1166'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1180'>
-      <parameter type-id='type-id-1133'/>
+    <function-type size-in-bits='64' id='type-id-1187'>
+      <parameter type-id='type-id-1141'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1179'>
-      <parameter type-id='type-id-1133'/>
-      <parameter type-id='type-id-1287'/>
+    <function-type size-in-bits='64' id='type-id-1188'>
+      <parameter type-id='type-id-1141'/>
+      <parameter type-id='type-id-1296'/>
       <parameter type-id='type-id-178'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1181'>
+    <function-type size-in-bits='64' id='type-id-1189'>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1182'>
+    <function-type size-in-bits='64' id='type-id-1190'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1330'>
+    <function-type size-in-bits='64' id='type-id-1328'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1183'>
+    <function-type size-in-bits='64' id='type-id-1191'>
       <parameter type-id='type-id-233'/>
-      <parameter type-id='type-id-1164'/>
+      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
+    <function-type size-in-bits='64' id='type-id-1192'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-1193'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-1493'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
+    <function-type size-in-bits='64' id='type-id-1194'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-1195'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1192'>
+    <function-type size-in-bits='64' id='type-id-1196'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-268'/>
+      <parameter type-id='type-id-280'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1188'>
+    <function-type size-in-bits='64' id='type-id-1197'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-1293'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1189'>
+    <function-type size-in-bits='64' id='type-id-1198'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1284'/>
+      <parameter type-id='type-id-268'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1190'>
+    <function-type size-in-bits='64' id='type-id-1199'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-643'/>
       <parameter type-id='type-id-71'/>
@@ -10356,21 +10350,21 @@ 
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1191'>
+    <function-type size-in-bits='64' id='type-id-1200'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1310'/>
+      <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-124'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1193'>
+    <function-type size-in-bits='64' id='type-id-1201'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-210'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1202'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-124'/>
@@ -10379,8 +10373,8 @@ 
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1195'>
-      <parameter type-id='type-id-1148'/>
+    <function-type size-in-bits='64' id='type-id-1203'>
+      <parameter type-id='type-id-1156'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-308'/>
@@ -10388,11 +10382,11 @@ 
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1196'>
-      <parameter type-id='type-id-1150'/>
+    <function-type size-in-bits='64' id='type-id-1204'>
+      <parameter type-id='type-id-1160'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1198'>
+    <function-type size-in-bits='64' id='type-id-1206'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-308'/>
@@ -10402,7 +10396,7 @@ 
       <parameter type-id='type-id-1428'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1199'>
+    <function-type size-in-bits='64' id='type-id-1207'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-308'/>
@@ -10412,33 +10406,33 @@ 
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1197'>
+    <function-type size-in-bits='64' id='type-id-1205'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-589'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1331'>
+    <function-type size-in-bits='64' id='type-id-1329'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1332'>
+    <function-type size-in-bits='64' id='type-id-1330'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1200'>
+    <function-type size-in-bits='64' id='type-id-1208'>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1148'/>
+      <parameter type-id='type-id-1156'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1326'>
+    <function-type size-in-bits='64' id='type-id-1302'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-346'/>
@@ -10447,7 +10441,7 @@ 
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-308'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1336'>
+    <function-type size-in-bits='64' id='type-id-1333'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-346'/>
@@ -10456,124 +10450,124 @@ 
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1201'>
+    <function-type size-in-bits='64' id='type-id-1210'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-360'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1203'>
+    <function-type size-in-bits='64' id='type-id-1213'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-85'/>
-      <parameter type-id='type-id-1157'/>
+      <parameter type-id='type-id-1165'/>
       <parameter type-id='type-id-1428'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1327'>
+    <function-type size-in-bits='64' id='type-id-1303'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-308'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1206'>
+    <function-type size-in-bits='64' id='type-id-1212'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1292'>
+    <function-type size-in-bits='64' id='type-id-1305'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1333'>
+    <function-type size-in-bits='64' id='type-id-1331'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1083'/>
+      <parameter type-id='type-id-1085'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1202'>
+    <function-type size-in-bits='64' id='type-id-1211'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1083'/>
+      <parameter type-id='type-id-1085'/>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1334'>
+    <function-type size-in-bits='64' id='type-id-1332'>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <parameter type-id='type-id-928'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1204'>
+    <function-type size-in-bits='64' id='type-id-1214'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-732'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1335'>
+    <function-type size-in-bits='64' id='type-id-1334'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1293'>
+    <function-type size-in-bits='64' id='type-id-1306'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1207'>
+    <function-type size-in-bits='64' id='type-id-1215'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1205'>
+    <function-type size-in-bits='64' id='type-id-1209'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-361'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1208'>
+    <function-type size-in-bits='64' id='type-id-1216'>
       <parameter type-id='type-id-360'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1209'>
+    <function-type size-in-bits='64' id='type-id-1217'>
       <parameter type-id='type-id-360'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-589'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1210'>
+    <function-type size-in-bits='64' id='type-id-1218'>
       <parameter type-id='type-id-1472'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1211'>
+    <function-type size-in-bits='64' id='type-id-1219'>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1212'>
+    <function-type size-in-bits='64' id='type-id-1220'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1213'>
+    <function-type size-in-bits='64' id='type-id-1221'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1214'>
+    <function-type size-in-bits='64' id='type-id-1222'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-346'/>
@@ -10581,7 +10575,7 @@ 
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1215'>
+    <function-type size-in-bits='64' id='type-id-1223'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-69'/>
@@ -10589,182 +10583,182 @@ 
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1216'>
+    <function-type size-in-bits='64' id='type-id-1224'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1217'>
+    <function-type size-in-bits='64' id='type-id-1225'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1218'>
+    <function-type size-in-bits='64' id='type-id-1226'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-165'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1219'>
+    <function-type size-in-bits='64' id='type-id-1227'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1156'/>
+      <parameter type-id='type-id-1164'/>
       <parameter type-id='type-id-210'/>
       <parameter type-id='type-id-210'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1228'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-346'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1221'>
+    <function-type size-in-bits='64' id='type-id-1229'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1222'>
+    <function-type size-in-bits='64' id='type-id-1230'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1285'/>
+      <parameter type-id='type-id-1294'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1223'>
+    <function-type size-in-bits='64' id='type-id-1231'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-439'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1224'>
+    <function-type size-in-bits='64' id='type-id-1232'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1304'/>
+      <parameter type-id='type-id-1317'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1225'>
+    <function-type size-in-bits='64' id='type-id-1233'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1314'/>
+      <parameter type-id='type-id-1345'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1226'>
+    <function-type size-in-bits='64' id='type-id-1234'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-1548'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1227'>
+    <function-type size-in-bits='64' id='type-id-1235'>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1228'>
+    <function-type size-in-bits='64' id='type-id-1236'>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1229'>
+    <function-type size-in-bits='64' id='type-id-1237'>
       <parameter type-id='type-id-495'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1230'>
+    <function-type size-in-bits='64' id='type-id-1238'>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1231'>
+    <function-type size-in-bits='64' id='type-id-1239'>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1232'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1240'>
+      <parameter type-id='type-id-1290'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1337'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1335'>
+      <parameter type-id='type-id-1290'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1233'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1241'>
+      <parameter type-id='type-id-1290'/>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1234'>
+    <function-type size-in-bits='64' id='type-id-1242'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-1454'/>
-      <parameter type-id='type-id-1122'/>
+      <parameter type-id='type-id-1130'/>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1235'>
-      <parameter type-id='type-id-1283'/>
+    <function-type size-in-bits='64' id='type-id-1243'>
+      <parameter type-id='type-id-1292'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1338'>
-      <parameter type-id='type-id-1283'/>
+    <function-type size-in-bits='64' id='type-id-1336'>
+      <parameter type-id='type-id-1292'/>
       <parameter type-id='type-id-1484'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1339'>
+    <function-type size-in-bits='64' id='type-id-1337'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1082'/>
+      <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1340'>
+    <function-type size-in-bits='64' id='type-id-1338'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1082'/>
+      <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1236'>
+    <function-type size-in-bits='64' id='type-id-1244'>
       <parameter type-id='type-id-557'/>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1238'>
+    <function-type size-in-bits='64' id='type-id-1246'>
       <parameter type-id='type-id-557'/>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1284'/>
+      <parameter type-id='type-id-1293'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1240'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1248'>
+      <parameter type-id='type-id-1300'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1241'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1249'>
+      <parameter type-id='type-id-1300'/>
       <parameter type-id='type-id-50'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1242'>
-      <parameter type-id='type-id-1289'/>
-      <parameter type-id='type-id-1290'/>
+    <function-type size-in-bits='64' id='type-id-1250'>
+      <parameter type-id='type-id-1300'/>
+      <parameter type-id='type-id-1301'/>
       <parameter type-id='type-id-178'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1243'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1251'>
+      <parameter type-id='type-id-1300'/>
       <parameter type-id='type-id-696'/>
       <parameter type-id='type-id-696'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1244'>
+    <function-type size-in-bits='64' id='type-id-1252'>
       <parameter type-id='type-id-654'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1245'>
+    <function-type size-in-bits='64' id='type-id-1253'>
       <parameter type-id='type-id-654'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-71'/>
@@ -10772,137 +10766,131 @@ 
       <parameter type-id='type-id-907'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1246'>
+    <function-type size-in-bits='64' id='type-id-1254'>
       <parameter type-id='type-id-615'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1247'>
+    <function-type size-in-bits='64' id='type-id-1255'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-654'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1248'>
+    <function-type size-in-bits='64' id='type-id-1256'>
       <parameter type-id='type-id-615'/>
-      <parameter type-id='type-id-1296'/>
+      <parameter type-id='type-id-1309'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1249'>
+    <function-type size-in-bits='64' id='type-id-1257'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-92'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1250'>
+    <function-type size-in-bits='64' id='type-id-1258'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1251'>
+    <function-type size-in-bits='64' id='type-id-1259'>
       <parameter type-id='type-id-196'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1341'>
+    <function-type size-in-bits='64' id='type-id-1339'>
       <parameter type-id='type-id-680'/>
-      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1310'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1342'>
+    <function-type size-in-bits='64' id='type-id-1340'>
       <parameter type-id='type-id-680'/>
-      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1310'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1252'>
+    <function-type size-in-bits='64' id='type-id-1260'>
       <parameter type-id='type-id-714'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1253'>
+    <function-type size-in-bits='64' id='type-id-1261'>
       <parameter type-id='type-id-732'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1254'>
+    <function-type size-in-bits='64' id='type-id-1262'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-116'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1255'>
+    <function-type size-in-bits='64' id='type-id-1263'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1256'>
+    <function-type size-in-bits='64' id='type-id-1264'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-1548'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1343'>
+    <function-type size-in-bits='64' id='type-id-1341'>
       <parameter type-id='type-id-928'/>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1294'>
-      <parameter type-id='type-id-1307'/>
+    <function-type size-in-bits='64' id='type-id-1307'>
+      <parameter type-id='type-id-1320'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1257'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1265'>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1258'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1266'>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1259'>
+    <function-type size-in-bits='64' id='type-id-1267'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1260'>
+    <function-type size-in-bits='64' id='type-id-1268'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-498'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1261'>
+    <function-type size-in-bits='64' id='type-id-1269'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-498'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1262'>
+    <function-type size-in-bits='64' id='type-id-1270'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1263'>
+    <function-type size-in-bits='64' id='type-id-1271'>
       <parameter type-id='type-id-166'/>
       <return type-id='type-id-71'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1272'>
-      <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-326'/>
-      <parameter type-id='type-id-1301'/>
-      <return type-id='type-id-71'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1264'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1265'>
+    <function-type size-in-bits='64' id='type-id-1273'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-907'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1344'>
+    <function-type size-in-bits='64' id='type-id-1342'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-24'/>
@@ -10910,7 +10898,7 @@ 
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1345'>
+    <function-type size-in-bits='64' id='type-id-1343'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-153'/>
@@ -10918,85 +10906,91 @@ 
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1266'>
+    <function-type size-in-bits='64' id='type-id-1274'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-71'/>
-      <parameter type-id='type-id-1133'/>
+      <parameter type-id='type-id-1141'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1267'>
+    <function-type size-in-bits='64' id='type-id-1275'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
-      <parameter type-id='type-id-1302'/>
+      <parameter type-id='type-id-1315'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1268'>
+    <function-type size-in-bits='64' id='type-id-1276'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1286'/>
+      <parameter type-id='type-id-1295'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1269'>
+    <function-type size-in-bits='64' id='type-id-1277'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1286'/>
-      <parameter type-id='type-id-1301'/>
+      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1314'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1270'>
+    <function-type size-in-bits='64' id='type-id-1278'>
+      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-326'/>
+      <parameter type-id='type-id-1314'/>
+      <return type-id='type-id-71'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1279'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-116'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1271'>
+    <function-type size-in-bits='64' id='type-id-1280'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1303'/>
+      <parameter type-id='type-id-1316'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1295'>
+    <function-type size-in-bits='64' id='type-id-1308'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1311'/>
+      <parameter type-id='type-id-1325'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1273'>
+    <function-type size-in-bits='64' id='type-id-1281'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1274'>
+    <function-type size-in-bits='64' id='type-id-1282'>
       <parameter type-id='type-id-1545'/>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1309'/>
+      <parameter type-id='type-id-1323'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1275'>
+    <function-type size-in-bits='64' id='type-id-1283'>
       <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-233'/>
-      <parameter type-id='type-id-1164'/>
+      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1276'>
+    <function-type size-in-bits='64' id='type-id-1284'>
       <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1277'>
+    <function-type size-in-bits='64' id='type-id-1285'>
       <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1278'>
+    <function-type size-in-bits='64' id='type-id-1286'>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1279'>
+    <function-type size-in-bits='64' id='type-id-1287'>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1280'>
+    <function-type size-in-bits='64' id='type-id-1288'>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-124'/>
@@ -11004,34 +10998,40 @@ 
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1298'>
+    <function-type size-in-bits='64' id='type-id-1289'>
+      <return type-id='type-id-71'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1297'>
+      <return type-id='type-id-425'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1311'>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-732'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1300'>
+    <function-type size-in-bits='64' id='type-id-1313'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-439'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1305'>
+    <function-type size-in-bits='64' id='type-id-1318'>
       <parameter type-id='type-id-69'/>
-      <return type-id='type-id-1304'/>
+      <return type-id='type-id-1317'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1328'>
+    <function-type size-in-bits='64' id='type-id-1322'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-1063'/>
       <return type-id='type-id-1063'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1329'>
+    <function-type size-in-bits='64' id='type-id-1327'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-161'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1347'>
+    <function-type size-in-bits='64' id='type-id-1348'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-210'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1323'>
+    <function-type size-in-bits='64' id='type-id-1157'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-120'/>
@@ -11040,7 +11040,7 @@ 
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-803'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1324'>
+    <function-type size-in-bits='64' id='type-id-1158'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-972'/>
       <parameter type-id='type-id-161'/>
@@ -11048,12 +11048,12 @@ 
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-803'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1315'>
+    <function-type size-in-bits='64' id='type-id-1082'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-1512'/>
       <return type-id='type-id-1044'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1355'>
+    <function-type size-in-bits='64' id='type-id-1353'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-120'/>
@@ -11061,57 +11061,54 @@ 
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-120'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1316'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1083'>
+      <parameter type-id='type-id-1290'/>
       <parameter type-id='type-id-1512'/>
       <return type-id='type-id-1044'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1348'>
+    <function-type size-in-bits='64' id='type-id-1349'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1082'/>
+      <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-154'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1349'>
+    <function-type size-in-bits='64' id='type-id-1350'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1083'/>
+      <parameter type-id='type-id-1085'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-154'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1354'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1352'>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-170'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1346'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1347'>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-178'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1356'>
-      <parameter type-id='type-id-1312'/>
-      <parameter type-id='type-id-1311'/>
+    <function-type size-in-bits='64' id='type-id-1354'>
+      <parameter type-id='type-id-1326'/>
+      <parameter type-id='type-id-1325'/>
       <return type-id='type-id-120'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1357'>
+    <function-type size-in-bits='64' id='type-id-1355'>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-120'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1350'>
-      <parameter type-id='type-id-1359'/>
+    <function-type size-in-bits='64' id='type-id-1358'>
+      <parameter type-id='type-id-1357'/>
       <return type-id='type-id-1068'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1351'>
-      <parameter type-id='type-id-1359'/>
+    <function-type size-in-bits='64' id='type-id-1359'>
+      <parameter type-id='type-id-1357'/>
       <parameter type-id='type-id-54'/>
       <return type-id='type-id-1068'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1358'>
-      <parameter type-id='type-id-1299'/>
+    <function-type size-in-bits='64' id='type-id-1356'>
+      <parameter type-id='type-id-1312'/>
       <return type-id='type-id-733'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1045'>
-      <return type-id='type-id-1549'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-1360'>
       <parameter type-id='type-id-193'/>
       <return type-id='type-id-1549'/>
@@ -11121,8 +11118,8 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1362'>
-      <parameter type-id='type-id-1133'/>
-      <parameter type-id='type-id-1299'/>
+      <parameter type-id='type-id-1141'/>
+      <parameter type-id='type-id-1312'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1363'>
@@ -11142,30 +11139,30 @@ 
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1370'>
+    <function-type size-in-bits='64' id='type-id-1367'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1373'>
+    <function-type size-in-bits='64' id='type-id-1371'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-644'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1367'>
+    <function-type size-in-bits='64' id='type-id-1370'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1288'/>
-      <parameter type-id='type-id-1282'/>
+      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1291'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1368'>
+    <function-type size-in-bits='64' id='type-id-1372'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-643'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1369'>
+    <function-type size-in-bits='64' id='type-id-1373'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-643'/>
       <parameter type-id='type-id-71'/>
@@ -11173,14 +11170,14 @@ 
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1371'>
+    <function-type size-in-bits='64' id='type-id-1368'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1372'>
+    <function-type size-in-bits='64' id='type-id-1369'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-161'/>
@@ -11204,7 +11201,7 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1376'>
-      <parameter type-id='type-id-1150'/>
+      <parameter type-id='type-id-1160'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1377'>
@@ -11243,11 +11240,11 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1384'>
-      <parameter type-id='type-id-1281'/>
+      <parameter type-id='type-id-1290'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1385'>
-      <parameter type-id='type-id-1283'/>
+      <parameter type-id='type-id-1292'/>
       <parameter type-id='type-id-85'/>
       <parameter type-id='type-id-85'/>
       <return type-id='type-id-1549'/>
@@ -11258,16 +11255,16 @@ 
     </function-type>
     <function-type size-in-bits='64' id='type-id-1387'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1288'/>
-      <parameter type-id='type-id-1282'/>
+      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1291'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1388'>
-      <parameter type-id='type-id-1289'/>
+      <parameter type-id='type-id-1300'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1389'>
-      <parameter type-id='type-id-1289'/>
+      <parameter type-id='type-id-1300'/>
       <parameter type-id='type-id-50'/>
       <return type-id='type-id-1549'/>
     </function-type>
@@ -11287,7 +11284,7 @@ 
     </function-type>
     <function-type size-in-bits='64' id='type-id-1393'>
       <parameter type-id='type-id-615'/>
-      <parameter type-id='type-id-1296'/>
+      <parameter type-id='type-id-1309'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1394'>
@@ -11320,8 +11317,8 @@ 
     </function-type>
     <function-type size-in-bits='64' id='type-id-1400'>
       <parameter type-id='type-id-732'/>
-      <parameter type-id='type-id-1084'/>
-      <parameter type-id='type-id-1084'/>
+      <parameter type-id='type-id-1092'/>
+      <parameter type-id='type-id-1092'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1401'>
@@ -11335,37 +11332,37 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1402'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1403'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1404'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-642'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1405'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-171'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1406'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-216'/>
       <parameter type-id='type-id-180'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1407'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1408'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-1428'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-71'/>
@@ -11387,7 +11384,7 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1412'>
-      <parameter type-id='type-id-1313'/>
+      <parameter type-id='type-id-1344'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1413'>
@@ -11395,11 +11392,14 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1414'>
-      <parameter type-id='type-id-1359'/>
+      <parameter type-id='type-id-1357'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-1549'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1045'>
+      <return type-id='type-id-1549'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1415'>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-1549'/>
@@ -11419,44 +11419,44 @@ 
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1419'>
-      <return type-id='type-id-124'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1420'>
       <parameter type-id='type-id-401'/>
-      <parameter type-id='type-id-1105'/>
+      <parameter type-id='type-id-1113'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1421'>
+    <function-type size-in-bits='64' id='type-id-1420'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1422'>
+    <function-type size-in-bits='64' id='type-id-1421'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1149'/>
+      <parameter type-id='type-id-1159'/>
       <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1423'>
+    <function-type size-in-bits='64' id='type-id-1422'>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1424'>
+    <function-type size-in-bits='64' id='type-id-1423'>
       <parameter type-id='type-id-505'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1425'>
+    <function-type size-in-bits='64' id='type-id-1424'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1426'>
+    <function-type size-in-bits='64' id='type-id-1425'>
       <parameter type-id='type-id-1527'/>
       <return type-id='type-id-124'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1426'>
+      <return type-id='type-id-124'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1427'>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-124'/>
diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi
index 88bc389d..5033c7c1 100644
--- a/tests/data/test-read-dwarf/test-libaaudio.so.abi
+++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi
@@ -237,8 +237,8 @@ 
         <var-decl name='tm_zone' type-id='80f4b756' visibility='default' filepath='bionic/libc/include/time.h' line='57' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='AAudioStream_dataCallback' type-id='3405aa89' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' id='edb6186f'/>
-    <typedef-decl name='AAudioStream_errorCallback' type-id='ea545054' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' id='2e91990d'/>
+    <typedef-decl name='AAudioStream_dataCallback' type-id='824043e8' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' id='edb6186f'/>
+    <typedef-decl name='AAudioStream_errorCallback' type-id='00238b2f' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' id='2e91990d'/>
     <typedef-decl name='__builtin_va_list' type-id='30357e0a' id='7f896fb4'/>
     <typedef-decl name='__clockid_t' type-id='7eb128d4' filepath='bionic/libc/include/sys/types.h' line='56' column='1' id='08f9a87a'/>
     <typedef-decl name='__int32_t' type-id='95e97e5e' filepath='bionic/libc/include/stdint.h' line='40' column='1' id='33f57a65'/>
@@ -287,6 +287,7 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='f0981eec'/>
     <type-decl name='unsigned long long int' size-in-bits='64' id='f0981eed'/>
     <type-decl name='wchar_t' size-in-bits='32' id='c523b9f1'/>
+    <pointer-type-def type-id='4ea6ed15' size-in-bits='64' id='824043e8'/>
     <pointer-type-def type-id='2e552d01' size-in-bits='64' id='6de3cf18'/>
     <reference-type-def kind='lvalue' type-id='f74dc428' size-in-bits='64' id='bb997e32'/>
     <reference-type-def kind='rvalue' type-id='f74dc428' size-in-bits='64' id='66a1797c'/>
@@ -318,16 +319,15 @@ 
     <pointer-type-def type-id='f077d3f8' size-in-bits='64' id='5ea27396'/>
     <pointer-type-def type-id='a6c45d85' size-in-bits='64' id='361f7a7d'/>
     <pointer-type-def type-id='e322b6ef' size-in-bits='64' id='c5f12884'/>
-    <pointer-type-def type-id='96ee24a5' size-in-bits='64' id='585e1de9'/>
+    <pointer-type-def type-id='96ee24a5' size-in-bits='64' id='67230494'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='64' id='7292109c'/>
     <pointer-type-def type-id='9da381c4' size-in-bits='64' id='cb785ebf'/>
     <pointer-type-def type-id='a0eb0f09' size-in-bits='64' id='7408d286'/>
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='64' id='a68021ce'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='64' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='64' id='d915a820'/>
-    <pointer-type-def type-id='4ea6ed15' size-in-bits='64' id='3405aa89'/>
-    <pointer-type-def type-id='ee076206' size-in-bits='64' id='953b12f8'/>
-    <pointer-type-def type-id='513cf94a' size-in-bits='64' id='ea545054'/>
+    <pointer-type-def type-id='513cf94a' size-in-bits='64' id='00238b2f'/>
+    <pointer-type-def type-id='30a82da4' size-in-bits='64' id='c640490b'/>
     <pointer-type-def type-id='c523b9f1' size-in-bits='64' id='323d93c1'/>
     <pointer-type-def type-id='323d93c1' size-in-bits='64' id='01efdaf1'/>
     <pointer-type-def type-id='f41d1deb' size-in-bits='64' id='b2a1b704'/>
@@ -1504,11 +1504,11 @@ 
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='atexit' filepath='bionic/libc/include/stdlib.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='bionic/libc/include/stdlib.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='bionic/libc/include/stdlib.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1574,14 +1574,14 @@ 
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='eaa32e2f'/>
     </function-decl>
     <function-decl name='qsort' filepath='bionic/libc/include/stdlib.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='ldiv' filepath='bionic/libc/include/stdlib.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2313,14 +2313,14 @@ 
       <parameter type-id='eaa32e2f'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' id='ee076206'>
-      <return type-id='48b5725f'/>
-    </function-type>
     <function-type size-in-bits='64' id='513cf94a'>
       <parameter type-id='b2a1b704'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='da775bc6'/>
       <return type-id='48b5725f'/>
     </function-type>
+    <function-type size-in-bits='64' id='30a82da4'>
+      <return type-id='48b5725f'/>
+    </function-type>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 32c1a0a4..3b7d5ad6 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1465,11 +1465,11 @@ 
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='atexit' filepath='bionic/libc/include/stdlib.h' line='52' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='bionic/libc/include/stdlib.h' line='54' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='bionic/libc/include/stdlib.h' line='55' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1530,14 +1530,14 @@ 
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='eaa32e2f'/>
     </function-decl>
     <function-decl name='qsort' filepath='bionic/libc/include/stdlib.h' line='98' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='ldiv' filepath='bionic/libc/include/stdlib.h' line='141' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1978,7 +1978,7 @@ 
       <parameter is-variadic='yes'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-type size-in-bits='32' id='ee076206'>
+    <function-type size-in-bits='32' id='30a82da4'>
       <return type-id='48b5725f'/>
     </function-type>
   </abi-instr>
@@ -3438,691 +3438,691 @@ 
         <var-decl name='reserved3' type-id='eaa32e2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='153' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='GetVersion' type-id='18d755d9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
+        <var-decl name='GetVersion' type-id='f3fd167a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='DefineClass' type-id='c1bcbe60' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
+        <var-decl name='DefineClass' type-id='30ee23e3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='FindClass' type-id='a247d414' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
+        <var-decl name='FindClass' type-id='2b174cab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='FromReflectedMethod' type-id='95094585' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
+        <var-decl name='FromReflectedMethod' type-id='70351828' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='FromReflectedField' type-id='2c8531ee' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
+        <var-decl name='FromReflectedField' type-id='6098e447' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='ToReflectedMethod' type-id='a19c74f7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
+        <var-decl name='ToReflectedMethod' type-id='0e7dc576' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='GetSuperclass' type-id='61e793ce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
+        <var-decl name='GetSuperclass' type-id='a96e9567' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='IsAssignableFrom' type-id='192dd735' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
+        <var-decl name='IsAssignableFrom' type-id='f42dbf4e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ToReflectedField' type-id='d17c3f88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
+        <var-decl name='ToReflectedField' type-id='7bbfad59' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='Throw' type-id='c8a34da2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
+        <var-decl name='Throw' type-id='797bd39f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='ThrowNew' type-id='98515169' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
+        <var-decl name='ThrowNew' type-id='bbfa68cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='ExceptionOccurred' type-id='b3dfc495' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
+        <var-decl name='ExceptionOccurred' type-id='a8a22fa6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='ExceptionDescribe' type-id='8bc971a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='175' column='1'/>
+        <var-decl name='ExceptionDescribe' type-id='e45dd401' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='ExceptionClear' type-id='8bc971a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='176' column='1'/>
+        <var-decl name='ExceptionClear' type-id='e45dd401' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='176' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='FatalError' type-id='2deb20e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='177' column='1'/>
+        <var-decl name='FatalError' type-id='7a98879a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='PushLocalFrame' type-id='8770ee20' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
+        <var-decl name='PushLocalFrame' type-id='e459a6af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='PopLocalFrame' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
+        <var-decl name='PopLocalFrame' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='NewGlobalRef' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
+        <var-decl name='NewGlobalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='DeleteGlobalRef' type-id='43af461c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
+        <var-decl name='DeleteGlobalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='DeleteLocalRef' type-id='43af461c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
+        <var-decl name='DeleteLocalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='IsSameObject' type-id='00722fb9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
+        <var-decl name='IsSameObject' type-id='d2595e76' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='NewLocalRef' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
+        <var-decl name='NewLocalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='EnsureLocalCapacity' type-id='8770ee20' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
+        <var-decl name='EnsureLocalCapacity' type-id='e459a6af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='AllocObject' type-id='32aa4f8d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
+        <var-decl name='AllocObject' type-id='2365fdd8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='NewObject' type-id='260c4c40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
+        <var-decl name='NewObject' type-id='89b4862b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='NewObjectV' type-id='775787db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
+        <var-decl name='NewObjectV' type-id='c40ae374' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='NewObjectA' type-id='38637da2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
+        <var-decl name='NewObjectA' type-id='99ff6e15' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
-        <var-decl name='GetObjectClass' type-id='f50e7349' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
+        <var-decl name='GetObjectClass' type-id='15829ccc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='IsInstanceOf' type-id='bfafe7be' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
+        <var-decl name='IsInstanceOf' type-id='af9b66a1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1056'>
-        <var-decl name='GetMethodID' type-id='7b39afc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
+        <var-decl name='GetMethodID' type-id='e475bf19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='CallObjectMethod' type-id='ceea3b8d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
+        <var-decl name='CallObjectMethod' type-id='38711a82' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='CallObjectMethodV' type-id='e2a33260' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
+        <var-decl name='CallObjectMethodV' type-id='4025b733' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='CallObjectMethodA' type-id='d469a98b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
+        <var-decl name='CallObjectMethodA' type-id='ff005e88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='CallBooleanMethod' type-id='dcc01f40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
+        <var-decl name='CallBooleanMethod' type-id='c5017f63' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='CallBooleanMethodV' type-id='f47c20db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
+        <var-decl name='CallBooleanMethodV' type-id='9b7e723c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='CallBooleanMethodA' type-id='fb4bf8a2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
+        <var-decl name='CallBooleanMethodA' type-id='286a904d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='CallByteMethod' type-id='b8872911' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
+        <var-decl name='CallByteMethod' type-id='a6e4e20e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='CallByteMethodV' type-id='8e395004' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
+        <var-decl name='CallByteMethodV' type-id='b73332bf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='CallByteMethodA' type-id='bd039867' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
+        <var-decl name='CallByteMethodA' type-id='7e64ceb4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1376'>
-        <var-decl name='CallCharMethod' type-id='276929e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
+        <var-decl name='CallCharMethod' type-id='abb6ff0a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='CallCharMethodV' type-id='e6cee188' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
+        <var-decl name='CallCharMethodV' type-id='3940caeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1440'>
-        <var-decl name='CallCharMethodA' type-id='75022493' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
+        <var-decl name='CallCharMethodA' type-id='18ca9f30' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='CallShortMethod' type-id='9f2ec5e8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
+        <var-decl name='CallShortMethod' type-id='0f8d5f3b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='CallShortMethodV' type-id='4ab10d53' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
+        <var-decl name='CallShortMethodV' type-id='1c93d4e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='CallShortMethodA' type-id='4ed5bc7a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
+        <var-decl name='CallShortMethodA' type-id='7b6e1be5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='CallIntMethod' type-id='9f2ec5e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
+        <var-decl name='CallIntMethod' type-id='0f8d5f3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='CallIntMethodV' type-id='4ab10d54' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
+        <var-decl name='CallIntMethodV' type-id='1c93d4e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='CallIntMethodA' type-id='4ed5bc7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
+        <var-decl name='CallIntMethodA' type-id='7b6e1be6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='CallLongMethod' type-id='9f2ec5ea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
+        <var-decl name='CallLongMethod' type-id='0f8d5f3d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
-        <var-decl name='CallLongMethodV' type-id='4ab10d55' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
+        <var-decl name='CallLongMethodV' type-id='1c93d4e6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='CallLongMethodA' type-id='4ed5bc7c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
+        <var-decl name='CallLongMethodA' type-id='7b6e1be7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1760'>
-        <var-decl name='CallFloatMethod' type-id='9f5f6d1f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
+        <var-decl name='CallFloatMethod' type-id='29b6037c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='CallFloatMethodV' type-id='a1d47c16' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
+        <var-decl name='CallFloatMethodV' type-id='e91668fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1824'>
-        <var-decl name='CallFloatMethodA' type-id='81649ee5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
+        <var-decl name='CallFloatMethodA' type-id='154c703a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='CallDoubleMethod' type-id='1358cb5a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
+        <var-decl name='CallDoubleMethod' type-id='e06b46ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1888'>
-        <var-decl name='CallDoubleMethodV' type-id='061addf9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
+        <var-decl name='CallDoubleMethodV' type-id='fd720bfe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='CallDoubleMethodA' type-id='cce2541c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
+        <var-decl name='CallDoubleMethodA' type-id='0aafbc07' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1952'>
-        <var-decl name='CallVoidMethod' type-id='d4f446a9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
+        <var-decl name='CallVoidMethod' type-id='4d8d0cb6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='CallVoidMethodV' type-id='72df644c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='227' column='1'/>
+        <var-decl name='CallVoidMethodV' type-id='c0e9d857' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='227' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2016'>
-        <var-decl name='CallVoidMethodA' type-id='7359e10f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
+        <var-decl name='CallVoidMethodA' type-id='a1f794fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='CallNonvirtualObjectMethod' type-id='36fdf2f2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethod' type-id='87683ec7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='CallNonvirtualObjectMethodV' type-id='671a4cc1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodV' type-id='5debed90' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='CallNonvirtualObjectMethodA' type-id='75e166e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodA' type-id='c8123d81' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2144'>
-        <var-decl name='CallNonvirtualBooleanMethod' type-id='911bafcf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethod' type-id='70076aa2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='CallNonvirtualBooleanMethodV' type-id='5502cec6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodV' type-id='f7295393' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2208'>
-        <var-decl name='CallNonvirtualBooleanMethodA' type-id='632958b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodA' type-id='fdb6d1a8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='CallNonvirtualByteMethod' type-id='c5080c6e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
+        <var-decl name='CallNonvirtualByteMethod' type-id='b90b8f9b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2272'>
-        <var-decl name='CallNonvirtualByteMethodV' type-id='ac33c16d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodV' type-id='19e79f04' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='CallNonvirtualByteMethodA' type-id='3f53da28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodA' type-id='72aad4c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2336'>
-        <var-decl name='CallNonvirtualCharMethod' type-id='d3d606ba' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
+        <var-decl name='CallNonvirtualCharMethod' type-id='3f53351f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='CallNonvirtualCharMethodV' type-id='e202bf99' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodV' type-id='60ba8818' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2400'>
-        <var-decl name='CallNonvirtualCharMethodA' type-id='429f83fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodA' type-id='de836af9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='CallNonvirtualShortMethod' type-id='cab20a87' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
+        <var-decl name='CallNonvirtualShortMethod' type-id='bd2b792a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2464'>
-        <var-decl name='CallNonvirtualShortMethodV' type-id='5b336a8e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodV' type-id='5f5d06cb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='CallNonvirtualShortMethodA' type-id='5b8df47d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodA' type-id='51953750' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2528'>
-        <var-decl name='CallNonvirtualIntMethod' type-id='cab20a88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
+        <var-decl name='CallNonvirtualIntMethod' type-id='bd2b792b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='CallNonvirtualIntMethodV' type-id='5b336a8f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodV' type-id='5f5d06cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2592'>
-        <var-decl name='CallNonvirtualIntMethodA' type-id='5b8df47e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodA' type-id='51953751' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='CallNonvirtualLongMethod' type-id='cab20a89' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
+        <var-decl name='CallNonvirtualLongMethod' type-id='bd2b792c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2656'>
-        <var-decl name='CallNonvirtualLongMethodV' type-id='5b336a90' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodV' type-id='5f5d06cd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='CallNonvirtualLongMethodA' type-id='5b8df47f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodA' type-id='51953752' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2720'>
-        <var-decl name='CallNonvirtualFloatMethod' type-id='6a09952c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethod' type-id='bec66371' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='CallNonvirtualFloatMethodV' type-id='286f4f27' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodV' type-id='43ae4cf2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2784'>
-        <var-decl name='CallNonvirtualFloatMethodA' type-id='34d95ce6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodA' type-id='f1447c7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='CallNonvirtualDoubleMethod' type-id='81941e91' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethod' type-id='7c6967e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2848'>
-        <var-decl name='CallNonvirtualDoubleMethodV' type-id='57f14084' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodV' type-id='06674af5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='CallNonvirtualDoubleMethodA' type-id='06ef81e7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodA' type-id='9aee4982' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2912'>
-        <var-decl name='CallNonvirtualVoidMethod' type-id='f1b14db6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethod' type-id='c003e813' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='CallNonvirtualVoidMethodV' type-id='e25f48c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='286' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethodV' type-id='3d23490c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2976'>
-        <var-decl name='CallNonvirtualVoidMethodA' type-id='59a4a320' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethodA' type-id='49f4e2fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='GetFieldID' type-id='700bfd71' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
+        <var-decl name='GetFieldID' type-id='234a6cd4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3040'>
-        <var-decl name='GetObjectField' type-id='676c304c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
+        <var-decl name='GetObjectField' type-id='21976f65' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='GetBooleanField' type-id='afd19731' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
+        <var-decl name='GetBooleanField' type-id='8c01ad3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3104'>
-        <var-decl name='GetByteField' type-id='be83b1c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
+        <var-decl name='GetByteField' type-id='11c5f5c9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='GetCharField' type-id='5b2401a4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
+        <var-decl name='GetCharField' type-id='340bfd9d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3168'>
-        <var-decl name='GetShortField' type-id='d9547e19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
+        <var-decl name='GetShortField' type-id='e3d72664' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='GetIntField' type-id='d9547e1a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
+        <var-decl name='GetIntField' type-id='e3d72665' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3232'>
-        <var-decl name='GetLongField' type-id='d9547e1b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
+        <var-decl name='GetLongField' type-id='e3d72666' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='GetFloatField' type-id='45f30d62' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
+        <var-decl name='GetFloatField' type-id='bae7b123' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='GetDoubleField' type-id='a737306f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
+        <var-decl name='GetDoubleField' type-id='3d49369a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='SetObjectField' type-id='bc60df5e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
+        <var-decl name='SetObjectField' type-id='68835375' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3360'>
-        <var-decl name='SetBooleanField' type-id='9af031fb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='304' column='1'/>
+        <var-decl name='SetBooleanField' type-id='368860b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='SetByteField' type-id='ffc17d12' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='305' column='1'/>
+        <var-decl name='SetByteField' type-id='931a74f1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='305' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3424'>
-        <var-decl name='SetCharField' type-id='e9d4d69a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='306' column='1'/>
+        <var-decl name='SetCharField' type-id='fc76ab83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='SetShortField' type-id='aa5e90a7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='307' column='1'/>
+        <var-decl name='SetShortField' type-id='1135eb82' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='307' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3488'>
-        <var-decl name='SetIntField' type-id='aa5e90a8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='308' column='1'/>
+        <var-decl name='SetIntField' type-id='1135eb83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='SetLongField' type-id='aa5e90a9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='309' column='1'/>
+        <var-decl name='SetLongField' type-id='1135eb84' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='SetFloatField' type-id='d69f3378' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='310' column='1'/>
+        <var-decl name='SetFloatField' type-id='211caeb7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='SetDoubleField' type-id='fcbe15c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
+        <var-decl name='SetDoubleField' type-id='0408c00e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3616'>
-        <var-decl name='GetStaticMethodID' type-id='7b39afc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
+        <var-decl name='GetStaticMethodID' type-id='e475bf19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='CallStaticObjectMethod' type-id='260c4c40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
+        <var-decl name='CallStaticObjectMethod' type-id='89b4862b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3680'>
-        <var-decl name='CallStaticObjectMethodV' type-id='775787db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
+        <var-decl name='CallStaticObjectMethodV' type-id='c40ae374' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='CallStaticObjectMethodA' type-id='38637da2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
+        <var-decl name='CallStaticObjectMethodA' type-id='99ff6e15' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3744'>
-        <var-decl name='CallStaticBooleanMethod' type-id='59816c03' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
+        <var-decl name='CallStaticBooleanMethod' type-id='ef643188' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='CallStaticBooleanMethodV' type-id='46959e4a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
+        <var-decl name='CallStaticBooleanMethodV' type-id='c5b41ba9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3808'>
-        <var-decl name='CallStaticBooleanMethodA' type-id='4a68d231' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
+        <var-decl name='CallStaticBooleanMethodA' type-id='572f4d46' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='CallStaticByteMethod' type-id='dbd5502c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
+        <var-decl name='CallStaticByteMethod' type-id='0c9c949f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3872'>
-        <var-decl name='CallStaticByteMethodV' type-id='4602a027' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
+        <var-decl name='CallStaticByteMethodV' type-id='3ba4d298' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='CallStaticByteMethodA' type-id='39e07fe6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
+        <var-decl name='CallStaticByteMethodA' type-id='8c288679' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3936'>
-        <var-decl name='CallStaticCharMethod' type-id='7cc5a858' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
+        <var-decl name='CallStaticCharMethod' type-id='f452c4f3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='CallStaticCharMethodV' type-id='8212a383' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
+        <var-decl name='CallStaticCharMethodV' type-id='2370212c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4000'>
-        <var-decl name='CallStaticCharMethodA' type-id='5316a70a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
+        <var-decl name='CallStaticCharMethodA' type-id='93027c5d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='CallStaticShortMethod' type-id='4442688b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
+        <var-decl name='CallStaticShortMethod' type-id='322ef220' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4064'>
-        <var-decl name='CallStaticShortMethodV' type-id='2b6dfd02' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
+        <var-decl name='CallStaticShortMethodV' type-id='34661db1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='CallStaticShortMethodA' type-id='8394b669' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
+        <var-decl name='CallStaticShortMethodA' type-id='3b95ca3e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4128'>
-        <var-decl name='CallStaticIntMethod' type-id='4442688c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
+        <var-decl name='CallStaticIntMethod' type-id='322ef221' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='CallStaticIntMethodV' type-id='2b6dfd03' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
+        <var-decl name='CallStaticIntMethodV' type-id='34661db2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4192'>
-        <var-decl name='CallStaticIntMethodA' type-id='8394b66a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
+        <var-decl name='CallStaticIntMethodA' type-id='3b95ca3f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='CallStaticLongMethod' type-id='4442688d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
+        <var-decl name='CallStaticLongMethod' type-id='322ef222' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4256'>
-        <var-decl name='CallStaticLongMethodV' type-id='2b6dfd04' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
+        <var-decl name='CallStaticLongMethodV' type-id='34661db3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='CallStaticLongMethodA' type-id='8394b66b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
+        <var-decl name='CallStaticLongMethodA' type-id='3b95ca40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4320'>
-        <var-decl name='CallStaticFloatMethod' type-id='b540af52' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
+        <var-decl name='CallStaticFloatMethod' type-id='7814c8ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='CallStaticFloatMethodV' type-id='aaed3ee1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
+        <var-decl name='CallStaticFloatMethodV' type-id='3f0de1fe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4384'>
-        <var-decl name='CallStaticFloatMethodA' type-id='e8cbc4c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
+        <var-decl name='CallStaticFloatMethodA' type-id='90e24e07' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='CallStaticDoubleMethod' type-id='56da0ded' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
+        <var-decl name='CallStaticDoubleMethod' type-id='c9aa1572' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4448'>
-        <var-decl name='CallStaticDoubleMethodV' type-id='4d96d680' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
+        <var-decl name='CallStaticDoubleMethodV' type-id='397e8683' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='CallStaticDoubleMethodA' type-id='fcb05c6b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
+        <var-decl name='CallStaticDoubleMethodA' type-id='f1af99f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4512'>
-        <var-decl name='CallStaticVoidMethod' type-id='35958544' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
+        <var-decl name='CallStaticVoidMethod' type-id='3d342907' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4544'>
-        <var-decl name='CallStaticVoidMethodV' type-id='063cc4af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='344' column='1'/>
+        <var-decl name='CallStaticVoidMethodV' type-id='806c2c50' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='344' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4576'>
-        <var-decl name='CallStaticVoidMethodA' type-id='7399468e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
+        <var-decl name='CallStaticVoidMethodA' type-id='372c8441' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='GetStaticFieldID' type-id='700bfd71' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
+        <var-decl name='GetStaticFieldID' type-id='234a6cd4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4640'>
-        <var-decl name='GetStaticObjectField' type-id='4bcddc31' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
+        <var-decl name='GetStaticObjectField' type-id='ccec23f4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4672'>
-        <var-decl name='GetStaticBooleanField' type-id='c61bcf16' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
+        <var-decl name='GetStaticBooleanField' type-id='b6cba737' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4704'>
-        <var-decl name='GetStaticByteField' type-id='f02d21bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
+        <var-decl name='GetStaticByteField' type-id='1fa86400' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4736'>
-        <var-decl name='GetStaticCharField' type-id='3a544209' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
+        <var-decl name='GetStaticCharField' type-id='539eccec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4768'>
-        <var-decl name='GetStaticShortField' type-id='826b5ede' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
+        <var-decl name='GetStaticShortField' type-id='5cd6fe7f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='GetStaticIntField' type-id='826b5edf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
+        <var-decl name='GetStaticIntField' type-id='5cd6fe80' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4832'>
-        <var-decl name='GetStaticLongField' type-id='826b5ee0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
+        <var-decl name='GetStaticLongField' type-id='5cd6fe81' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4864'>
-        <var-decl name='GetStaticFloatField' type-id='2525f167' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
+        <var-decl name='GetStaticFloatField' type-id='1dd3489a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4896'>
-        <var-decl name='GetStaticDoubleField' type-id='8820c0ac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
+        <var-decl name='GetStaticDoubleField' type-id='7c5a95b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4928'>
-        <var-decl name='SetStaticObjectField' type-id='01a865d1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
+        <var-decl name='SetStaticObjectField' type-id='a479abce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4960'>
-        <var-decl name='SetStaticBooleanField' type-id='a1ed8fac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='361' column='1'/>
+        <var-decl name='SetStaticBooleanField' type-id='70ef270d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='361' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
-        <var-decl name='SetStaticByteField' type-id='d5efc015' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='362' column='1'/>
+        <var-decl name='SetStaticByteField' type-id='9bda8fea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5024'>
-        <var-decl name='SetStaticCharField' type-id='400806b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='363' column='1'/>
+        <var-decl name='SetStaticCharField' type-id='05b410f6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='363' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
-        <var-decl name='SetStaticShortField' type-id='48f9101c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='364' column='1'/>
+        <var-decl name='SetStaticShortField' type-id='625ca385' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5088'>
-        <var-decl name='SetStaticIntField' type-id='48f9101d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='365' column='1'/>
+        <var-decl name='SetStaticIntField' type-id='625ca386' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='365' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='SetStaticLongField' type-id='48f9101e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='366' column='1'/>
+        <var-decl name='SetStaticLongField' type-id='625ca387' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='366' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5152'>
-        <var-decl name='SetStaticFloatField' type-id='192b003b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='367' column='1'/>
+        <var-decl name='SetStaticFloatField' type-id='1171d1b4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='367' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5184'>
-        <var-decl name='SetStaticDoubleField' type-id='6c7c35c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
+        <var-decl name='SetStaticDoubleField' type-id='7c24b203' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5216'>
-        <var-decl name='NewString' type-id='21ec59f0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
+        <var-decl name='NewString' type-id='b2c6c541' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5248'>
-        <var-decl name='GetStringLength' type-id='814cad27' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
+        <var-decl name='GetStringLength' type-id='1a7dde06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5280'>
-        <var-decl name='GetStringChars' type-id='a4d189fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
+        <var-decl name='GetStringChars' type-id='fff004b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='ReleaseStringChars' type-id='6fd868db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
+        <var-decl name='ReleaseStringChars' type-id='c05a64c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5344'>
-        <var-decl name='NewStringUTF' type-id='629338b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
+        <var-decl name='NewStringUTF' type-id='a3339ebc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5376'>
-        <var-decl name='GetStringUTFLength' type-id='814cad27' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
+        <var-decl name='GetStringUTFLength' type-id='1a7dde06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5408'>
-        <var-decl name='GetStringUTFChars' type-id='653ec4e7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
+        <var-decl name='GetStringUTFChars' type-id='4bc76f1c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5440'>
-        <var-decl name='ReleaseStringUTFChars' type-id='f48e25c1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
+        <var-decl name='ReleaseStringUTFChars' type-id='7c2a9d98' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5472'>
-        <var-decl name='GetArrayLength' type-id='3c0c03e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
+        <var-decl name='GetArrayLength' type-id='d57c164e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='NewObjectArray' type-id='3a73b9e7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
+        <var-decl name='NewObjectArray' type-id='61b688b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5536'>
-        <var-decl name='GetObjectArrayElement' type-id='3426ab68' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
+        <var-decl name='GetObjectArrayElement' type-id='9a5725d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
-        <var-decl name='SetObjectArrayElement' type-id='177b60ba' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
+        <var-decl name='SetObjectArrayElement' type-id='9b7fadc5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5600'>
-        <var-decl name='NewBooleanArray' type-id='2ab62f6f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
+        <var-decl name='NewBooleanArray' type-id='8847feac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5632'>
-        <var-decl name='NewByteArray' type-id='2dc018ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
+        <var-decl name='NewByteArray' type-id='3fcb62e2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5664'>
-        <var-decl name='NewCharArray' type-id='843cef5f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
+        <var-decl name='NewCharArray' type-id='9a623a5c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5696'>
-        <var-decl name='NewShortArray' type-id='730c485d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
+        <var-decl name='NewShortArray' type-id='86d5bf12' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5728'>
-        <var-decl name='NewIntArray' type-id='87d7d6ca' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
+        <var-decl name='NewIntArray' type-id='e5fd5491' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5760'>
-        <var-decl name='NewLongArray' type-id='adc7abf9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
+        <var-decl name='NewLongArray' type-id='64c5934e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5792'>
-        <var-decl name='NewFloatArray' type-id='8fe62605' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
+        <var-decl name='NewFloatArray' type-id='e7cc9f5a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5824'>
-        <var-decl name='NewDoubleArray' type-id='ef68ddae' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
+        <var-decl name='NewDoubleArray' type-id='452d9f35' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5856'>
-        <var-decl name='GetBooleanArrayElements' type-id='03556b0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
+        <var-decl name='GetBooleanArrayElements' type-id='affaefeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5888'>
-        <var-decl name='GetByteArrayElements' type-id='bec89ede' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='394' column='1'/>
+        <var-decl name='GetByteArrayElements' type-id='2c83c50b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5920'>
-        <var-decl name='GetCharArrayElements' type-id='679b55be' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='395' column='1'/>
+        <var-decl name='GetCharArrayElements' type-id='23f99073' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5952'>
-        <var-decl name='GetShortArrayElements' type-id='80456268' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='396' column='1'/>
+        <var-decl name='GetShortArrayElements' type-id='8fb2e86b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='396' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5984'>
-        <var-decl name='GetIntArrayElements' type-id='7b7de9b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='397' column='1'/>
+        <var-decl name='GetIntArrayElements' type-id='434d567b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='397' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6016'>
-        <var-decl name='GetLongArrayElements' type-id='20c01846' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='398' column='1'/>
+        <var-decl name='GetLongArrayElements' type-id='a5922fa3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6048'>
-        <var-decl name='GetFloatArrayElements' type-id='190d83bc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='399' column='1'/>
+        <var-decl name='GetFloatArrayElements' type-id='9785d58b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6080'>
-        <var-decl name='GetDoubleArrayElements' type-id='8fb656fe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='400' column='1'/>
+        <var-decl name='GetDoubleArrayElements' type-id='f0c5b475' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6112'>
-        <var-decl name='ReleaseBooleanArrayElements' type-id='69aab5c3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='402' column='1'/>
+        <var-decl name='ReleaseBooleanArrayElements' type-id='191aba0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='402' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6144'>
-        <var-decl name='ReleaseByteArrayElements' type-id='6d8c64bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='404' column='1'/>
+        <var-decl name='ReleaseByteArrayElements' type-id='34f80e06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6176'>
-        <var-decl name='ReleaseCharArrayElements' type-id='0f8e37bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='406' column='1'/>
+        <var-decl name='ReleaseCharArrayElements' type-id='2b0e4ff2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='406' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6208'>
-        <var-decl name='ReleaseShortArrayElements' type-id='89ccc593' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='408' column='1'/>
+        <var-decl name='ReleaseShortArrayElements' type-id='33caa8c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='408' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='ReleaseIntArrayElements' type-id='66b73f2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='410' column='1'/>
+        <var-decl name='ReleaseIntArrayElements' type-id='44f25f18' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6272'>
-        <var-decl name='ReleaseLongArrayElements' type-id='4ae3250d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='412' column='1'/>
+        <var-decl name='ReleaseLongArrayElements' type-id='b76b1db6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='412' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6304'>
-        <var-decl name='ReleaseFloatArrayElements' type-id='298dc3b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='414' column='1'/>
+        <var-decl name='ReleaseFloatArrayElements' type-id='a522e978' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='414' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6336'>
-        <var-decl name='ReleaseDoubleArrayElements' type-id='db388837' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='416' column='1'/>
+        <var-decl name='ReleaseDoubleArrayElements' type-id='f1850b08' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='416' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6368'>
-        <var-decl name='GetBooleanArrayRegion' type-id='fbe0c9de' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='419' column='1'/>
+        <var-decl name='GetBooleanArrayRegion' type-id='a46b0935' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='419' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6400'>
-        <var-decl name='GetByteArrayRegion' type-id='5bf36468' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='421' column='1'/>
+        <var-decl name='GetByteArrayRegion' type-id='f7a0379f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6432'>
-        <var-decl name='GetCharArrayRegion' type-id='730be8b4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='423' column='1'/>
+        <var-decl name='GetCharArrayRegion' type-id='545a856f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6464'>
-        <var-decl name='GetShortArrayRegion' type-id='b95eace2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='425' column='1'/>
+        <var-decl name='GetShortArrayRegion' type-id='e1be4c89' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='425' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6496'>
-        <var-decl name='GetIntArrayRegion' type-id='6bc23226' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='427' column='1'/>
+        <var-decl name='GetIntArrayRegion' type-id='792859dd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='427' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6528'>
-        <var-decl name='GetLongArrayRegion' type-id='ad1ea7c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='429' column='1'/>
+        <var-decl name='GetLongArrayRegion' type-id='1e124adf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='429' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6560'>
-        <var-decl name='GetFloatArrayRegion' type-id='eb01d38a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='431' column='1'/>
+        <var-decl name='GetFloatArrayRegion' type-id='21f41051' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6592'>
-        <var-decl name='GetDoubleArrayRegion' type-id='fd9a9816' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='433' column='1'/>
+        <var-decl name='GetDoubleArrayRegion' type-id='b251d72d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='SetBooleanArrayRegion' type-id='08a2f0e1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='437' column='1'/>
+        <var-decl name='SetBooleanArrayRegion' type-id='f51198ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6656'>
-        <var-decl name='SetByteArrayRegion' type-id='3b7e394d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='439' column='1'/>
+        <var-decl name='SetByteArrayRegion' type-id='81c03d6c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='439' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6688'>
-        <var-decl name='SetCharArrayRegion' type-id='dc329231' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='441' column='1'/>
+        <var-decl name='SetCharArrayRegion' type-id='e08d371c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6720'>
-        <var-decl name='SetShortArrayRegion' type-id='5fc46b11' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='443' column='1'/>
+        <var-decl name='SetShortArrayRegion' type-id='82203b3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6752'>
-        <var-decl name='SetIntArrayRegion' type-id='fa46db69' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='445' column='1'/>
+        <var-decl name='SetIntArrayRegion' type-id='2ccb7754' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6784'>
-        <var-decl name='SetLongArrayRegion' type-id='ebf40e2d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='447' column='1'/>
+        <var-decl name='SetLongArrayRegion' type-id='c1bcf4ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6816'>
-        <var-decl name='SetFloatArrayRegion' type-id='9990734d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='449' column='1'/>
+        <var-decl name='SetFloatArrayRegion' type-id='950241b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='SetDoubleArrayRegion' type-id='977cec7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
+        <var-decl name='SetDoubleArrayRegion' type-id='a733b71a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6880'>
-        <var-decl name='RegisterNatives' type-id='dfa383fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
+        <var-decl name='RegisterNatives' type-id='0c62a17c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6912'>
-        <var-decl name='UnregisterNatives' type-id='55811db2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
+        <var-decl name='UnregisterNatives' type-id='41173bbb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6944'>
-        <var-decl name='MonitorEnter' type-id='7a154085' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
+        <var-decl name='MonitorEnter' type-id='0dbd0b28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='MonitorExit' type-id='7a154085' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
+        <var-decl name='MonitorExit' type-id='0dbd0b28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7008'>
-        <var-decl name='GetJavaVM' type-id='a65198e8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
+        <var-decl name='GetJavaVM' type-id='19620ff1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='GetStringRegion' type-id='7a8e54fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
+        <var-decl name='GetStringRegion' type-id='bd3e8fb9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7072'>
-        <var-decl name='GetStringUTFRegion' type-id='0a719884' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='462' column='1'/>
+        <var-decl name='GetStringUTFRegion' type-id='0c1914a7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7104'>
-        <var-decl name='GetPrimitiveArrayCritical' type-id='101b8c80' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='464' column='1'/>
+        <var-decl name='GetPrimitiveArrayCritical' type-id='32c7d509' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7136'>
-        <var-decl name='ReleasePrimitiveArrayCritical' type-id='4382c817' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='465' column='1'/>
+        <var-decl name='ReleasePrimitiveArrayCritical' type-id='bf254042' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7168'>
-        <var-decl name='GetStringCritical' type-id='a4d189fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='467' column='1'/>
+        <var-decl name='GetStringCritical' type-id='fff004b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7200'>
-        <var-decl name='ReleaseStringCritical' type-id='6fd868db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
+        <var-decl name='ReleaseStringCritical' type-id='c05a64c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7232'>
-        <var-decl name='NewWeakGlobalRef' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
+        <var-decl name='NewWeakGlobalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7264'>
-        <var-decl name='DeleteWeakGlobalRef' type-id='43af461c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
+        <var-decl name='DeleteWeakGlobalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7296'>
-        <var-decl name='ExceptionCheck' type-id='22b63871' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
+        <var-decl name='ExceptionCheck' type-id='c6d2cb52' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7328'>
-        <var-decl name='NewDirectByteBuffer' type-id='e8dccc6b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
+        <var-decl name='NewDirectByteBuffer' type-id='ad0b765a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
-        <var-decl name='GetDirectBufferAddress' type-id='4db2cf0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
+        <var-decl name='GetDirectBufferAddress' type-id='23103ee5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7392'>
-        <var-decl name='GetDirectBufferCapacity' type-id='7a154086' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
+        <var-decl name='GetDirectBufferCapacity' type-id='0dbd0b29' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='GetObjectRefType' type-id='ddfe5d59' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
+        <var-decl name='GetObjectRefType' type-id='3f4a2861' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='_JNIEnv' size-in-bits='32' is-struct='yes' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='489' column='1' id='c9459134'>
@@ -4470,7 +4470,7 @@ 
     <qualified-type-def type-id='a84c031d' const='yes' id='9b45d938'/>
     <reference-type-def kind='lvalue' type-id='9b45d938' size-in-bits='32' id='8cf4ca3a'/>
     <pointer-type-def type-id='9b45d938' size-in-bits='32' id='80f4b756'/>
-    <pointer-type-def type-id='4693c583' size-in-bits='32' id='653ec4e7'/>
+    <pointer-type-def type-id='4693c583' size-in-bits='32' id='4bc76f1c'/>
     <pointer-type-def type-id='80f4b756' size-in-bits='32' id='7d3cd834'/>
     <qualified-type-def type-id='801a266d' const='yes' id='e7c31614'/>
     <reference-type-def kind='lvalue' type-id='e7c31614' size-in-bits='32' id='0a1bf0b6'/>
@@ -4490,7 +4490,7 @@ 
     <pointer-type-def type-id='3ebf19c8' size-in-bits='32' id='a8d5bec6'/>
     <qualified-type-def type-id='8dfe2e06' const='yes' id='9bf2d596'/>
     <pointer-type-def type-id='9bf2d596' size-in-bits='32' id='3b4676f4'/>
-    <pointer-type-def type-id='6a9e3459' size-in-bits='32' id='a4d189fd'/>
+    <pointer-type-def type-id='6a9e3459' size-in-bits='32' id='fff004b2'/>
     <qualified-type-def type-id='973e3c3f' const='yes' id='8bac99cf'/>
     <pointer-type-def type-id='8bac99cf' size-in-bits='32' id='c5b6437f'/>
     <qualified-type-def type-id='1a7fe6b0' const='yes' id='af8c6a20'/>
@@ -5108,28 +5108,169 @@ 
     <reference-type-def kind='lvalue' type-id='a6c45d85' size-in-bits='32' id='2a1f6799'/>
     <pointer-type-def type-id='a6c45d85' size-in-bits='32' id='361f7a7d'/>
     <pointer-type-def type-id='e322b6ef' size-in-bits='32' id='c5f12884'/>
-    <pointer-type-def type-id='96ee24a5' size-in-bits='32' id='585e1de9'/>
+    <pointer-type-def type-id='96ee24a5' size-in-bits='32' id='67230494'/>
     <reference-type-def kind='lvalue' type-id='95e97e5e' size-in-bits='32' id='769216e8'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='32' id='7292109c'/>
     <qualified-type-def type-id='7292109c' const='yes' id='5a5c0787'/>
     <reference-type-def kind='lvalue' type-id='5a5c0787' size-in-bits='32' id='dfe00273'/>
     <reference-type-def kind='lvalue' type-id='7292109c' size-in-bits='32' id='15f054ce'/>
+    <pointer-type-def type-id='c2ab665d' size-in-bits='32' id='c6d2cb52'/>
+    <pointer-type-def type-id='ca1de4b9' size-in-bits='32' id='f42dbf4e'/>
+    <pointer-type-def type-id='6f7cb7b4' size-in-bits='32' id='b6cba737'/>
+    <pointer-type-def type-id='9d54666b' size-in-bits='32' id='ef643188'/>
+    <pointer-type-def type-id='eda358d5' size-in-bits='32' id='572f4d46'/>
+    <pointer-type-def type-id='fe376334' size-in-bits='32' id='c5b41ba9'/>
+    <pointer-type-def type-id='2207a1d4' size-in-bits='32' id='af9b66a1'/>
+    <pointer-type-def type-id='ec86bf87' size-in-bits='32' id='70076aa2'/>
+    <pointer-type-def type-id='b3920ec1' size-in-bits='32' id='fdb6d1a8'/>
+    <pointer-type-def type-id='d44533d0' size-in-bits='32' id='f7295393'/>
+    <pointer-type-def type-id='635e0a25' size-in-bits='32' id='8c01ad3c'/>
+    <pointer-type-def type-id='161aeec2' size-in-bits='32' id='c5017f63'/>
+    <pointer-type-def type-id='40138048' size-in-bits='32' id='286a904d'/>
+    <pointer-type-def type-id='f1f2c7f3' size-in-bits='32' id='9b7e723c'/>
+    <pointer-type-def type-id='6a7bb135' size-in-bits='32' id='d2595e76'/>
     <pointer-type-def type-id='cc6e09ca' size-in-bits='32' id='d4a328b7'/>
-    <pointer-type-def type-id='1704c89a' size-in-bits='32' id='03556b0c'/>
+    <pointer-type-def type-id='1704c89a' size-in-bits='32' id='affaefeb'/>
+    <pointer-type-def type-id='72c33ddb' size-in-bits='32' id='8847feac'/>
+    <pointer-type-def type-id='76032d71' size-in-bits='32' id='1fa86400'/>
+    <pointer-type-def type-id='47ca8d46' size-in-bits='32' id='0c9c949f'/>
+    <pointer-type-def type-id='36acdbcc' size-in-bits='32' id='8c288679'/>
+    <pointer-type-def type-id='c1b550c7' size-in-bits='32' id='3ba4d298'/>
+    <pointer-type-def type-id='3c662e98' size-in-bits='32' id='b90b8f9b'/>
+    <pointer-type-def type-id='8ae90496' size-in-bits='32' id='72aad4c5'/>
+    <pointer-type-def type-id='d35f73d9' size-in-bits='32' id='19e79f04'/>
+    <pointer-type-def type-id='d6f3cc1e' size-in-bits='32' id='11c5f5c9'/>
+    <pointer-type-def type-id='521af3a9' size-in-bits='32' id='a6e4e20e'/>
+    <pointer-type-def type-id='4aa4e453' size-in-bits='32' id='7e64ceb4'/>
+    <pointer-type-def type-id='b062a33a' size-in-bits='32' id='b73332bf'/>
     <pointer-type-def type-id='adf18958' size-in-bits='32' id='a6979e77'/>
-    <pointer-type-def type-id='c6492f6c' size-in-bits='32' id='bec89ede'/>
+    <pointer-type-def type-id='c6492f6c' size-in-bits='32' id='2c83c50b'/>
+    <pointer-type-def type-id='23a084d1' size-in-bits='32' id='3fcb62e2'/>
+    <pointer-type-def type-id='1c231d7d' size-in-bits='32' id='539eccec'/>
+    <pointer-type-def type-id='c60ec5ea' size-in-bits='32' id='f452c4f3'/>
+    <pointer-type-def type-id='63e40290' size-in-bits='32' id='93027c5d'/>
+    <pointer-type-def type-id='b58a040b' size-in-bits='32' id='2370212c'/>
+    <pointer-type-def type-id='c71e554c' size-in-bits='32' id='3f53351f'/>
+    <pointer-type-def type-id='48a0988a' size-in-bits='32' id='de836af9'/>
+    <pointer-type-def type-id='4543f86d' size-in-bits='32' id='60ba8818'/>
+    <pointer-type-def type-id='024b2e02' size-in-bits='32' id='340bfd9d'/>
+    <pointer-type-def type-id='72b5ef45' size-in-bits='32' id='abb6ff0a'/>
+    <pointer-type-def type-id='4d6cc7ff' size-in-bits='32' id='18ca9f30'/>
+    <pointer-type-def type-id='171c33c6' size-in-bits='32' id='3940caeb'/>
     <pointer-type-def type-id='8dfe2e06' size-in-bits='32' id='071e4e5d'/>
-    <pointer-type-def type-id='062cf4ec' size-in-bits='32' id='679b55be'/>
+    <pointer-type-def type-id='062cf4ec' size-in-bits='32' id='23f99073'/>
+    <pointer-type-def type-id='2362799b' size-in-bits='32' id='9a623a5c'/>
+    <pointer-type-def type-id='e7767992' size-in-bits='32' id='2b174cab'/>
+    <pointer-type-def type-id='6b5969a6' size-in-bits='32' id='30ee23e3'/>
+    <pointer-type-def type-id='41d77b1c' size-in-bits='32' id='a96e9567'/>
+    <pointer-type-def type-id='541d431d' size-in-bits='32' id='15829ccc'/>
+    <pointer-type-def type-id='0fbe2cda' size-in-bits='32' id='7c5a95b5'/>
+    <pointer-type-def type-id='1ce8356d' size-in-bits='32' id='c9aa1572'/>
+    <pointer-type-def type-id='0257c247' size-in-bits='32' id='f1af99f8'/>
+    <pointer-type-def type-id='9f8e2b3e' size-in-bits='32' id='397e8683'/>
+    <pointer-type-def type-id='5c9d1bb1' size-in-bits='32' id='7c6967e4'/>
+    <pointer-type-def type-id='7cc5073b' size-in-bits='32' id='9aee4982'/>
+    <pointer-type-def type-id='f6f688b2' size-in-bits='32' id='06674af5'/>
+    <pointer-type-def type-id='9ee61f63' size-in-bits='32' id='3d49369a'/>
+    <pointer-type-def type-id='47aa8c3c' size-in-bits='32' id='e06b46ad'/>
+    <pointer-type-def type-id='6b33627a' size-in-bits='32' id='0aafbc07'/>
+    <pointer-type-def type-id='039aab3d' size-in-bits='32' id='fd720bfe'/>
     <pointer-type-def type-id='973e3c3f' size-in-bits='32' id='6292c81e'/>
-    <pointer-type-def type-id='1b2606fc' size-in-bits='32' id='8fb656fe'/>
+    <pointer-type-def type-id='1b2606fc' size-in-bits='32' id='f0c5b475'/>
+    <pointer-type-def type-id='b5b9ed34' size-in-bits='32' id='452d9f35'/>
+    <pointer-type-def type-id='74c6e66d' size-in-bits='32' id='234a6cd4'/>
+    <pointer-type-def type-id='18f35374' size-in-bits='32' id='6098e447'/>
+    <pointer-type-def type-id='3ed49d13' size-in-bits='32' id='1dd3489a'/>
+    <pointer-type-def type-id='c3f30acc' size-in-bits='32' id='7814c8ad'/>
+    <pointer-type-def type-id='2baaba0a' size-in-bits='32' id='90e24e07'/>
+    <pointer-type-def type-id='2e36b4ed' size-in-bits='32' id='3f0de1fe'/>
+    <pointer-type-def type-id='14209476' size-in-bits='32' id='bec66371'/>
+    <pointer-type-def type-id='06dcb13c' size-in-bits='32' id='f1447c7b'/>
+    <pointer-type-def type-id='672db497' size-in-bits='32' id='43ae4cf2'/>
+    <pointer-type-def type-id='7f8c4cf0' size-in-bits='32' id='bae7b123'/>
+    <pointer-type-def type-id='28a5f5af' size-in-bits='32' id='29b6037c'/>
+    <pointer-type-def type-id='89a65589' size-in-bits='32' id='154c703a'/>
+    <pointer-type-def type-id='94426c08' size-in-bits='32' id='e91668fd'/>
     <pointer-type-def type-id='1a7fe6b0' size-in-bits='32' id='d8263a65'/>
-    <pointer-type-def type-id='1c8e3a5a' size-in-bits='32' id='190d83bc'/>
+    <pointer-type-def type-id='1c8e3a5a' size-in-bits='32' id='9785d58b'/>
+    <pointer-type-def type-id='5321e7f1' size-in-bits='32' id='e7cc9f5a'/>
+    <pointer-type-def type-id='f68d4a05' size-in-bits='32' id='f3fd167a'/>
+    <pointer-type-def type-id='2fb8ba3e' size-in-bits='32' id='19620ff1'/>
+    <pointer-type-def type-id='b02c2550' size-in-bits='32' id='41173bbb'/>
+    <pointer-type-def type-id='eb909c09' size-in-bits='32' id='0c62a17c'/>
+    <pointer-type-def type-id='46353f35' size-in-bits='32' id='bbfa68cc'/>
+    <pointer-type-def type-id='ccb79e1c' size-in-bits='32' id='5cd6fe80'/>
+    <pointer-type-def type-id='69749343' size-in-bits='32' id='322ef221'/>
+    <pointer-type-def type-id='846957ad' size-in-bits='32' id='3b95ca3f'/>
+    <pointer-type-def type-id='ae98ce5c' size-in-bits='32' id='34661db2'/>
+    <pointer-type-def type-id='49080c66' size-in-bits='32' id='e459a6af'/>
+    <pointer-type-def type-id='e375f1d9' size-in-bits='32' id='0dbd0b28'/>
+    <pointer-type-def type-id='8ae4e70f' size-in-bits='32' id='bd2b792b'/>
+    <pointer-type-def type-id='09e3e169' size-in-bits='32' id='51953751'/>
+    <pointer-type-def type-id='f44a3fa8' size-in-bits='32' id='5f5d06cc'/>
+    <pointer-type-def type-id='02d5f98d' size-in-bits='32' id='e3d72665'/>
+    <pointer-type-def type-id='8f0b7f5a' size-in-bits='32' id='0f8d5f3c'/>
+    <pointer-type-def type-id='9454c680' size-in-bits='32' id='7b6e1be6'/>
+    <pointer-type-def type-id='292a411b' size-in-bits='32' id='1c93d4e5'/>
+    <pointer-type-def type-id='1461dd30' size-in-bits='32' id='797bd39f'/>
     <pointer-type-def type-id='0b9c02cb' size-in-bits='32' id='7f83e8c4'/>
-    <pointer-type-def type-id='3aff0b18' size-in-bits='32' id='7b7de9b2'/>
+    <pointer-type-def type-id='3aff0b18' size-in-bits='32' id='434d567b'/>
+    <pointer-type-def type-id='7343f038' size-in-bits='32' id='e5fd5491'/>
+    <pointer-type-def type-id='ccb79e1d' size-in-bits='32' id='5cd6fe81'/>
+    <pointer-type-def type-id='69749344' size-in-bits='32' id='322ef222'/>
+    <pointer-type-def type-id='846957ae' size-in-bits='32' id='3b95ca40'/>
+    <pointer-type-def type-id='ae98ce5d' size-in-bits='32' id='34661db3'/>
+    <pointer-type-def type-id='e375f1da' size-in-bits='32' id='0dbd0b29'/>
+    <pointer-type-def type-id='8ae4e710' size-in-bits='32' id='bd2b792c'/>
+    <pointer-type-def type-id='09e3e16a' size-in-bits='32' id='51953752'/>
+    <pointer-type-def type-id='f44a3fa9' size-in-bits='32' id='5f5d06cd'/>
+    <pointer-type-def type-id='02d5f98e' size-in-bits='32' id='e3d72666'/>
+    <pointer-type-def type-id='8f0b7f5b' size-in-bits='32' id='0f8d5f3d'/>
+    <pointer-type-def type-id='9454c681' size-in-bits='32' id='7b6e1be7'/>
+    <pointer-type-def type-id='292a411c' size-in-bits='32' id='1c93d4e6'/>
     <pointer-type-def type-id='c8745fdc' size-in-bits='32' id='c2fb5303'/>
-    <pointer-type-def type-id='f669f224' size-in-bits='32' id='20c01846'/>
+    <pointer-type-def type-id='f669f224' size-in-bits='32' id='a5922fa3'/>
+    <pointer-type-def type-id='9da94b15' size-in-bits='32' id='64c5934e'/>
+    <pointer-type-def type-id='2fe17cde' size-in-bits='32' id='e475bf19'/>
+    <pointer-type-def type-id='2b6522f1' size-in-bits='32' id='70351828'/>
+    <pointer-type-def type-id='d5b15e49' size-in-bits='32' id='2365fdd8'/>
+    <pointer-type-def type-id='a77026dd' size-in-bits='32' id='ccec23f4'/>
+    <pointer-type-def type-id='4c6da22e' size-in-bits='32' id='7bbfad59'/>
+    <pointer-type-def type-id='54e064ca' size-in-bits='32' id='89b4862b'/>
+    <pointer-type-def type-id='4aacf270' size-in-bits='32' id='99ff6e15'/>
+    <pointer-type-def type-id='357daae3' size-in-bits='32' id='0e7dc576'/>
+    <pointer-type-def type-id='ba3ff62b' size-in-bits='32' id='c40ae374'/>
+    <pointer-type-def type-id='39763bbe' size-in-bits='32' id='e8d65641'/>
+    <pointer-type-def type-id='655c526c' size-in-bits='32' id='87683ec7'/>
+    <pointer-type-def type-id='392f372a' size-in-bits='32' id='c8123d81'/>
+    <pointer-type-def type-id='2afd2d4d' size-in-bits='32' id='5debed90'/>
+    <pointer-type-def type-id='93d80062' size-in-bits='32' id='21976f65'/>
+    <pointer-type-def type-id='d24762a5' size-in-bits='32' id='38711a82'/>
+    <pointer-type-def type-id='92fdb75f' size-in-bits='32' id='ff005e88'/>
+    <pointer-type-def type-id='cc93eb66' size-in-bits='32' id='4025b733'/>
+    <pointer-type-def type-id='cf650c06' size-in-bits='32' id='9a5725d5'/>
+    <pointer-type-def type-id='f74edd67' size-in-bits='32' id='ad0b765a'/>
+    <pointer-type-def type-id='bb3a3bd3' size-in-bits='32' id='61b688b0'/>
+    <pointer-type-def type-id='4861351d' size-in-bits='32' id='3f4a2861'/>
+    <pointer-type-def type-id='ccb79e1e' size-in-bits='32' id='5cd6fe7f'/>
+    <pointer-type-def type-id='69749345' size-in-bits='32' id='322ef220'/>
+    <pointer-type-def type-id='846957af' size-in-bits='32' id='3b95ca3e'/>
+    <pointer-type-def type-id='ae98ce5e' size-in-bits='32' id='34661db1'/>
+    <pointer-type-def type-id='8ae4e711' size-in-bits='32' id='bd2b792a'/>
+    <pointer-type-def type-id='09e3e16b' size-in-bits='32' id='51953750'/>
+    <pointer-type-def type-id='f44a3faa' size-in-bits='32' id='5f5d06cb'/>
+    <pointer-type-def type-id='02d5f98f' size-in-bits='32' id='e3d72664'/>
+    <pointer-type-def type-id='8f0b7f5c' size-in-bits='32' id='0f8d5f3b'/>
+    <pointer-type-def type-id='9454c682' size-in-bits='32' id='7b6e1be5'/>
+    <pointer-type-def type-id='292a411d' size-in-bits='32' id='1c93d4e4'/>
     <pointer-type-def type-id='9a10f134' size-in-bits='32' id='aa210e95'/>
-    <pointer-type-def type-id='31804c0e' size-in-bits='32' id='80456268'/>
+    <pointer-type-def type-id='31804c0e' size-in-bits='32' id='8fb2e86b'/>
+    <pointer-type-def type-id='9dcf39b9' size-in-bits='32' id='86d5bf12'/>
+    <pointer-type-def type-id='060737b9' size-in-bits='32' id='d57c164e'/>
+    <pointer-type-def type-id='3ccdd9d3' size-in-bits='32' id='1a7dde06'/>
+    <pointer-type-def type-id='bf8b79fb' size-in-bits='32' id='a3339ebc'/>
+    <pointer-type-def type-id='a6863c16' size-in-bits='32' id='b2c6c541'/>
+    <pointer-type-def type-id='e13d7981' size-in-bits='32' id='a8a22fa6'/>
     <pointer-type-def type-id='a0eb0f09' size-in-bits='32' id='7408d286'/>
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='32' id='a68021ce'/>
     <pointer-type-def type-id='05d4c620' size-in-bits='32' id='b8263143'/>
@@ -5594,215 +5735,74 @@ 
     <pointer-type-def type-id='62e477b5' size-in-bits='32' id='e8fa266e'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='32' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='32' id='d915a820'/>
-    <pointer-type-def type-id='c2ab665d' size-in-bits='32' id='22b63871'/>
-    <pointer-type-def type-id='ca1de4b9' size-in-bits='32' id='192dd735'/>
-    <pointer-type-def type-id='6f7cb7b4' size-in-bits='32' id='c61bcf16'/>
-    <pointer-type-def type-id='eda358d5' size-in-bits='32' id='4a68d231'/>
-    <pointer-type-def type-id='84f1ec00' size-in-bits='32' id='46959e4a'/>
-    <pointer-type-def type-id='357a5107' size-in-bits='32' id='59816c03'/>
-    <pointer-type-def type-id='2207a1d4' size-in-bits='32' id='bfafe7be'/>
-    <pointer-type-def type-id='b3920ec1' size-in-bits='32' id='632958b5'/>
-    <pointer-type-def type-id='dbddeaa4' size-in-bits='32' id='5502cec6'/>
-    <pointer-type-def type-id='dce8633b' size-in-bits='32' id='911bafcf'/>
-    <pointer-type-def type-id='635e0a25' size-in-bits='32' id='afd19731'/>
-    <pointer-type-def type-id='40138048' size-in-bits='32' id='fb4bf8a2'/>
-    <pointer-type-def type-id='ffceb0d7' size-in-bits='32' id='f47c20db'/>
-    <pointer-type-def type-id='118a7d6e' size-in-bits='32' id='dcc01f40'/>
-    <pointer-type-def type-id='6a7bb135' size-in-bits='32' id='00722fb9'/>
-    <pointer-type-def type-id='72c33ddb' size-in-bits='32' id='2ab62f6f'/>
-    <pointer-type-def type-id='76032d71' size-in-bits='32' id='f02d21bd'/>
-    <pointer-type-def type-id='36acdbcc' size-in-bits='32' id='39e07fe6'/>
-    <pointer-type-def type-id='ffadf963' size-in-bits='32' id='4602a027'/>
-    <pointer-type-def type-id='1e23d39a' size-in-bits='32' id='dbd5502c'/>
-    <pointer-type-def type-id='8ae90496' size-in-bits='32' id='3f53da28'/>
-    <pointer-type-def type-id='7c58e9c1' size-in-bits='32' id='ac33c16d'/>
-    <pointer-type-def type-id='9f92723c' size-in-bits='32' id='c5080c6e'/>
-    <pointer-type-def type-id='d6f3cc1e' size-in-bits='32' id='be83b1c0'/>
-    <pointer-type-def type-id='4aa4e453' size-in-bits='32' id='bd039867'/>
-    <pointer-type-def type-id='aa966e7a' size-in-bits='32' id='8e395004'/>
-    <pointer-type-def type-id='60d09265' size-in-bits='32' id='b8872911'/>
-    <pointer-type-def type-id='23a084d1' size-in-bits='32' id='2dc018ad'/>
-    <pointer-type-def type-id='1c231d7d' size-in-bits='32' id='3a544209'/>
-    <pointer-type-def type-id='63e40290' size-in-bits='32' id='5316a70a'/>
-    <pointer-type-def type-id='234ebc1f' size-in-bits='32' id='8212a383'/>
-    <pointer-type-def type-id='a3568ec6' size-in-bits='32' id='7cc5a858'/>
-    <pointer-type-def type-id='48a0988a' size-in-bits='32' id='429f83fc'/>
-    <pointer-type-def type-id='b6337d2d' size-in-bits='32' id='e202bf99'/>
-    <pointer-type-def type-id='aef1d658' size-in-bits='32' id='d3d606ba'/>
-    <pointer-type-def type-id='024b2e02' size-in-bits='32' id='5b2401a4'/>
-    <pointer-type-def type-id='4d6cc7ff' size-in-bits='32' id='75022493'/>
-    <pointer-type-def type-id='82e9406e' size-in-bits='32' id='e6cee188'/>
-    <pointer-type-def type-id='32dce039' size-in-bits='32' id='276929e5'/>
-    <pointer-type-def type-id='2362799b' size-in-bits='32' id='843cef5f'/>
-    <pointer-type-def type-id='e7767992' size-in-bits='32' id='a247d414'/>
-    <pointer-type-def type-id='6b5969a6' size-in-bits='32' id='c1bcbe60'/>
-    <pointer-type-def type-id='41d77b1c' size-in-bits='32' id='61e793ce'/>
-    <pointer-type-def type-id='541d431d' size-in-bits='32' id='f50e7349'/>
-    <pointer-type-def type-id='0fbe2cda' size-in-bits='32' id='8820c0ac'/>
-    <pointer-type-def type-id='0257c247' size-in-bits='32' id='fcb05c6b'/>
-    <pointer-type-def type-id='9665bdb6' size-in-bits='32' id='4d96d680'/>
-    <pointer-type-def type-id='66488491' size-in-bits='32' id='56da0ded'/>
-    <pointer-type-def type-id='7cc5073b' size-in-bits='32' id='06ef81e7'/>
-    <pointer-type-def type-id='a3c89a22' size-in-bits='32' id='57f14084'/>
-    <pointer-type-def type-id='028fa27d' size-in-bits='32' id='81941e91'/>
-    <pointer-type-def type-id='9ee61f63' size-in-bits='32' id='a737306f'/>
-    <pointer-type-def type-id='6b33627a' size-in-bits='32' id='cce2541c'/>
-    <pointer-type-def type-id='50f8d93d' size-in-bits='32' id='061addf9'/>
-    <pointer-type-def type-id='76a432e8' size-in-bits='32' id='1358cb5a'/>
-    <pointer-type-def type-id='b5b9ed34' size-in-bits='32' id='ef68ddae'/>
-    <pointer-type-def type-id='74c6e66d' size-in-bits='32' id='700bfd71'/>
-    <pointer-type-def type-id='18f35374' size-in-bits='32' id='2c8531ee'/>
-    <pointer-type-def type-id='3ed49d13' size-in-bits='32' id='2525f167'/>
-    <pointer-type-def type-id='2baaba0a' size-in-bits='32' id='e8cbc4c4'/>
-    <pointer-type-def type-id='14ac55ad' size-in-bits='32' id='aaed3ee1'/>
-    <pointer-type-def type-id='5ebac3d8' size-in-bits='32' id='b540af52'/>
-    <pointer-type-def type-id='06dcb13c' size-in-bits='32' id='34d95ce6'/>
-    <pointer-type-def type-id='eb1675b3' size-in-bits='32' id='286f4f27'/>
-    <pointer-type-def type-id='129c82ea' size-in-bits='32' id='6a09952c'/>
-    <pointer-type-def type-id='7f8c4cf0' size-in-bits='32' id='45f30d62'/>
-    <pointer-type-def type-id='89a65589' size-in-bits='32' id='81649ee5'/>
-    <pointer-type-def type-id='263f3dcc' size-in-bits='32' id='a1d47c16'/>
-    <pointer-type-def type-id='047ae073' size-in-bits='32' id='9f5f6d1f'/>
-    <pointer-type-def type-id='5321e7f1' size-in-bits='32' id='8fe62605'/>
-    <pointer-type-def type-id='f68d4a05' size-in-bits='32' id='18d755d9'/>
-    <pointer-type-def type-id='2fb8ba3e' size-in-bits='32' id='a65198e8'/>
-    <pointer-type-def type-id='b02c2550' size-in-bits='32' id='55811db2'/>
-    <pointer-type-def type-id='eb909c09' size-in-bits='32' id='dfa383fd'/>
-    <pointer-type-def type-id='46353f35' size-in-bits='32' id='98515169'/>
-    <pointer-type-def type-id='ccb79e1c' size-in-bits='32' id='826b5edf'/>
-    <pointer-type-def type-id='846957ad' size-in-bits='32' id='8394b66a'/>
-    <pointer-type-def type-id='2f3e7a58' size-in-bits='32' id='2b6dfd03'/>
-    <pointer-type-def type-id='e8eab40f' size-in-bits='32' id='4442688c'/>
-    <pointer-type-def type-id='49080c66' size-in-bits='32' id='8770ee20'/>
-    <pointer-type-def type-id='e375f1d9' size-in-bits='32' id='7a154085'/>
-    <pointer-type-def type-id='09e3e169' size-in-bits='32' id='5b8df47e'/>
-    <pointer-type-def type-id='d5e4d4ec' size-in-bits='32' id='5b336a8f'/>
-    <pointer-type-def type-id='1bb86c53' size-in-bits='32' id='cab20a88'/>
-    <pointer-type-def type-id='02d5f98d' size-in-bits='32' id='d9547e1a'/>
-    <pointer-type-def type-id='9454c680' size-in-bits='32' id='4ed5bc7b'/>
-    <pointer-type-def type-id='a84589af' size-in-bits='32' id='4ab10d54'/>
-    <pointer-type-def type-id='86f41856' size-in-bits='32' id='9f2ec5e9'/>
-    <pointer-type-def type-id='1461dd30' size-in-bits='32' id='c8a34da2'/>
-    <pointer-type-def type-id='7343f038' size-in-bits='32' id='87d7d6ca'/>
-    <pointer-type-def type-id='ccb79e1d' size-in-bits='32' id='826b5ee0'/>
-    <pointer-type-def type-id='846957ae' size-in-bits='32' id='8394b66b'/>
-    <pointer-type-def type-id='2f3e7a59' size-in-bits='32' id='2b6dfd04'/>
-    <pointer-type-def type-id='e8eab410' size-in-bits='32' id='4442688d'/>
-    <pointer-type-def type-id='e375f1da' size-in-bits='32' id='7a154086'/>
-    <pointer-type-def type-id='09e3e16a' size-in-bits='32' id='5b8df47f'/>
-    <pointer-type-def type-id='d5e4d4ed' size-in-bits='32' id='5b336a90'/>
-    <pointer-type-def type-id='1bb86c54' size-in-bits='32' id='cab20a89'/>
-    <pointer-type-def type-id='02d5f98e' size-in-bits='32' id='d9547e1b'/>
-    <pointer-type-def type-id='9454c681' size-in-bits='32' id='4ed5bc7c'/>
-    <pointer-type-def type-id='a84589b0' size-in-bits='32' id='4ab10d55'/>
-    <pointer-type-def type-id='86f41857' size-in-bits='32' id='9f2ec5ea'/>
-    <pointer-type-def type-id='9da94b15' size-in-bits='32' id='adc7abf9'/>
-    <pointer-type-def type-id='2fe17cde' size-in-bits='32' id='7b39afc8'/>
-    <pointer-type-def type-id='2b6522f1' size-in-bits='32' id='95094585'/>
-    <pointer-type-def type-id='d5b15e49' size-in-bits='32' id='32aa4f8d'/>
-    <pointer-type-def type-id='a77026dd' size-in-bits='32' id='4bcddc31'/>
-    <pointer-type-def type-id='4c6da22e' size-in-bits='32' id='d17c3f88'/>
-    <pointer-type-def type-id='4aacf270' size-in-bits='32' id='38637da2'/>
-    <pointer-type-def type-id='357daae3' size-in-bits='32' id='a19c74f7'/>
-    <pointer-type-def type-id='582752bf' size-in-bits='32' id='775787db'/>
-    <pointer-type-def type-id='08ced926' size-in-bits='32' id='260c4c40'/>
-    <pointer-type-def type-id='39763bbe' size-in-bits='32' id='f2a57148'/>
-    <pointer-type-def type-id='392f372a' size-in-bits='32' id='75e166e4'/>
-    <pointer-type-def type-id='8a107f0d' size-in-bits='32' id='671a4cc1'/>
-    <pointer-type-def type-id='08cb7a78' size-in-bits='32' id='36fdf2f2'/>
-    <pointer-type-def type-id='93d80062' size-in-bits='32' id='676c304c'/>
-    <pointer-type-def type-id='92fdb75f' size-in-bits='32' id='d469a98b'/>
-    <pointer-type-def type-id='1a60c48e' size-in-bits='32' id='e2a33260'/>
-    <pointer-type-def type-id='7c644d19' size-in-bits='32' id='ceea3b8d'/>
-    <pointer-type-def type-id='cf650c06' size-in-bits='32' id='3426ab68'/>
-    <pointer-type-def type-id='f74edd67' size-in-bits='32' id='e8dccc6b'/>
-    <pointer-type-def type-id='bb3a3bd3' size-in-bits='32' id='3a73b9e7'/>
-    <pointer-type-def type-id='4861351d' size-in-bits='32' id='ddfe5d59'/>
-    <pointer-type-def type-id='ccb79e1e' size-in-bits='32' id='826b5ede'/>
-    <pointer-type-def type-id='846957af' size-in-bits='32' id='8394b669'/>
-    <pointer-type-def type-id='2f3e7a5a' size-in-bits='32' id='2b6dfd02'/>
-    <pointer-type-def type-id='e8eab411' size-in-bits='32' id='4442688b'/>
-    <pointer-type-def type-id='09e3e16b' size-in-bits='32' id='5b8df47d'/>
-    <pointer-type-def type-id='d5e4d4ee' size-in-bits='32' id='5b336a8e'/>
-    <pointer-type-def type-id='1bb86c55' size-in-bits='32' id='cab20a87'/>
-    <pointer-type-def type-id='02d5f98f' size-in-bits='32' id='d9547e19'/>
-    <pointer-type-def type-id='9454c682' size-in-bits='32' id='4ed5bc7a'/>
-    <pointer-type-def type-id='a84589b1' size-in-bits='32' id='4ab10d53'/>
-    <pointer-type-def type-id='86f41858' size-in-bits='32' id='9f2ec5e8'/>
-    <pointer-type-def type-id='9dcf39b9' size-in-bits='32' id='730c485d'/>
-    <pointer-type-def type-id='060737b9' size-in-bits='32' id='3c0c03e5'/>
-    <pointer-type-def type-id='3ccdd9d3' size-in-bits='32' id='814cad27'/>
-    <pointer-type-def type-id='bf8b79fb' size-in-bits='32' id='629338b7'/>
-    <pointer-type-def type-id='a6863c16' size-in-bits='32' id='21ec59f0'/>
-    <pointer-type-def type-id='e13d7981' size-in-bits='32' id='b3dfc495'/>
     <pointer-type-def type-id='8f92235e' size-in-bits='32' id='90421557'/>
     <reference-type-def kind='lvalue' type-id='002ac4a6' size-in-bits='32' id='c3535580'/>
     <reference-type-def kind='rvalue' type-id='002ac4a6' size-in-bits='32' id='222fd452'/>
     <reference-type-def kind='lvalue' type-id='f0981eed' size-in-bits='32' id='8c787cb7'/>
     <pointer-type-def type-id='f0981eed' size-in-bits='32' id='807869d3'/>
-    <pointer-type-def type-id='ee076206' size-in-bits='32' id='953b12f8'/>
-    <pointer-type-def type-id='03e3ce24' size-in-bits='32' id='8bc971a6'/>
-    <pointer-type-def type-id='a1159711' size-in-bits='32' id='2deb20e5'/>
-    <pointer-type-def type-id='d91da88b' size-in-bits='32' id='4382c817'/>
-    <pointer-type-def type-id='44c9c9bf' size-in-bits='32' id='69aab5c3'/>
-    <pointer-type-def type-id='bf5f1f6d' size-in-bits='32' id='08a2f0e1'/>
-    <pointer-type-def type-id='df741104' size-in-bits='32' id='fbe0c9de'/>
-    <pointer-type-def type-id='a390bd39' size-in-bits='32' id='6d8c64bd'/>
-    <pointer-type-def type-id='1529f4a1' size-in-bits='32' id='3b7e394d'/>
-    <pointer-type-def type-id='33597c16' size-in-bits='32' id='5bf36468'/>
-    <pointer-type-def type-id='be7282a9' size-in-bits='32' id='0f8e37bd'/>
-    <pointer-type-def type-id='089c907d' size-in-bits='32' id='dc329231'/>
-    <pointer-type-def type-id='831ffd4a' size-in-bits='32' id='730be8b4'/>
-    <pointer-type-def type-id='3733befa' size-in-bits='32' id='a1ed8fac'/>
-    <pointer-type-def type-id='0306f1a9' size-in-bits='32' id='d5efc015'/>
-    <pointer-type-def type-id='e65944cb' size-in-bits='32' id='400806b7'/>
-    <pointer-type-def type-id='bdd36586' size-in-bits='32' id='6c7c35c0'/>
-    <pointer-type-def type-id='83901d9f' size-in-bits='32' id='192b003b'/>
-    <pointer-type-def type-id='a8c3878a' size-in-bits='32' id='48f9101d'/>
-    <pointer-type-def type-id='a8c3878b' size-in-bits='32' id='48f9101e'/>
-    <pointer-type-def type-id='c06e176d' size-in-bits='32' id='01a865d1'/>
-    <pointer-type-def type-id='a8c3878c' size-in-bits='32' id='48f9101c'/>
-    <pointer-type-def type-id='deb04b74' size-in-bits='32' id='7399468e'/>
-    <pointer-type-def type-id='cb36c1eb' size-in-bits='32' id='063cc4af'/>
-    <pointer-type-def type-id='a39024d2' size-in-bits='32' id='35958544'/>
-    <pointer-type-def type-id='980f5b1b' size-in-bits='32' id='db388837'/>
-    <pointer-type-def type-id='a4bca08f' size-in-bits='32' id='977cec7b'/>
-    <pointer-type-def type-id='c918d3fc' size-in-bits='32' id='fd9a9816'/>
-    <pointer-type-def type-id='741ec8cb' size-in-bits='32' id='298dc3b7'/>
-    <pointer-type-def type-id='6b259141' size-in-bits='32' id='9990734d'/>
-    <pointer-type-def type-id='394d7db8' size-in-bits='32' id='eb01d38a'/>
-    <pointer-type-def type-id='86dac493' size-in-bits='32' id='66b73f2f'/>
-    <pointer-type-def type-id='e3c17b35' size-in-bits='32' id='fa46db69'/>
-    <pointer-type-def type-id='5e9ac5ac' size-in-bits='32' id='6bc23226'/>
-    <pointer-type-def type-id='8d96fcb9' size-in-bits='32' id='4ae3250d'/>
-    <pointer-type-def type-id='71bbb5b1' size-in-bits='32' id='ebf40e2d'/>
-    <pointer-type-def type-id='65f72aae' size-in-bits='32' id='ad1ea7c0'/>
-    <pointer-type-def type-id='f82c684a' size-in-bits='32' id='43af461c'/>
-    <pointer-type-def type-id='252732ae' size-in-bits='32' id='59a4a320'/>
-    <pointer-type-def type-id='03deda19' size-in-bits='32' id='e25f48c5'/>
-    <pointer-type-def type-id='44d47584' size-in-bits='32' id='f1b14db6'/>
-    <pointer-type-def type-id='c5a9c037' size-in-bits='32' id='9af031fb'/>
-    <pointer-type-def type-id='f52cf650' size-in-bits='32' id='ffc17d12'/>
-    <pointer-type-def type-id='8f97eff0' size-in-bits='32' id='e9d4d69a'/>
-    <pointer-type-def type-id='3c76d9f1' size-in-bits='32' id='fcbe15c5'/>
-    <pointer-type-def type-id='138fbb56' size-in-bits='32' id='d69f3378'/>
-    <pointer-type-def type-id='0c71af8b' size-in-bits='32' id='aa5e90a8'/>
-    <pointer-type-def type-id='0c71af8c' size-in-bits='32' id='aa5e90a9'/>
-    <pointer-type-def type-id='a23173c4' size-in-bits='32' id='bc60df5e'/>
-    <pointer-type-def type-id='0c71af8d' size-in-bits='32' id='aa5e90a7'/>
-    <pointer-type-def type-id='69b156fb' size-in-bits='32' id='7359e10f'/>
-    <pointer-type-def type-id='0e213a62' size-in-bits='32' id='72df644c'/>
-    <pointer-type-def type-id='21e4693d' size-in-bits='32' id='d4f446a9'/>
-    <pointer-type-def type-id='e123a5d8' size-in-bits='32' id='177b60ba'/>
-    <pointer-type-def type-id='9edfc7bf' size-in-bits='32' id='89ccc593'/>
-    <pointer-type-def type-id='ba51789d' size-in-bits='32' id='5fc46b11'/>
-    <pointer-type-def type-id='b9e9f180' size-in-bits='32' id='b95eace2'/>
-    <pointer-type-def type-id='d80b7155' size-in-bits='32' id='f48e25c1'/>
-    <pointer-type-def type-id='3b2e054f' size-in-bits='32' id='6fd868db'/>
-    <pointer-type-def type-id='71686cf2' size-in-bits='32' id='0a719884'/>
-    <pointer-type-def type-id='ada13aa2' size-in-bits='32' id='7a8e54fc'/>
-    <pointer-type-def type-id='8deca216' size-in-bits='32' id='101b8c80'/>
-    <pointer-type-def type-id='b472b352' size-in-bits='32' id='4db2cf0c'/>
+    <pointer-type-def type-id='03e3ce24' size-in-bits='32' id='e45dd401'/>
+    <pointer-type-def type-id='a1159711' size-in-bits='32' id='7a98879a'/>
+    <pointer-type-def type-id='d91da88b' size-in-bits='32' id='bf254042'/>
+    <pointer-type-def type-id='44c9c9bf' size-in-bits='32' id='191aba0c'/>
+    <pointer-type-def type-id='bf5f1f6d' size-in-bits='32' id='f51198ec'/>
+    <pointer-type-def type-id='df741104' size-in-bits='32' id='a46b0935'/>
+    <pointer-type-def type-id='a390bd39' size-in-bits='32' id='34f80e06'/>
+    <pointer-type-def type-id='1529f4a1' size-in-bits='32' id='81c03d6c'/>
+    <pointer-type-def type-id='33597c16' size-in-bits='32' id='f7a0379f'/>
+    <pointer-type-def type-id='be7282a9' size-in-bits='32' id='2b0e4ff2'/>
+    <pointer-type-def type-id='089c907d' size-in-bits='32' id='e08d371c'/>
+    <pointer-type-def type-id='831ffd4a' size-in-bits='32' id='545a856f'/>
+    <pointer-type-def type-id='3733befa' size-in-bits='32' id='70ef270d'/>
+    <pointer-type-def type-id='0306f1a9' size-in-bits='32' id='9bda8fea'/>
+    <pointer-type-def type-id='e65944cb' size-in-bits='32' id='05b410f6'/>
+    <pointer-type-def type-id='bdd36586' size-in-bits='32' id='7c24b203'/>
+    <pointer-type-def type-id='83901d9f' size-in-bits='32' id='1171d1b4'/>
+    <pointer-type-def type-id='a8c3878a' size-in-bits='32' id='625ca386'/>
+    <pointer-type-def type-id='a8c3878b' size-in-bits='32' id='625ca387'/>
+    <pointer-type-def type-id='c06e176d' size-in-bits='32' id='a479abce'/>
+    <pointer-type-def type-id='a8c3878c' size-in-bits='32' id='625ca385'/>
+    <pointer-type-def type-id='f587884e' size-in-bits='32' id='3d342907'/>
+    <pointer-type-def type-id='deb04b74' size-in-bits='32' id='372c8441'/>
+    <pointer-type-def type-id='3d4aa27f' size-in-bits='32' id='806c2c50'/>
+    <pointer-type-def type-id='980f5b1b' size-in-bits='32' id='f1850b08'/>
+    <pointer-type-def type-id='a4bca08f' size-in-bits='32' id='a733b71a'/>
+    <pointer-type-def type-id='c918d3fc' size-in-bits='32' id='b251d72d'/>
+    <pointer-type-def type-id='741ec8cb' size-in-bits='32' id='a522e978'/>
+    <pointer-type-def type-id='6b259141' size-in-bits='32' id='950241b0'/>
+    <pointer-type-def type-id='394d7db8' size-in-bits='32' id='21f41051'/>
+    <pointer-type-def type-id='86dac493' size-in-bits='32' id='44f25f18'/>
+    <pointer-type-def type-id='e3c17b35' size-in-bits='32' id='2ccb7754'/>
+    <pointer-type-def type-id='5e9ac5ac' size-in-bits='32' id='792859dd'/>
+    <pointer-type-def type-id='8d96fcb9' size-in-bits='32' id='b76b1db6'/>
+    <pointer-type-def type-id='71bbb5b1' size-in-bits='32' id='c1bcf4ec'/>
+    <pointer-type-def type-id='65f72aae' size-in-bits='32' id='1e124adf'/>
+    <pointer-type-def type-id='f82c684a' size-in-bits='32' id='f34f71b5'/>
+    <pointer-type-def type-id='1b85d290' size-in-bits='32' id='c003e813'/>
+    <pointer-type-def type-id='252732ae' size-in-bits='32' id='49f4e2fd'/>
+    <pointer-type-def type-id='1408a281' size-in-bits='32' id='3d23490c'/>
+    <pointer-type-def type-id='c5a9c037' size-in-bits='32' id='368860b2'/>
+    <pointer-type-def type-id='f52cf650' size-in-bits='32' id='931a74f1'/>
+    <pointer-type-def type-id='8f97eff0' size-in-bits='32' id='fc76ab83'/>
+    <pointer-type-def type-id='3c76d9f1' size-in-bits='32' id='0408c00e'/>
+    <pointer-type-def type-id='138fbb56' size-in-bits='32' id='211caeb7'/>
+    <pointer-type-def type-id='0c71af8b' size-in-bits='32' id='1135eb83'/>
+    <pointer-type-def type-id='0c71af8c' size-in-bits='32' id='1135eb84'/>
+    <pointer-type-def type-id='a23173c4' size-in-bits='32' id='68835375'/>
+    <pointer-type-def type-id='0c71af8d' size-in-bits='32' id='1135eb82'/>
+    <pointer-type-def type-id='8791c9f1' size-in-bits='32' id='4d8d0cb6'/>
+    <pointer-type-def type-id='69b156fb' size-in-bits='32' id='a1f794fc'/>
+    <pointer-type-def type-id='570a4472' size-in-bits='32' id='c0e9d857'/>
+    <pointer-type-def type-id='e123a5d8' size-in-bits='32' id='9b7fadc5'/>
+    <pointer-type-def type-id='9edfc7bf' size-in-bits='32' id='33caa8c4'/>
+    <pointer-type-def type-id='ba51789d' size-in-bits='32' id='82203b3c'/>
+    <pointer-type-def type-id='b9e9f180' size-in-bits='32' id='e1be4c89'/>
+    <pointer-type-def type-id='d80b7155' size-in-bits='32' id='7c2a9d98'/>
+    <pointer-type-def type-id='3b2e054f' size-in-bits='32' id='c05a64c8'/>
+    <pointer-type-def type-id='71686cf2' size-in-bits='32' id='0c1914a7'/>
+    <pointer-type-def type-id='ada13aa2' size-in-bits='32' id='bd3e8fb9'/>
+    <pointer-type-def type-id='30a82da4' size-in-bits='32' id='c640490b'/>
+    <pointer-type-def type-id='8deca216' size-in-bits='32' id='32c7d509'/>
+    <pointer-type-def type-id='b472b352' size-in-bits='32' id='23103ee5'/>
     <pointer-type-def type-id='c523b9f1' size-in-bits='32' id='323d93c1'/>
     <pointer-type-def type-id='323d93c1' size-in-bits='32' id='01efdaf1'/>
     <pointer-type-def type-id='aa12d1bd' size-in-bits='32' id='822cd80e'/>
@@ -17626,11 +17626,11 @@ 
       <parameter type-id='cc6e09ca'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='582752bf'>
+    <function-type size-in-bits='32' id='54e064ca'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='4aacf270'>
@@ -17640,18 +17640,18 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='357daae3'>
+    <function-type size-in-bits='32' id='ba3ff62b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='cc6e09ca'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='08ced926'>
+    <function-type size-in-bits='32' id='357daae3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='cc6e09ca'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='39763bbe'>
@@ -17659,12 +17659,12 @@ 
       <parameter type-id='96f3d089'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='8a107f0d'>
+    <function-type size-in-bits='32' id='655c526c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='392f372a'>
@@ -17675,12 +17675,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='08cb7a78'>
+    <function-type size-in-bits='32' id='2afd2d4d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='93d80062'>
@@ -17689,11 +17689,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='1a60c48e'>
+    <function-type size-in-bits='32' id='d24762a5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='92fdb75f'>
@@ -17703,11 +17703,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='7c644d19'>
+    <function-type size-in-bits='32' id='cc93eb66'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='cf650c06'>
@@ -17767,11 +17767,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='9665bdb6'>
+    <function-type size-in-bits='32' id='1ce8356d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='0257c247'>
@@ -17781,19 +17781,19 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='66488491'>
+    <function-type size-in-bits='32' id='9f8e2b3e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='a3c89a22'>
+    <function-type size-in-bits='32' id='5c9d1bb1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='7cc5073b'>
@@ -17804,12 +17804,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='028fa27d'>
+    <function-type size-in-bits='32' id='f6f688b2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='9ee61f63'>
@@ -17818,11 +17818,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='50f8d93d'>
+    <function-type size-in-bits='32' id='47aa8c3c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='6b33627a'>
@@ -17832,11 +17832,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='76a432e8'>
+    <function-type size-in-bits='32' id='039aab3d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='4861351d'>
@@ -17850,11 +17850,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='14ac55ad'>
+    <function-type size-in-bits='32' id='c3f30acc'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='2baaba0a'>
@@ -17864,19 +17864,19 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='5ebac3d8'>
+    <function-type size-in-bits='32' id='2e36b4ed'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='eb1675b3'>
+    <function-type size-in-bits='32' id='14209476'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='06dcb13c'>
@@ -17887,12 +17887,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='129c82ea'>
+    <function-type size-in-bits='32' id='672db497'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='7f8c4cf0'>
@@ -17901,11 +17901,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='263f3dcc'>
+    <function-type size-in-bits='32' id='28a5f5af'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='89a65589'>
@@ -17915,11 +17915,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='047ae073'>
+    <function-type size-in-bits='32' id='94426c08'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='f68d4a05'>
@@ -17959,25 +17959,25 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f3e7a58'>
+    <function-type size-in-bits='32' id='69749343'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f3e7a59'>
+    <function-type size-in-bits='32' id='69749344'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f3e7a5a'>
+    <function-type size-in-bits='32' id='69749345'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='846957ad'>
@@ -18001,25 +18001,25 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='e8eab40f'>
+    <function-type size-in-bits='32' id='ae98ce5c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='e8eab410'>
+    <function-type size-in-bits='32' id='ae98ce5d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='e8eab411'>
+    <function-type size-in-bits='32' id='ae98ce5e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='eb909c09'>
@@ -18045,28 +18045,28 @@ 
       <parameter type-id='96f3d089'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='d5e4d4ec'>
+    <function-type size-in-bits='32' id='8ae4e70f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='d5e4d4ed'>
+    <function-type size-in-bits='32' id='8ae4e710'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='d5e4d4ee'>
+    <function-type size-in-bits='32' id='8ae4e711'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='09e3e169'>
@@ -18093,28 +18093,28 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='1bb86c53'>
+    <function-type size-in-bits='32' id='f44a3fa8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='1bb86c54'>
+    <function-type size-in-bits='32' id='f44a3fa9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='1bb86c55'>
+    <function-type size-in-bits='32' id='f44a3faa'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='02d5f98d'>
@@ -18135,25 +18135,25 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='a84589af'>
+    <function-type size-in-bits='32' id='8f0b7f5a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='a84589b0'>
+    <function-type size-in-bits='32' id='8f0b7f5b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='a84589b1'>
+    <function-type size-in-bits='32' id='8f0b7f5c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='9454c680'>
@@ -18177,25 +18177,25 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='86f41856'>
+    <function-type size-in-bits='32' id='292a411b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='86f41857'>
+    <function-type size-in-bits='32' id='292a411c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='86f41858'>
+    <function-type size-in-bits='32' id='292a411d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='3ccdd9d3'>
@@ -18272,11 +18272,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='ffadf963'>
+    <function-type size-in-bits='32' id='47ca8d46'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='36acdbcc'>
@@ -18286,19 +18286,19 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='1e23d39a'>
+    <function-type size-in-bits='32' id='c1b550c7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='7c58e9c1'>
+    <function-type size-in-bits='32' id='3c662e98'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='8ae90496'>
@@ -18309,12 +18309,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='9f92723c'>
+    <function-type size-in-bits='32' id='d35f73d9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='d6f3cc1e'>
@@ -18323,11 +18323,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='aa966e7a'>
+    <function-type size-in-bits='32' id='521af3a9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='4aa4e453'>
@@ -18337,11 +18337,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='60d09265'>
+    <function-type size-in-bits='32' id='b062a33a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='c2ab665d'>
@@ -18360,11 +18360,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='84f1ec00'>
+    <function-type size-in-bits='32' id='9d54666b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='eda358d5'>
@@ -18374,11 +18374,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='357a5107'>
+    <function-type size-in-bits='32' id='fe376334'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='2207a1d4'>
@@ -18387,12 +18387,12 @@ 
       <parameter type-id='70de5c43'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='dbddeaa4'>
+    <function-type size-in-bits='32' id='ec86bf87'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='b3920ec1'>
@@ -18403,12 +18403,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='dce8633b'>
+    <function-type size-in-bits='32' id='d44533d0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='635e0a25'>
@@ -18417,11 +18417,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='ffceb0d7'>
+    <function-type size-in-bits='32' id='161aeec2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='40138048'>
@@ -18431,11 +18431,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='118a7d6e'>
+    <function-type size-in-bits='32' id='f1f2c7f3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='6a7bb135'>
@@ -18450,11 +18450,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='234ebc1f'>
+    <function-type size-in-bits='32' id='c60ec5ea'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='63e40290'>
@@ -18464,19 +18464,19 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='a3568ec6'>
+    <function-type size-in-bits='32' id='b58a040b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='b6337d2d'>
+    <function-type size-in-bits='32' id='c71e554c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='48a0988a'>
@@ -18487,12 +18487,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='aef1d658'>
+    <function-type size-in-bits='32' id='4543f86d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='024b2e02'>
@@ -18501,11 +18501,11 @@ 
       <parameter type-id='1f3810cb'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='82e9406e'>
+    <function-type size-in-bits='32' id='72b5ef45'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='4d6cc7ff'>
@@ -18515,11 +18515,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='32dce039'>
+    <function-type size-in-bits='32' id='171c33c6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='03e3ce24'>
@@ -18665,11 +18665,11 @@ 
       <parameter type-id='8dfe2e06'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='cb36c1eb'>
+    <function-type size-in-bits='32' id='f587884e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='deb04b74'>
@@ -18679,11 +18679,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='a39024d2'>
+    <function-type size-in-bits='32' id='3d4aa27f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='a4bca08f'>
@@ -18783,12 +18783,12 @@ 
       <parameter type-id='96f3d089'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='03deda19'>
+    <function-type size-in-bits='32' id='1b85d290'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='252732ae'>
@@ -18799,12 +18799,12 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='44d47584'>
+    <function-type size-in-bits='32' id='1408a281'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='a23173c4'>
@@ -18870,11 +18870,11 @@ 
       <parameter type-id='8dfe2e06'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='0e213a62'>
+    <function-type size-in-bits='32' id='8791c9f1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='69b156fb'>
@@ -18884,11 +18884,11 @@ 
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='21e4693d'>
+    <function-type size-in-bits='32' id='570a4472'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='e123a5d8'>
@@ -18972,8 +18972,8 @@ 
         <var-decl name='__private' type-id='e4652d73' visibility='default' filepath='bionic/libc/include/bits/pthread_types.h' line='76' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='AChoreographer_frameCallback' type-id='f1eb0faf' filepath='frameworks/native/include/android/choreographer.h' line='45' column='1' id='f687fd19'/>
-    <typedef-decl name='AChoreographer_frameCallback64' type-id='f1eb0fb0' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' id='acccec6b'/>
+    <typedef-decl name='AChoreographer_frameCallback' type-id='4382769c' filepath='frameworks/native/include/android/choreographer.h' line='45' column='1' id='f687fd19'/>
+    <typedef-decl name='AChoreographer_frameCallback64' type-id='4382769d' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' id='acccec6b'/>
     <typedef-decl name='__uint64_t' type-id='f0981eec' filepath='bionic/libc/include/stdint.h' line='47' column='1' id='8910171f'/>
     <typedef-decl name='imaxdiv_t' type-id='e7f43f7b' filepath='bionic/libc/include/inttypes.h' line='255' column='1' id='5c0b4dc9'/>
     <typedef-decl name='intmax_t' type-id='9da381c4' filepath='bionic/libc/include/stdint.h' line='104' column='1' id='e104d842'/>
@@ -19098,8 +19098,8 @@ 
     <reference-type-def kind='rvalue' type-id='62e477cd' size-in-bits='32' id='82aceccd'/>
     <pointer-type-def type-id='62e477cd' size-in-bits='32' id='e8fa2672'/>
     <pointer-type-def type-id='e7f43f7b' size-in-bits='32' id='8567d8b0'/>
-    <pointer-type-def type-id='7b5ced03' size-in-bits='32' id='f1eb0faf'/>
-    <pointer-type-def type-id='7b5ced04' size-in-bits='32' id='f1eb0fb0'/>
+    <pointer-type-def type-id='7b5ced03' size-in-bits='32' id='4382769d'/>
+    <pointer-type-def type-id='7b5ced04' size-in-bits='32' id='4382769c'/>
     <pointer-type-def type-id='7b0c0278' size-in-bits='32' id='136b85b5'/>
     <pointer-type-def type-id='aa12d1be' size-in-bits='32' id='822cd80f'/>
     <pointer-type-def type-id='5671eca3' size-in-bits='32' id='ddc6bda3'/>
@@ -20277,12 +20277,12 @@ 
     </function-decl>
     <typedef-decl name='AChoreographer' type-id='d1af9805' filepath='frameworks/native/include/android/choreographer.h' line='35' column='1' id='7b0c0278'/>
     <function-type size-in-bits='32' id='7b5ced03'>
-      <parameter type-id='95e97e5f'/>
+      <parameter type-id='9da381c4'/>
       <parameter type-id='eaa32e2f'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='7b5ced04'>
-      <parameter type-id='9da381c4'/>
+      <parameter type-id='95e97e5f'/>
       <parameter type-id='eaa32e2f'/>
       <return type-id='48b5725f'/>
     </function-type>
@@ -20648,7 +20648,7 @@ 
   <abi-instr address-size='32' path='frameworks/base/native/android/input.cpp' language='LANG_C_plus_plus_14'>
     <class-decl name='AInputQueue' size-in-bits='8' is-struct='yes' visibility='default' filepath='frameworks/base/core/jni/include/android_runtime/android_view_InputQueue.h' line='30' column='1' id='81665327'/>
     <typedef-decl name='AInputQueue' type-id='81665327' filepath='frameworks/native/include/android/input.h' line='1298' column='1' id='18581c08'/>
-    <typedef-decl name='ALooper_callbackFunc' type-id='d08b57b3' filepath='frameworks/native/include/android/looper.h' line='168' column='1' id='0f66625a'/>
+    <typedef-decl name='ALooper_callbackFunc' type-id='29a02c10' filepath='frameworks/native/include/android/looper.h' line='168' column='1' id='0f66625a'/>
     <pointer-type-def type-id='18581c08' size-in-bits='32' id='dcca009f'/>
     <pointer-type-def type-id='2a632eb8' size-in-bits='32' id='3fc367ce'/>
     <qualified-type-def type-id='2a632eb8' const='yes' id='2adf3de5'/>
@@ -20657,7 +20657,7 @@ 
     <qualified-type-def type-id='95e97e60' const='yes' id='2448a866'/>
     <reference-type-def kind='lvalue' type-id='2448a866' size-in-bits='32' id='6160e17a'/>
     <pointer-type-def type-id='2448a866' size-in-bits='32' id='6d60f45e'/>
-    <pointer-type-def type-id='073bc15f' size-in-bits='32' id='d08b57b3'/>
+    <pointer-type-def type-id='073bc15f' size-in-bits='32' id='29a02c10'/>
     <pointer-type-def type-id='5c3d41cf' size-in-bits='32' id='b7c0a646'/>
     <pointer-type-def type-id='b7c0a646' size-in-bits='32' id='b045fc04'/>
     <pointer-type-def type-id='b02ad8ee' size-in-bits='32' id='863667dd'/>
@@ -21469,34 +21469,34 @@ 
         <var-decl name='oem' type-id='1595aa6b' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='361' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='setSwapInterval' type-id='4895e6ee' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='368' column='1'/>
+        <var-decl name='setSwapInterval' type-id='17c3f917' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='368' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='dequeueBuffer_DEPRECATED' type-id='e1460e41' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='388' column='1'/>
+        <var-decl name='dequeueBuffer_DEPRECATED' type-id='aa16aae2' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='388' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='lockBuffer_DEPRECATED' type-id='accce85f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='402' column='1'/>
+        <var-decl name='lockBuffer_DEPRECATED' type-id='edd58092' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='402' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='queueBuffer_DEPRECATED' type-id='accce85f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='424' column='1'/>
+        <var-decl name='queueBuffer_DEPRECATED' type-id='edd58092' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='424' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='query' type-id='e0289d60' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='432' column='1'/>
+        <var-decl name='query' type-id='87c7c9f5' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='perform' type-id='6e6b4552' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='449' column='1'/>
+        <var-decl name='perform' type-id='2d8e6f85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='cancelBuffer_DEPRECATED' type-id='accce85f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='469' column='1'/>
+        <var-decl name='cancelBuffer_DEPRECATED' type-id='edd58092' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='469' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='dequeueBuffer' type-id='d94a7138' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='491' column='1'/>
+        <var-decl name='dequeueBuffer' type-id='fe1a2479' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='491' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='queueBuffer' type-id='34e25e76' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='513' column='1'/>
+        <var-decl name='queueBuffer' type-id='abc0bac7' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='cancelBuffer' type-id='34e25e76' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='541' column='1'/>
+        <var-decl name='cancelBuffer' type-id='abc0bac7' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='541' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='ANativeWindow' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='327' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -21589,10 +21589,10 @@ 
         <var-decl name='reserved' type-id='209ef23f' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='incRef' type-id='9ef5cd4c' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='54' column='1'/>
+        <var-decl name='incRef' type-id='f0a775a9' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='decRef' type-id='9ef5cd4c' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='55' column='1'/>
+        <var-decl name='decRef' type-id='f0a775a9' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='55' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='native_handle' size-in-bits='96' is-struct='yes' visibility='default' filepath='system/core/libcutils/include/cutils/native_handle.h' line='34' column='1' id='3181ea79'>
@@ -21649,14 +21649,14 @@ 
     <pointer-type-def type-id='5faa5468' size-in-bits='32' id='db22a3e6'/>
     <qualified-type-def type-id='40cec2e5' const='yes' id='777a3c35'/>
     <pointer-type-def type-id='777a3c35' size-in-bits='32' id='346ca4cd'/>
-    <pointer-type-def type-id='18a8f8ab' size-in-bits='32' id='accce85f'/>
-    <pointer-type-def type-id='7c01b235' size-in-bits='32' id='e1460e41'/>
-    <pointer-type-def type-id='a01c551e' size-in-bits='32' id='d94a7138'/>
-    <pointer-type-def type-id='f67629f4' size-in-bits='32' id='34e25e76'/>
-    <pointer-type-def type-id='81905a9c' size-in-bits='32' id='4895e6ee'/>
-    <pointer-type-def type-id='e1037128' size-in-bits='32' id='6e6b4552'/>
-    <pointer-type-def type-id='9e53d056' size-in-bits='32' id='e0289d60'/>
-    <pointer-type-def type-id='d64c5e3a' size-in-bits='32' id='9ef5cd4c'/>
+    <pointer-type-def type-id='18a8f8ab' size-in-bits='32' id='edd58092'/>
+    <pointer-type-def type-id='7c01b235' size-in-bits='32' id='aa16aae2'/>
+    <pointer-type-def type-id='a01c551e' size-in-bits='32' id='fe1a2479'/>
+    <pointer-type-def type-id='f67629f4' size-in-bits='32' id='abc0bac7'/>
+    <pointer-type-def type-id='81905a9c' size-in-bits='32' id='17c3f917'/>
+    <pointer-type-def type-id='561290fc' size-in-bits='32' id='2d8e6f85'/>
+    <pointer-type-def type-id='9e53d056' size-in-bits='32' id='87c7c9f5'/>
+    <pointer-type-def type-id='d64c5e3a' size-in-bits='32' id='f0a775a9'/>
     <pointer-type-def type-id='aa12d1c3' size-in-bits='32' id='822cd814'/>
     <reference-type-def kind='lvalue' type-id='7dd446db' size-in-bits='32' id='f43d11bf'/>
     <pointer-type-def type-id='7dd446db' size-in-bits='32' id='f83d180b'/>
@@ -21881,7 +21881,7 @@ 
       <parameter type-id='95e97e5e'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='32' id='e1037128'>
+    <function-type size-in-bits='32' id='561290fc'>
       <parameter type-id='96ae8d47'/>
       <parameter type-id='95e97e5e'/>
       <parameter is-variadic='yes'/>
@@ -23062,7 +23062,7 @@ 
       </member-function>
     </class-decl>
     <typedef-decl name='AStorageManager' type-id='56516754' filepath='frameworks/native/include/android/storage_manager.h' line='40' column='1' id='6fc023b3'/>
-    <typedef-decl name='AStorageManager_obbCallbackFunc' type-id='238ccd13' filepath='frameworks/native/include/android/storage_manager.h' line='123' column='1' id='9299e4b4'/>
+    <typedef-decl name='AStorageManager_obbCallbackFunc' type-id='7cd01d6e' filepath='frameworks/native/include/android/storage_manager.h' line='123' column='1' id='9299e4b4'/>
     <reference-type-def kind='lvalue' type-id='56516754' size-in-bits='32' id='e37f89be'/>
     <pointer-type-def type-id='56516754' size-in-bits='32' id='df7f8372'/>
     <pointer-type-def type-id='6fc023b3' size-in-bits='32' id='df7f8373'/>
@@ -23148,12 +23148,12 @@ 
     <pointer-type-def type-id='96cd7851' size-in-bits='32' id='e074a9a1'/>
     <qualified-type-def type-id='3707128c' const='yes' id='31c8e515'/>
     <pointer-type-def type-id='31c8e515' size-in-bits='32' id='9e40e22d'/>
-    <pointer-type-def type-id='735b63b3' size-in-bits='32' id='cb44d457'/>
-    <pointer-type-def type-id='32a29f07' size-in-bits='32' id='2841c17b'/>
+    <pointer-type-def type-id='735b63b3' size-in-bits='32' id='a38b5496'/>
+    <pointer-type-def type-id='32a29f07' size-in-bits='32' id='57a87078'/>
     <reference-type-def kind='lvalue' type-id='0efd2e9e' size-in-bits='32' id='7cfadc20'/>
     <pointer-type-def type-id='0efd2e9e' size-in-bits='32' id='88faef04'/>
     <pointer-type-def type-id='a5d64365' size-in-bits='32' id='dcdcfc25'/>
-    <pointer-type-def type-id='f521429f' size-in-bits='32' id='238ccd13'/>
+    <pointer-type-def type-id='f521429f' size-in-bits='32' id='7cd01d6e'/>
     <qualified-type-def type-id='3ff5601b' volatile='yes' id='fda05812'/>
     <qualified-type-def type-id='0efd2e9e' volatile='yes' id='3707128c'/>
     <pointer-type-def type-id='3707128c' size-in-bits='32' id='46225b52'/>
@@ -23201,10 +23201,10 @@ 
       <class-decl name='Vector&lt;ObbCallback *&gt;' size-in-bits='160' visibility='default' filepath='system/core/libutils/include/utils/Vector.h' line='57' column='1' id='3847ab67'>
         <base-class access='private' layout-offset-in-bits='0' type-id='86634f02'/>
         <member-type access='private'>
-          <typedef-decl name='compar_r_t' type-id='2841c17b' filepath='system/core/libutils/include/utils/Vector.h' line='186' column='1' id='7567dbda'/>
+          <typedef-decl name='compar_r_t' type-id='57a87078' filepath='system/core/libutils/include/utils/Vector.h' line='186' column='1' id='7567dbda'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='compar_t' type-id='cb44d457' filepath='system/core/libutils/include/utils/Vector.h' line='185' column='1' id='69af6af7'/>
+          <typedef-decl name='compar_t' type-id='a38b5496' filepath='system/core/libutils/include/utils/Vector.h' line='185' column='1' id='69af6af7'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_iterator' type-id='b5e7b678' filepath='system/core/libutils/include/utils/Vector.h' line='200' column='1' id='9d183c99'/>
@@ -24518,7 +24518,7 @@ 
     </class-decl>
     <typedef-decl name='ARect' type-id='c9ee9172' filepath='frameworks/native/libs/arect/include/android/rect.h' line='57' column='1' id='d6dabff9'/>
     <typedef-decl name='ASurfaceTransactionStats' type-id='57f0cd10' filepath='frameworks/native/include/android/surface_control.h' line='119' column='1' id='d8cb99c5'/>
-    <typedef-decl name='ASurfaceTransaction_OnComplete' type-id='c4e02a75' filepath='frameworks/native/include/android/surface_control.h' line='137' column='1' id='f2816675'/>
+    <typedef-decl name='ASurfaceTransaction_OnComplete' type-id='336b85fe' filepath='frameworks/native/include/android/surface_control.h' line='137' column='1' id='f2816675'/>
     <typedef-decl name='__kernel_uid32_t' type-id='f0981eed' filepath='bionic/libc/kernel/uapi/asm-generic/posix_types.h' line='49' column='1' id='70734f24'/>
     <typedef-decl name='__uid_t' type-id='70734f24' filepath='bionic/libc/include/sys/types.h' line='44' column='1' id='cc5fcceb'/>
     <typedef-decl name='binder_size_t' type-id='f0981eec' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='39' column='1' id='9af0438f'/>
@@ -26260,8 +26260,8 @@ 
     <qualified-type-def type-id='807869d4' const='yes' id='de9ce8e8'/>
     <reference-type-def kind='lvalue' type-id='de9ce8e8' size-in-bits='32' id='3f027c4a'/>
     <reference-type-def kind='lvalue' type-id='807869d4' size-in-bits='32' id='328eccaf'/>
-    <pointer-type-def type-id='8cf25b48' size-in-bits='32' id='eb6f9422'/>
-    <pointer-type-def type-id='ba286cd1' size-in-bits='32' id='c4e02a75'/>
+    <pointer-type-def type-id='8cf25b48' size-in-bits='32' id='f11d61bd'/>
+    <pointer-type-def type-id='ba286cd1' size-in-bits='32' id='336b85fe'/>
     <reference-type-def kind='lvalue' type-id='eaa32e2f' size-in-bits='32' id='67e1782b'/>
     <reference-type-def kind='rvalue' type-id='eaa32e2f' size-in-bits='32' id='94effc77'/>
     <qualified-type-def type-id='673b29cf' volatile='yes' id='84653d39'/>
@@ -26671,7 +26671,7 @@ 
       </class-decl>
       <class-decl name='Parcel' size-in-bits='480' visibility='default' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='55' column='1' id='cb49a619'>
         <member-type access='private'>
-          <typedef-decl name='release_func' type-id='eb6f9422' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='482' column='1' id='d7b9bcec'/>
+          <typedef-decl name='release_func' type-id='f11d61bd' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='482' column='1' id='d7b9bcec'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='FlattenableHelperInterface' visibility='default' is-declaration-only='yes' id='783cc67a'/>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 3905060e..5702c50d 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -1081,154 +1081,153 @@ 
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-206'/>
     <reference-type-def kind='lvalue' type-id='type-id-15' size-in-bits='64' id='type-id-207'/>
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-208'/>
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-209'/>
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
+    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-211'/>
     <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-212'/>
-    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-213'/>
-    <reference-type-def kind='lvalue' type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
-    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-215'/>
-    <reference-type-def kind='lvalue' type-id='type-id-212' size-in-bits='64' id='type-id-216'/>
-    <reference-type-def kind='rvalue' type-id='type-id-212' size-in-bits='64' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-220'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
-    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-222'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
-    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
-    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-226'/>
-    <reference-type-def kind='lvalue' type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
-    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-228' size-in-bits='64' id='type-id-229'/>
-    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-230'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-215'/>
+    <reference-type-def kind='lvalue' type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
+    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-217'/>
+    <reference-type-def kind='lvalue' type-id='type-id-217' size-in-bits='64' id='type-id-218'/>
+    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-219'/>
+    <reference-type-def kind='lvalue' type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
+    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-221'/>
+    <reference-type-def kind='lvalue' type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
+    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
+    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
+    <qualified-type-def type-id='type-id-126' const='yes' id='type-id-227'/>
+    <reference-type-def kind='lvalue' type-id='type-id-227' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-229'/>
+    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-230'/>
     <reference-type-def kind='lvalue' type-id='type-id-230' size-in-bits='64' id='type-id-231'/>
-    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-232'/>
-    <reference-type-def kind='lvalue' type-id='type-id-232' size-in-bits='64' id='type-id-233'/>
-    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-234'/>
-    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-235'/>
-    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-236'/>
-    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-237'/>
-    <qualified-type-def type-id='type-id-126' const='yes' id='type-id-238'/>
-    <reference-type-def kind='lvalue' type-id='type-id-238' size-in-bits='64' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-240'/>
-    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-241'/>
-    <reference-type-def kind='lvalue' type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-243'/>
-    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-244'/>
-    <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-246'/>
-    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-247'/>
-    <reference-type-def kind='lvalue' type-id='type-id-247' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-249'/>
-    <qualified-type-def type-id='type-id-136' const='yes' id='type-id-250'/>
-    <reference-type-def kind='lvalue' type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-252'/>
-    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-253'/>
-    <reference-type-def kind='lvalue' type-id='type-id-253' size-in-bits='64' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-255'/>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-256'/>
-    <reference-type-def kind='lvalue' type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-259'/>
-    <reference-type-def kind='lvalue' type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-261'/>
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-262'/>
-    <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-264'/>
-    <qualified-type-def type-id='type-id-146' const='yes' id='type-id-265'/>
-    <reference-type-def kind='lvalue' type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-267'/>
-    <qualified-type-def type-id='type-id-148' const='yes' id='type-id-268'/>
-    <reference-type-def kind='lvalue' type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-270'/>
-    <qualified-type-def type-id='type-id-150' const='yes' id='type-id-271'/>
-    <reference-type-def kind='lvalue' type-id='type-id-271' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-273'/>
-    <qualified-type-def type-id='type-id-152' const='yes' id='type-id-274'/>
-    <reference-type-def kind='lvalue' type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-276'/>
-    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-279'/>
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-280'/>
-    <reference-type-def kind='lvalue' type-id='type-id-280' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-283'/>
-    <reference-type-def kind='lvalue' type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-285'/>
-    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-286'/>
-    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-287'/>
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-288'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-289'/>
-    <reference-type-def kind='lvalue' type-id='type-id-289' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-291'/>
-    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-292'/>
-    <reference-type-def kind='lvalue' type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-294'/>
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-295'/>
-    <reference-type-def kind='lvalue' type-id='type-id-295' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-298'/>
-    <reference-type-def kind='lvalue' type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-300'/>
-    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-301'/>
-    <reference-type-def kind='lvalue' type-id='type-id-301' size-in-bits='64' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-303'/>
-    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-304'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-306'/>
-    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-307'/>
-    <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-309'/>
-    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-310'/>
-    <reference-type-def kind='lvalue' type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-312'/>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-84'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-232'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-233'/>
+    <reference-type-def kind='lvalue' type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-235'/>
+    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-236'/>
+    <reference-type-def kind='lvalue' type-id='type-id-236' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-238'/>
+    <qualified-type-def type-id='type-id-136' const='yes' id='type-id-239'/>
+    <reference-type-def kind='lvalue' type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-241'/>
+    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-242'/>
+    <reference-type-def kind='lvalue' type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-244'/>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-245'/>
+    <reference-type-def kind='lvalue' type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-247'/>
+    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-248'/>
+    <reference-type-def kind='lvalue' type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-251'/>
+    <reference-type-def kind='lvalue' type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-253'/>
+    <qualified-type-def type-id='type-id-146' const='yes' id='type-id-254'/>
+    <reference-type-def kind='lvalue' type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-256'/>
+    <qualified-type-def type-id='type-id-148' const='yes' id='type-id-257'/>
+    <reference-type-def kind='lvalue' type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-259'/>
+    <qualified-type-def type-id='type-id-150' const='yes' id='type-id-260'/>
+    <reference-type-def kind='lvalue' type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-262'/>
+    <qualified-type-def type-id='type-id-152' const='yes' id='type-id-263'/>
+    <reference-type-def kind='lvalue' type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-265'/>
+    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-266'/>
+    <reference-type-def kind='lvalue' type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-268'/>
+    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-269'/>
+    <reference-type-def kind='lvalue' type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-272' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-274'/>
+    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-277'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-278'/>
+    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-280'/>
+    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-281'/>
+    <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-284'/>
+    <reference-type-def kind='lvalue' type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-286'/>
+    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-287'/>
+    <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-289'/>
+    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-290'/>
+    <reference-type-def kind='lvalue' type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-292'/>
+    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-293'/>
+    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-295'/>
+    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-296'/>
+    <reference-type-def kind='lvalue' type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-299'/>
+    <reference-type-def kind='lvalue' type-id='type-id-299' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-301'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-84'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-303'/>
+    <reference-type-def kind='lvalue' type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-306'/>
+    <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-308'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-313'/>
+    <qualified-type-def type-id='type-id-192' const='yes' id='type-id-314'/>
     <reference-type-def kind='lvalue' type-id='type-id-314' size-in-bits='64' id='type-id-315'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-316'/>
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-317'/>
-    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-319'/>
-    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-321'/>
-    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-322'/>
-    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-324'/>
-    <qualified-type-def type-id='type-id-192' const='yes' id='type-id-325'/>
-    <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-327'/>
-    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-328'/>
-    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
-    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-331'/>
-    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-332'/>
-    <reference-type-def kind='lvalue' type-id='type-id-332' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-59'/>
-    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-334'/>
-    <reference-type-def kind='lvalue' type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
-    <reference-type-def kind='lvalue' type-id='type-id-59' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-337'/>
-    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-338'/>
-    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-339'/>
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-340'/>
-    <reference-type-def kind='lvalue' type-id='type-id-340' size-in-bits='64' id='type-id-341'/>
-    <qualified-type-def type-id='type-id-78' const='yes' id='type-id-342'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-343'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-344'/>
-    <qualified-type-def type-id='type-id-79' const='yes' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-348'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-349'/>
-    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-351'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
-    <qualified-type-def type-id='type-id-353' const='yes' id='type-id-354'/>
-    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
-    <qualified-type-def type-id='type-id-356' const='yes' id='type-id-357'/>
-    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-358'/>
-    <qualified-type-def type-id='type-id-359' const='yes' id='type-id-360'/>
-    <reference-type-def kind='lvalue' type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
+    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-320'/>
+    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-321'/>
+    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-59'/>
+    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-323'/>
+    <reference-type-def kind='lvalue' type-id='type-id-323' size-in-bits='64' id='type-id-324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-59' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-326'/>
+    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-328'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-329'/>
+    <reference-type-def kind='lvalue' type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
+    <qualified-type-def type-id='type-id-78' const='yes' id='type-id-331'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-332'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-333'/>
+    <qualified-type-def type-id='type-id-79' const='yes' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
+    <qualified-type-def type-id='type-id-336' const='yes' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
+    <qualified-type-def type-id='type-id-339' const='yes' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-341'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-343'/>
+    <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
+    <qualified-type-def type-id='type-id-345' const='yes' id='type-id-346'/>
+    <reference-type-def kind='lvalue' type-id='type-id-346' size-in-bits='64' id='type-id-347'/>
+    <qualified-type-def type-id='type-id-348' const='yes' id='type-id-349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-349' size-in-bits='64' id='type-id-350'/>
+    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-352' size-in-bits='64' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-354' const='yes' id='type-id-355'/>
+    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-357'/>
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-359'/>
+    <reference-type-def kind='lvalue' type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-361'/>
     <qualified-type-def type-id='type-id-362' const='yes' id='type-id-363'/>
     <reference-type-def kind='lvalue' type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
     <qualified-type-def type-id='type-id-365' const='yes' id='type-id-366'/>
@@ -1241,86 +1240,86 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-374' size-in-bits='64' id='type-id-375'/>
     <qualified-type-def type-id='type-id-376' const='yes' id='type-id-377'/>
     <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-379'/>
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-381'/>
-    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-382'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-383'/>
-    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-385'/>
-    <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
-    <qualified-type-def type-id='type-id-387' const='yes' id='type-id-388'/>
-    <reference-type-def kind='lvalue' type-id='type-id-388' size-in-bits='64' id='type-id-389'/>
+    <qualified-type-def type-id='type-id-379' const='yes' id='type-id-380'/>
+    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-382'/>
+    <qualified-type-def type-id='type-id-383' const='yes' id='type-id-384'/>
+    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-385'/>
+    <qualified-type-def type-id='type-id-386' const='yes' id='type-id-387'/>
+    <reference-type-def kind='lvalue' type-id='type-id-387' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-389'/>
     <qualified-type-def type-id='type-id-390' const='yes' id='type-id-391'/>
     <reference-type-def kind='lvalue' type-id='type-id-391' size-in-bits='64' id='type-id-392'/>
     <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-393'/>
     <qualified-type-def type-id='type-id-394' const='yes' id='type-id-395'/>
-    <reference-type-def kind='lvalue' type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
     <qualified-type-def type-id='type-id-397' const='yes' id='type-id-398'/>
     <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-400'/>
-    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-404'/>
-    <qualified-type-def type-id='type-id-405' const='yes' id='type-id-406'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
-    <qualified-type-def type-id='type-id-408' const='yes' id='type-id-409'/>
-    <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-410'/>
-    <qualified-type-def type-id='type-id-411' const='yes' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-413'/>
-    <qualified-type-def type-id='type-id-414' const='yes' id='type-id-415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-415' size-in-bits='64' id='type-id-416'/>
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-417'/>
-    <qualified-type-def type-id='type-id-418' const='yes' id='type-id-419'/>
-    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-421'/>
-    <reference-type-def kind='lvalue' type-id='type-id-421' size-in-bits='64' id='type-id-422'/>
-    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-423'/>
-    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-425'/>
-    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-426'/>
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-428'/>
-    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
-    <qualified-type-def type-id='type-id-430' const='yes' id='type-id-431'/>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-432'/>
-    <qualified-type-def type-id='type-id-433' const='yes' id='type-id-434'/>
-    <reference-type-def kind='lvalue' type-id='type-id-434' size-in-bits='64' id='type-id-435'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-436'/>
-    <qualified-type-def type-id='type-id-437' const='yes' id='type-id-438'/>
-    <reference-type-def kind='lvalue' type-id='type-id-438' size-in-bits='64' id='type-id-439'/>
-    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-441'/>
-    <reference-type-def kind='lvalue' type-id='type-id-441' size-in-bits='64' id='type-id-442'/>
+    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-401'/>
+    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-402'/>
+    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-404' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-406'/>
+    <qualified-type-def type-id='type-id-407' const='yes' id='type-id-408'/>
+    <qualified-type-def type-id='type-id-409' const='yes' id='type-id-410'/>
+    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-412'/>
+    <qualified-type-def type-id='type-id-413' const='yes' id='type-id-414'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-415'/>
+    <qualified-type-def type-id='type-id-416' const='yes' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-420'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-421'/>
+    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-423'/>
+    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-424'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-425'/>
+    <qualified-type-def type-id='type-id-426' const='yes' id='type-id-427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-428'/>
+    <qualified-type-def type-id='type-id-429' const='yes' id='type-id-430'/>
+    <reference-type-def kind='lvalue' type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
+    <qualified-type-def type-id='type-id-432' const='yes' id='type-id-433'/>
+    <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-434'/>
+    <qualified-type-def type-id='type-id-435' const='yes' id='type-id-436'/>
+    <reference-type-def kind='lvalue' type-id='type-id-436' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-439' const='yes' id='type-id-440'/>
+    <reference-type-def kind='lvalue' type-id='type-id-440' size-in-bits='64' id='type-id-441'/>
+    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-442'/>
     <qualified-type-def type-id='type-id-443' const='yes' id='type-id-444'/>
     <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-445'/>
     <qualified-type-def type-id='type-id-446' const='yes' id='type-id-447'/>
     <reference-type-def kind='lvalue' type-id='type-id-447' size-in-bits='64' id='type-id-448'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-449'/>
-    <qualified-type-def type-id='type-id-450' const='yes' id='type-id-451'/>
-    <reference-type-def kind='lvalue' type-id='type-id-451' size-in-bits='64' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-453'/>
-    <qualified-type-def type-id='type-id-454' const='yes' id='type-id-455'/>
-    <reference-type-def kind='lvalue' type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
-    <qualified-type-def type-id='type-id-457' const='yes' id='type-id-458'/>
-    <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-450'/>
+    <reference-type-def kind='lvalue' type-id='type-id-450' size-in-bits='64' id='type-id-451'/>
+    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-453'/>
+    <reference-type-def kind='lvalue' type-id='type-id-453' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-455'/>
+    <qualified-type-def type-id='type-id-456' const='yes' id='type-id-457'/>
+    <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-459'/>
     <qualified-type-def type-id='type-id-460' const='yes' id='type-id-461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-461' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-462'/>
     <qualified-type-def type-id='type-id-463' const='yes' id='type-id-464'/>
     <reference-type-def kind='lvalue' type-id='type-id-464' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-464' size-in-bits='64' id='type-id-466'/>
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-468'/>
-    <reference-type-def kind='lvalue' type-id='type-id-468' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-470'/>
-    <qualified-type-def type-id='type-id-471' const='yes' id='type-id-472'/>
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-473'/>
-    <qualified-type-def type-id='type-id-474' const='yes' id='type-id-475'/>
-    <reference-type-def kind='lvalue' type-id='type-id-475' size-in-bits='64' id='type-id-476'/>
+    <qualified-type-def type-id='type-id-466' const='yes' id='type-id-467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-467' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-469'/>
+    <qualified-type-def type-id='type-id-470' const='yes' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-472'/>
+    <qualified-type-def type-id='type-id-473' const='yes' id='type-id-474'/>
+    <reference-type-def kind='lvalue' type-id='type-id-474' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-476'/>
     <qualified-type-def type-id='type-id-477' const='yes' id='type-id-478'/>
     <reference-type-def kind='lvalue' type-id='type-id-478' size-in-bits='64' id='type-id-479'/>
     <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-480'/>
     <qualified-type-def type-id='type-id-481' const='yes' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-483'/>
-    <qualified-type-def type-id='type-id-484' const='yes' id='type-id-485'/>
-    <reference-type-def kind='lvalue' type-id='type-id-485' size-in-bits='64' id='type-id-486'/>
-    <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-487'/>
-    <qualified-type-def type-id='type-id-488' const='yes' id='type-id-489'/>
-    <reference-type-def kind='lvalue' type-id='type-id-489' size-in-bits='64' id='type-id-490'/>
-    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-482' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-484'/>
+    <qualified-type-def type-id='type-id-485' const='yes' id='type-id-486'/>
+    <reference-type-def kind='lvalue' type-id='type-id-486' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-488'/>
+    <qualified-type-def type-id='type-id-489' const='yes' id='type-id-490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-490' size-in-bits='64' id='type-id-491'/>
     <qualified-type-def type-id='type-id-492' const='yes' id='type-id-493'/>
     <reference-type-def kind='lvalue' type-id='type-id-493' size-in-bits='64' id='type-id-494'/>
     <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-495'/>
@@ -1329,9 +1328,9 @@ 
     <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-499'/>
     <qualified-type-def type-id='type-id-500' const='yes' id='type-id-501'/>
     <reference-type-def kind='lvalue' type-id='type-id-501' size-in-bits='64' id='type-id-502'/>
-    <qualified-type-def type-id='type-id-503' const='yes' id='type-id-504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-504' size-in-bits='64' id='type-id-505'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-503'/>
+    <qualified-type-def type-id='type-id-504' const='yes' id='type-id-505'/>
+    <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-506'/>
     <qualified-type-def type-id='type-id-507' const='yes' id='type-id-508'/>
     <reference-type-def kind='lvalue' type-id='type-id-508' size-in-bits='64' id='type-id-509'/>
     <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-510'/>
@@ -1339,439 +1338,439 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-512' size-in-bits='64' id='type-id-513'/>
     <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-514'/>
     <qualified-type-def type-id='type-id-515' const='yes' id='type-id-516'/>
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-517'/>
+    <reference-type-def kind='lvalue' type-id='type-id-516' size-in-bits='64' id='type-id-517'/>
     <qualified-type-def type-id='type-id-518' const='yes' id='type-id-519'/>
     <reference-type-def kind='lvalue' type-id='type-id-519' size-in-bits='64' id='type-id-520'/>
-    <pointer-type-def type-id='type-id-519' size-in-bits='64' id='type-id-521'/>
-    <qualified-type-def type-id='type-id-522' const='yes' id='type-id-523'/>
-    <reference-type-def kind='lvalue' type-id='type-id-523' size-in-bits='64' id='type-id-524'/>
-    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-525'/>
-    <qualified-type-def type-id='type-id-526' const='yes' id='type-id-527'/>
-    <reference-type-def kind='lvalue' type-id='type-id-527' size-in-bits='64' id='type-id-528'/>
-    <qualified-type-def type-id='type-id-529' const='yes' id='type-id-530'/>
-    <reference-type-def kind='lvalue' type-id='type-id-530' size-in-bits='64' id='type-id-531'/>
-    <qualified-type-def type-id='type-id-532' const='yes' id='type-id-533'/>
-    <pointer-type-def type-id='type-id-533' size-in-bits='64' id='type-id-534'/>
-    <qualified-type-def type-id='type-id-535' const='yes' id='type-id-536'/>
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-537'/>
+    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-523'/>
+    <qualified-type-def type-id='type-id-524' const='yes' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-526'/>
+    <qualified-type-def type-id='type-id-527' const='yes' id='type-id-528'/>
+    <reference-type-def kind='lvalue' type-id='type-id-528' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-528' size-in-bits='64' id='type-id-530'/>
+    <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
+    <reference-type-def kind='lvalue' type-id='type-id-532' size-in-bits='64' id='type-id-533'/>
+    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-535'/>
+    <reference-type-def kind='lvalue' type-id='type-id-535' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-537'/>
     <qualified-type-def type-id='type-id-538' const='yes' id='type-id-539'/>
     <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-540'/>
     <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-541'/>
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-543'/>
     <reference-type-def kind='lvalue' type-id='type-id-543' size-in-bits='64' id='type-id-544'/>
-    <qualified-type-def type-id='type-id-545' const='yes' id='type-id-546'/>
-    <reference-type-def kind='lvalue' type-id='type-id-546' size-in-bits='64' id='type-id-547'/>
-    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-545'/>
+    <qualified-type-def type-id='type-id-546' const='yes' id='type-id-547'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-548'/>
     <qualified-type-def type-id='type-id-549' const='yes' id='type-id-550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-550' size-in-bits='64' id='type-id-551'/>
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-552'/>
-    <qualified-type-def type-id='type-id-553' const='yes' id='type-id-554'/>
-    <reference-type-def kind='lvalue' type-id='type-id-554' size-in-bits='64' id='type-id-555'/>
-    <pointer-type-def type-id='type-id-554' size-in-bits='64' id='type-id-556'/>
-    <qualified-type-def type-id='type-id-557' const='yes' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-558' size-in-bits='64' id='type-id-559'/>
-    <qualified-type-def type-id='type-id-560' const='yes' id='type-id-561'/>
-    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-562'/>
-    <qualified-type-def type-id='type-id-563' const='yes' id='type-id-564'/>
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-565'/>
-    <qualified-type-def type-id='type-id-566' const='yes' id='type-id-567'/>
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-568'/>
-    <qualified-type-def type-id='type-id-569' const='yes' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-571'/>
-    <qualified-type-def type-id='type-id-572' const='yes' id='type-id-573'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-574'/>
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-576'/>
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-577'/>
-    <qualified-type-def type-id='type-id-578' const='yes' id='type-id-579'/>
-    <pointer-type-def type-id='type-id-579' size-in-bits='64' id='type-id-580'/>
-    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-582'/>
-    <pointer-type-def type-id='type-id-582' size-in-bits='64' id='type-id-583'/>
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-585'/>
-    <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-586'/>
-    <qualified-type-def type-id='type-id-587' const='yes' id='type-id-588'/>
-    <pointer-type-def type-id='type-id-588' size-in-bits='64' id='type-id-589'/>
-    <qualified-type-def type-id='type-id-590' const='yes' id='type-id-591'/>
-    <pointer-type-def type-id='type-id-591' size-in-bits='64' id='type-id-592'/>
-    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-594'/>
-    <pointer-type-def type-id='type-id-594' size-in-bits='64' id='type-id-595'/>
-    <qualified-type-def type-id='type-id-596' const='yes' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-597' size-in-bits='64' id='type-id-598'/>
-    <qualified-type-def type-id='type-id-599' const='yes' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-601'/>
-    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-604'/>
-    <qualified-type-def type-id='type-id-605' const='yes' id='type-id-606'/>
-    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-607'/>
-    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-609'/>
-    <pointer-type-def type-id='type-id-609' size-in-bits='64' id='type-id-610'/>
-    <qualified-type-def type-id='type-id-611' const='yes' id='type-id-612'/>
-    <pointer-type-def type-id='type-id-612' size-in-bits='64' id='type-id-613'/>
-    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-615'/>
-    <pointer-type-def type-id='type-id-615' size-in-bits='64' id='type-id-616'/>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-551'/>
+    <qualified-type-def type-id='type-id-552' const='yes' id='type-id-553'/>
+    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-554'/>
+    <qualified-type-def type-id='type-id-555' const='yes' id='type-id-556'/>
+    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-557'/>
+    <qualified-type-def type-id='type-id-558' const='yes' id='type-id-559'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-560'/>
+    <qualified-type-def type-id='type-id-561' const='yes' id='type-id-562'/>
+    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-563'/>
+    <qualified-type-def type-id='type-id-564' const='yes' id='type-id-565'/>
+    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-566'/>
+    <qualified-type-def type-id='type-id-567' const='yes' id='type-id-568'/>
+    <pointer-type-def type-id='type-id-568' size-in-bits='64' id='type-id-569'/>
+    <qualified-type-def type-id='type-id-570' const='yes' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-572'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-574'/>
+    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-575'/>
+    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-577'/>
+    <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-578'/>
+    <qualified-type-def type-id='type-id-579' const='yes' id='type-id-580'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-581'/>
+    <qualified-type-def type-id='type-id-582' const='yes' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-584'/>
+    <qualified-type-def type-id='type-id-585' const='yes' id='type-id-586'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-587'/>
+    <qualified-type-def type-id='type-id-588' const='yes' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-589' size-in-bits='64' id='type-id-590'/>
+    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-592'/>
+    <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-593'/>
+    <qualified-type-def type-id='type-id-594' const='yes' id='type-id-595'/>
+    <pointer-type-def type-id='type-id-595' size-in-bits='64' id='type-id-596'/>
+    <qualified-type-def type-id='type-id-597' const='yes' id='type-id-598'/>
+    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-599'/>
+    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-601'/>
+    <pointer-type-def type-id='type-id-601' size-in-bits='64' id='type-id-602'/>
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-604'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-605'/>
+    <qualified-type-def type-id='type-id-606' const='yes' id='type-id-607'/>
+    <pointer-type-def type-id='type-id-607' size-in-bits='64' id='type-id-608'/>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-609'/>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-610'/>
+    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-611'/>
+    <qualified-type-def type-id='type-id-612' const='yes' id='type-id-613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-614'/>
+    <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-615'/>
+    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-616'/>
     <qualified-type-def type-id='type-id-617' const='yes' id='type-id-618'/>
     <pointer-type-def type-id='type-id-618' size-in-bits='64' id='type-id-619'/>
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-620'/>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-621'/>
-    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-622'/>
-    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-624'/>
-    <reference-type-def kind='lvalue' type-id='type-id-624' size-in-bits='64' id='type-id-625'/>
-    <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-626'/>
-    <qualified-type-def type-id='type-id-626' const='yes' id='type-id-627'/>
+    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-621'/>
+    <reference-type-def kind='lvalue' type-id='type-id-621' size-in-bits='64' id='type-id-622'/>
+    <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-623'/>
+    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-625'/>
+    <reference-type-def kind='lvalue' type-id='type-id-625' size-in-bits='64' id='type-id-626'/>
+    <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-627'/>
     <qualified-type-def type-id='type-id-628' const='yes' id='type-id-629'/>
-    <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-630'/>
-    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-632'/>
-    <reference-type-def kind='lvalue' type-id='type-id-632' size-in-bits='64' id='type-id-633'/>
-    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-629' size-in-bits='64' id='type-id-630'/>
+    <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-631'/>
+    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-633'/>
+    <pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-634'/>
     <qualified-type-def type-id='type-id-635' const='yes' id='type-id-636'/>
     <reference-type-def kind='lvalue' type-id='type-id-636' size-in-bits='64' id='type-id-637'/>
-    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-638'/>
-    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-642'/>
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-644'/>
-    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
-    <qualified-type-def type-id='type-id-646' const='yes' id='type-id-647'/>
-    <reference-type-def kind='lvalue' type-id='type-id-647' size-in-bits='64' id='type-id-648'/>
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-650'/>
-    <reference-type-def kind='lvalue' type-id='type-id-650' size-in-bits='64' id='type-id-651'/>
-    <qualified-type-def type-id='type-id-652' const='yes' id='type-id-653'/>
-    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-654'/>
-    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-656' size-in-bits='64' id='type-id-657'/>
-    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-658'/>
-    <qualified-type-def type-id='type-id-659' const='yes' id='type-id-660'/>
-    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-661'/>
-    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-663'/>
-    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-664'/>
-    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-666'/>
-    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-667'/>
-    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-669'/>
-    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-672'/>
-    <reference-type-def kind='lvalue' type-id='type-id-672' size-in-bits='64' id='type-id-673'/>
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-675'/>
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
-    <qualified-type-def type-id='type-id-677' const='yes' id='type-id-678'/>
-    <reference-type-def kind='lvalue' type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
-    <qualified-type-def type-id='type-id-680' const='yes' id='type-id-681'/>
-    <reference-type-def kind='lvalue' type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
-    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-684'/>
-    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
-    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-687'/>
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-688'/>
-    <qualified-type-def type-id='type-id-689' const='yes' id='type-id-690'/>
-    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
-    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-693'/>
-    <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-639'/>
+    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-642'/>
+    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-647'/>
+    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-649' size-in-bits='64' id='type-id-650'/>
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
+    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-655'/>
+    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
+    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-658' size-in-bits='64' id='type-id-659'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-662'/>
+    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-664'/>
+    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-665'/>
+    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-671'/>
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-673' size-in-bits='64' id='type-id-674'/>
+    <qualified-type-def type-id='type-id-675' const='yes' id='type-id-676'/>
+    <pointer-type-def type-id='type-id-676' size-in-bits='64' id='type-id-677'/>
+    <qualified-type-def type-id='type-id-678' const='yes' id='type-id-679'/>
+    <reference-type-def kind='lvalue' type-id='type-id-679' size-in-bits='64' id='type-id-680'/>
+    <qualified-type-def type-id='type-id-681' const='yes' id='type-id-682'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-683'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-685'/>
+    <reference-type-def kind='lvalue' type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
+    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-691' const='yes' id='type-id-692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-694'/>
     <qualified-type-def type-id='type-id-695' const='yes' id='type-id-696'/>
     <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-697'/>
-    <qualified-type-def type-id='type-id-698' const='yes' id='type-id-699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-698'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-700'/>
+    <reference-type-def kind='lvalue' type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
     <qualified-type-def type-id='type-id-702' const='yes' id='type-id-703'/>
     <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-704'/>
     <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-705'/>
     <qualified-type-def type-id='type-id-706' const='yes' id='type-id-707'/>
     <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-708'/>
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-709'/>
-    <qualified-type-def type-id='type-id-710' const='yes' id='type-id-711'/>
-    <reference-type-def kind='lvalue' type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
-    <qualified-type-def type-id='type-id-713' const='yes' id='type-id-714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-714' size-in-bits='64' id='type-id-715'/>
-    <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-716'/>
-    <qualified-type-def type-id='type-id-717' const='yes' id='type-id-718'/>
-    <reference-type-def kind='lvalue' type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
-    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-721'/>
-    <reference-type-def kind='lvalue' type-id='type-id-721' size-in-bits='64' id='type-id-722'/>
-    <qualified-type-def type-id='type-id-723' const='yes' id='type-id-724'/>
-    <reference-type-def kind='lvalue' type-id='type-id-724' size-in-bits='64' id='type-id-725'/>
-    <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-726'/>
-    <qualified-type-def type-id='type-id-727' const='yes' id='type-id-728'/>
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
-    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-731'/>
-    <reference-type-def kind='lvalue' type-id='type-id-731' size-in-bits='64' id='type-id-732'/>
-    <qualified-type-def type-id='type-id-733' const='yes' id='type-id-734'/>
-    <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-735'/>
-    <qualified-type-def type-id='type-id-736' const='yes' id='type-id-737'/>
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-738'/>
-    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-739'/>
-    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-741'/>
-    <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-742'/>
-    <qualified-type-def type-id='type-id-743' const='yes' id='type-id-744'/>
-    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
-    <qualified-type-def type-id='type-id-746' const='yes' id='type-id-747'/>
-    <reference-type-def kind='lvalue' type-id='type-id-747' size-in-bits='64' id='type-id-748'/>
-    <qualified-type-def type-id='type-id-749' const='yes' id='type-id-750'/>
-    <reference-type-def kind='lvalue' type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
-    <qualified-type-def type-id='type-id-752' const='yes' id='type-id-753'/>
-    <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-754'/>
-    <qualified-type-def type-id='type-id-755' const='yes' id='type-id-756'/>
-    <reference-type-def kind='lvalue' type-id='type-id-756' size-in-bits='64' id='type-id-757'/>
-    <qualified-type-def type-id='type-id-758' const='yes' id='type-id-759'/>
-    <reference-type-def kind='lvalue' type-id='type-id-759' size-in-bits='64' id='type-id-760'/>
-    <qualified-type-def type-id='type-id-761' const='yes' id='type-id-762'/>
-    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
+    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-710'/>
+    <reference-type-def kind='lvalue' type-id='type-id-710' size-in-bits='64' id='type-id-711'/>
+    <qualified-type-def type-id='type-id-712' const='yes' id='type-id-713'/>
+    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-715'/>
+    <qualified-type-def type-id='type-id-716' const='yes' id='type-id-717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-717' size-in-bits='64' id='type-id-718'/>
+    <qualified-type-def type-id='type-id-719' const='yes' id='type-id-720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
+    <qualified-type-def type-id='type-id-722' const='yes' id='type-id-723'/>
+    <reference-type-def kind='lvalue' type-id='type-id-723' size-in-bits='64' id='type-id-724'/>
+    <qualified-type-def type-id='type-id-725' const='yes' id='type-id-726'/>
+    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-728'/>
+    <qualified-type-def type-id='type-id-729' const='yes' id='type-id-730'/>
+    <reference-type-def kind='lvalue' type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
+    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-735' const='yes' id='type-id-736'/>
+    <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-737'/>
+    <qualified-type-def type-id='type-id-738' const='yes' id='type-id-739'/>
+    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-740'/>
+    <qualified-type-def type-id='type-id-741' const='yes' id='type-id-742'/>
+    <pointer-type-def type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
+    <qualified-type-def type-id='type-id-744' const='yes' id='type-id-745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-745' size-in-bits='64' id='type-id-746'/>
+    <qualified-type-def type-id='type-id-747' const='yes' id='type-id-748'/>
+    <reference-type-def kind='lvalue' type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
+    <qualified-type-def type-id='type-id-750' const='yes' id='type-id-751'/>
+    <pointer-type-def type-id='type-id-751' size-in-bits='64' id='type-id-752'/>
+    <qualified-type-def type-id='type-id-753' const='yes' id='type-id-754'/>
+    <reference-type-def kind='lvalue' type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
+    <qualified-type-def type-id='type-id-756' const='yes' id='type-id-757'/>
+    <reference-type-def kind='lvalue' type-id='type-id-757' size-in-bits='64' id='type-id-758'/>
+    <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-759'/>
+    <qualified-type-def type-id='type-id-760' const='yes' id='type-id-761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-761' size-in-bits='64' id='type-id-762'/>
+    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-763'/>
     <qualified-type-def type-id='type-id-764' const='yes' id='type-id-765'/>
-    <reference-type-def kind='lvalue' type-id='type-id-765' size-in-bits='64' id='type-id-766'/>
+    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-766'/>
     <qualified-type-def type-id='type-id-767' const='yes' id='type-id-768'/>
     <reference-type-def kind='lvalue' type-id='type-id-768' size-in-bits='64' id='type-id-769'/>
     <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-770'/>
     <qualified-type-def type-id='type-id-771' const='yes' id='type-id-772'/>
     <reference-type-def kind='lvalue' type-id='type-id-772' size-in-bits='64' id='type-id-773'/>
-    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-774'/>
-    <qualified-type-def type-id='type-id-775' const='yes' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-777'/>
-    <qualified-type-def type-id='type-id-778' const='yes' id='type-id-779'/>
-    <reference-type-def kind='lvalue' type-id='type-id-779' size-in-bits='64' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-779' size-in-bits='64' id='type-id-781'/>
-    <qualified-type-def type-id='type-id-782' const='yes' id='type-id-783'/>
-    <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-784'/>
-    <qualified-type-def type-id='type-id-785' const='yes' id='type-id-786'/>
-    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-787'/>
-    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-789' size-in-bits='64' id='type-id-790'/>
-    <qualified-type-def type-id='type-id-791' const='yes' id='type-id-792'/>
-    <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-793'/>
-    <qualified-type-def type-id='type-id-794' const='yes' id='type-id-795'/>
-    <reference-type-def kind='lvalue' type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
-    <qualified-type-def type-id='type-id-797' const='yes' id='type-id-798'/>
-    <reference-type-def kind='lvalue' type-id='type-id-798' size-in-bits='64' id='type-id-799'/>
-    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-801'/>
-    <reference-type-def kind='lvalue' type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-804'/>
-    <reference-type-def kind='lvalue' type-id='type-id-804' size-in-bits='64' id='type-id-805'/>
-    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-807'/>
-    <reference-type-def kind='lvalue' type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
-    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-810'/>
-    <reference-type-def kind='lvalue' type-id='type-id-810' size-in-bits='64' id='type-id-811'/>
-    <qualified-type-def type-id='type-id-812' const='yes' id='type-id-813'/>
-    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-814'/>
-    <qualified-type-def type-id='type-id-815' const='yes' id='type-id-816'/>
-    <reference-type-def kind='lvalue' type-id='type-id-816' size-in-bits='64' id='type-id-817'/>
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-819' size-in-bits='64' id='type-id-820'/>
-    <qualified-type-def type-id='type-id-821' const='yes' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-823'/>
-    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-825'/>
-    <reference-type-def kind='lvalue' type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
-    <qualified-type-def type-id='type-id-827' const='yes' id='type-id-828'/>
-    <reference-type-def kind='lvalue' type-id='type-id-828' size-in-bits='64' id='type-id-829'/>
-    <qualified-type-def type-id='type-id-830' const='yes' id='type-id-831'/>
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-832'/>
-    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-834'/>
-    <reference-type-def kind='lvalue' type-id='type-id-834' size-in-bits='64' id='type-id-835'/>
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-837'/>
-    <reference-type-def kind='lvalue' type-id='type-id-837' size-in-bits='64' id='type-id-838'/>
-    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-840'/>
-    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-841'/>
-    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-843'/>
-    <reference-type-def kind='lvalue' type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
-    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-846'/>
-    <reference-type-def kind='lvalue' type-id='type-id-846' size-in-bits='64' id='type-id-847'/>
-    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-849'/>
-    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-850'/>
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-852'/>
-    <reference-type-def kind='lvalue' type-id='type-id-852' size-in-bits='64' id='type-id-853'/>
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-855'/>
-    <reference-type-def kind='lvalue' type-id='type-id-855' size-in-bits='64' id='type-id-856'/>
-    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-858'/>
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-859'/>
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-861'/>
-    <reference-type-def kind='lvalue' type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <qualified-type-def type-id='type-id-863' const='yes' id='type-id-864'/>
-    <reference-type-def kind='lvalue' type-id='type-id-864' size-in-bits='64' id='type-id-865'/>
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-867'/>
-    <pointer-type-def type-id='type-id-867' size-in-bits='64' id='type-id-868'/>
-    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-870'/>
-    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-871'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-873' size-in-bits='64' id='type-id-874'/>
-    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-876'/>
-    <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-877'/>
-    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-878'/>
-    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-881'/>
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-883'/>
-    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-884'/>
-    <qualified-type-def type-id='type-id-885' const='yes' id='type-id-886'/>
-    <reference-type-def kind='lvalue' type-id='type-id-886' size-in-bits='64' id='type-id-887'/>
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-889'/>
-    <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-890'/>
-    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-892'/>
-    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-893'/>
+    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-775'/>
+    <reference-type-def kind='lvalue' type-id='type-id-775' size-in-bits='64' id='type-id-776'/>
+    <qualified-type-def type-id='type-id-777' const='yes' id='type-id-778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-778' size-in-bits='64' id='type-id-779'/>
+    <qualified-type-def type-id='type-id-780' const='yes' id='type-id-781'/>
+    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-782'/>
+    <qualified-type-def type-id='type-id-783' const='yes' id='type-id-784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-784' size-in-bits='64' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-786' const='yes' id='type-id-787'/>
+    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-788'/>
+    <qualified-type-def type-id='type-id-789' const='yes' id='type-id-790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-790' size-in-bits='64' id='type-id-791'/>
+    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-793'/>
+    <reference-type-def kind='lvalue' type-id='type-id-793' size-in-bits='64' id='type-id-794'/>
+    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-796'/>
+    <reference-type-def kind='lvalue' type-id='type-id-796' size-in-bits='64' id='type-id-797'/>
+    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-799'/>
+    <reference-type-def kind='lvalue' type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
+    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-802'/>
+    <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-805'/>
+    <reference-type-def kind='lvalue' type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
+    <qualified-type-def type-id='type-id-807' const='yes' id='type-id-808'/>
+    <reference-type-def kind='lvalue' type-id='type-id-808' size-in-bits='64' id='type-id-809'/>
+    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-811'/>
+    <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
+    <qualified-type-def type-id='type-id-813' const='yes' id='type-id-814'/>
+    <reference-type-def kind='lvalue' type-id='type-id-814' size-in-bits='64' id='type-id-815'/>
+    <qualified-type-def type-id='type-id-816' const='yes' id='type-id-817'/>
+    <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
+    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-821'/>
+    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-823'/>
+    <reference-type-def kind='lvalue' type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
+    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-826'/>
+    <reference-type-def kind='lvalue' type-id='type-id-826' size-in-bits='64' id='type-id-827'/>
+    <qualified-type-def type-id='type-id-828' const='yes' id='type-id-829'/>
+    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-830'/>
+    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-832'/>
+    <reference-type-def kind='lvalue' type-id='type-id-832' size-in-bits='64' id='type-id-833'/>
+    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-835'/>
+    <reference-type-def kind='lvalue' type-id='type-id-835' size-in-bits='64' id='type-id-836'/>
+    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-838'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-839'/>
+    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-841'/>
+    <reference-type-def kind='lvalue' type-id='type-id-841' size-in-bits='64' id='type-id-842'/>
+    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-844'/>
+    <reference-type-def kind='lvalue' type-id='type-id-844' size-in-bits='64' id='type-id-845'/>
+    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-847'/>
+    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-848'/>
+    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-850'/>
+    <reference-type-def kind='lvalue' type-id='type-id-850' size-in-bits='64' id='type-id-851'/>
+    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-854'/>
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-856'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-857'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-859'/>
+    <reference-type-def kind='lvalue' type-id='type-id-859' size-in-bits='64' id='type-id-860'/>
+    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-862'/>
+    <reference-type-def kind='lvalue' type-id='type-id-862' size-in-bits='64' id='type-id-863'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-865'/>
+    <reference-type-def kind='lvalue' type-id='type-id-865' size-in-bits='64' id='type-id-866'/>
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-867'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-869'/>
+    <reference-type-def kind='lvalue' type-id='type-id-869' size-in-bits='64' id='type-id-870'/>
+    <qualified-type-def type-id='type-id-871' const='yes' id='type-id-872'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-873'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-875'/>
+    <reference-type-def kind='lvalue' type-id='type-id-875' size-in-bits='64' id='type-id-876'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-878'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-879'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-881'/>
+    <pointer-type-def type-id='type-id-881' size-in-bits='64' id='type-id-882'/>
+    <qualified-type-def type-id='type-id-883' const='yes' id='type-id-884'/>
+    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-885'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-886'/>
+    <qualified-type-def type-id='type-id-887' const='yes' id='type-id-888'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-889'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-891'/>
+    <reference-type-def kind='lvalue' type-id='type-id-891' size-in-bits='64' id='type-id-892'/>
+    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-893'/>
     <qualified-type-def type-id='type-id-894' const='yes' id='type-id-895'/>
     <reference-type-def kind='lvalue' type-id='type-id-895' size-in-bits='64' id='type-id-896'/>
-    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-897'/>
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-899'/>
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-900'/>
-    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-902'/>
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-903'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-904'/>
-    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-906'/>
-    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-907'/>
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-909'/>
-    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
-    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-912'/>
-    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
-    <qualified-type-def type-id='type-id-914' const='yes' id='type-id-915'/>
-    <reference-type-def kind='lvalue' type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-918'/>
-    <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-919'/>
-    <qualified-type-def type-id='type-id-920' const='yes' id='type-id-921'/>
-    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-924'/>
-    <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-925'/>
-    <qualified-type-def type-id='type-id-926' const='yes' id='type-id-927'/>
-    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-930'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
-    <qualified-type-def type-id='type-id-932' const='yes' id='type-id-933'/>
-    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <qualified-type-def type-id='type-id-897' const='yes' id='type-id-898'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-901'/>
+    <reference-type-def kind='lvalue' type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-904'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-905'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-907'/>
+    <reference-type-def kind='lvalue' type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-910'/>
+    <reference-type-def kind='lvalue' type-id='type-id-910' size-in-bits='64' id='type-id-911'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-913'/>
+    <reference-type-def kind='lvalue' type-id='type-id-913' size-in-bits='64' id='type-id-914'/>
+    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-916'/>
+    <reference-type-def kind='lvalue' type-id='type-id-916' size-in-bits='64' id='type-id-917'/>
+    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-919'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-922'/>
+    <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-923'/>
+    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-925'/>
+    <reference-type-def kind='lvalue' type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
+    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-928'/>
+    <reference-type-def kind='lvalue' type-id='type-id-928' size-in-bits='64' id='type-id-929'/>
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-930'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-934'/>
     <qualified-type-def type-id='type-id-935' const='yes' id='type-id-936'/>
-    <reference-type-def kind='lvalue' type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
     <qualified-type-def type-id='type-id-938' const='yes' id='type-id-939'/>
     <reference-type-def kind='lvalue' type-id='type-id-939' size-in-bits='64' id='type-id-940'/>
-    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-941'/>
-    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-943'/>
-    <reference-type-def kind='lvalue' type-id='type-id-943' size-in-bits='64' id='type-id-944'/>
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-945'/>
-    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-947'/>
-    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-948'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-942'/>
+    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-944'/>
+    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-948'/>
     <qualified-type-def type-id='type-id-949' const='yes' id='type-id-950'/>
     <reference-type-def kind='lvalue' type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
     <qualified-type-def type-id='type-id-952' const='yes' id='type-id-953'/>
     <reference-type-def kind='lvalue' type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-955'/>
-    <qualified-type-def type-id='type-id-956' const='yes' id='type-id-957'/>
-    <reference-type-def kind='lvalue' type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-961'/>
-    <reference-type-def kind='lvalue' type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
-    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-964'/>
-    <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
-    <qualified-type-def type-id='type-id-966' const='yes' id='type-id-967'/>
-    <reference-type-def kind='lvalue' type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
-    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-970'/>
-    <reference-type-def kind='lvalue' type-id='type-id-970' size-in-bits='64' id='type-id-971'/>
-    <qualified-type-def type-id='type-id-972' const='yes' id='type-id-973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
-    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-976'/>
-    <reference-type-def kind='lvalue' type-id='type-id-976' size-in-bits='64' id='type-id-977'/>
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-979'/>
-    <reference-type-def kind='lvalue' type-id='type-id-979' size-in-bits='64' id='type-id-980'/>
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-982'/>
-    <reference-type-def kind='lvalue' type-id='type-id-982' size-in-bits='64' id='type-id-983'/>
-    <qualified-type-def type-id='type-id-984' const='yes' id='type-id-985'/>
-    <reference-type-def kind='lvalue' type-id='type-id-985' size-in-bits='64' id='type-id-986'/>
-    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-988'/>
-    <reference-type-def kind='lvalue' type-id='type-id-988' size-in-bits='64' id='type-id-989'/>
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-991'/>
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-992'/>
-    <qualified-type-def type-id='type-id-993' const='yes' id='type-id-994'/>
-    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
-    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-997'/>
-    <reference-type-def kind='lvalue' type-id='type-id-997' size-in-bits='64' id='type-id-998'/>
-    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1000'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
-    <qualified-type-def type-id='type-id-1002' const='yes' id='type-id-1003'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
-    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1006'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1009'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-1013'/>
-    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1015'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1018'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1021'/>
+    <qualified-type-def type-id='type-id-955' const='yes' id='type-id-956'/>
+    <reference-type-def kind='lvalue' type-id='type-id-956' size-in-bits='64' id='type-id-957'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-959'/>
+    <reference-type-def kind='lvalue' type-id='type-id-959' size-in-bits='64' id='type-id-960'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-962'/>
+    <reference-type-def kind='lvalue' type-id='type-id-962' size-in-bits='64' id='type-id-963'/>
+    <qualified-type-def type-id='type-id-964' const='yes' id='type-id-965'/>
+    <reference-type-def kind='lvalue' type-id='type-id-965' size-in-bits='64' id='type-id-966'/>
+    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-968'/>
+    <reference-type-def kind='lvalue' type-id='type-id-968' size-in-bits='64' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
+    <reference-type-def kind='lvalue' type-id='type-id-971' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-975'/>
+    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <qualified-type-def type-id='type-id-979' const='yes' id='type-id-980'/>
+    <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-983'/>
+    <reference-type-def kind='lvalue' type-id='type-id-983' size-in-bits='64' id='type-id-984'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-987'/>
+    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-989'/>
+    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-990'/>
+    <qualified-type-def type-id='type-id-991' const='yes' id='type-id-992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
+    <qualified-type-def type-id='type-id-994' const='yes' id='type-id-995'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-996'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-998'/>
+    <reference-type-def kind='lvalue' type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
+    <qualified-type-def type-id='type-id-1000' const='yes' id='type-id-1001'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1001' size-in-bits='64' id='type-id-1002'/>
+    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-1004'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
+    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1007'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1010'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1016'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1019'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1019' size-in-bits='64' id='type-id-1020'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1021'/>
     <reference-type-def kind='lvalue' type-id='type-id-1021' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1023'/>
     <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1024'/>
     <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1025'/>
     <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1027'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
     <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1030'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1030' size-in-bits='64' id='type-id-1031'/>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1032'/>
+    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1032'/>
     <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1033'/>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1034'/>
     <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1035'/>
     <reference-type-def kind='lvalue' type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
-    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1038'/>
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1039'/>
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1041'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1043'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1037'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1039'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1042'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1044'/>
     <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1046'/>
     <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-1047'/>
     <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1048'/>
     <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1050'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
+    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
     <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1053'/>
     <reference-type-def kind='lvalue' type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1055'/>
-    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1057'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1059'/>
-    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1061'/>
-    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
+    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1056'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1057'/>
+    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1058'/>
+    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1060'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1062'/>
     <qualified-type-def type-id='type-id-1063' const='yes' id='type-id-1064'/>
     <reference-type-def kind='lvalue' type-id='type-id-1064' size-in-bits='64' id='type-id-1065'/>
-    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1067'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1069'/>
-    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1071'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1073'/>
-    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1075'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1077'/>
+    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-1067' const='yes' id='type-id-1068'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1068' size-in-bits='64' id='type-id-1069'/>
+    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-1070'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1072'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1074'/>
+    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1076'/>
+    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
     <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1079'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1081'/>
-    <qualified-type-def type-id='type-id-1082' const='yes' id='type-id-1083'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1085'/>
-    <qualified-type-def type-id='type-id-1086' const='yes' id='type-id-1087'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
-    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1090'/>
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
-    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1093'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
-    <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
-    <qualified-type-def type-id='type-id-1098' const='yes' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
-    <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
-    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1105'/>
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
-    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
-    <qualified-type-def type-id='type-id-1110' const='yes' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1112'/>
-    <qualified-type-def type-id='type-id-1113' const='yes' id='type-id-1114'/>
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1117'/>
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-1118'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
+    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1082'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
+    <qualified-type-def type-id='type-id-1084' const='yes' id='type-id-1085'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1088'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1089'/>
+    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1091'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
+    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
+    <qualified-type-def type-id='type-id-1096' const='yes' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
+    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1103'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
+    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
+    <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1110'/>
+    <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-1112'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1114'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1116'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1118'/>
     <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1120'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
     <qualified-type-def type-id='type-id-1122' const='yes' id='type-id-1123'/>
     <reference-type-def kind='lvalue' type-id='type-id-1123' size-in-bits='64' id='type-id-1124'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1125'/>
-    <qualified-type-def type-id='type-id-1126' const='yes' id='type-id-1127'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1127' size-in-bits='64' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1129'/>
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1131'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1131' size-in-bits='64' id='type-id-1132'/>
-    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1134'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
-    <qualified-type-def type-id='type-id-1136' const='yes' id='type-id-1137'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-1139'/>
-    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1141'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1141' size-in-bits='64' id='type-id-1142'/>
+    <qualified-type-def type-id='type-id-1125' const='yes' id='type-id-1126'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1128'/>
+    <qualified-type-def type-id='type-id-1129' const='yes' id='type-id-1130'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1130' size-in-bits='64' id='type-id-1131'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1133'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1134'/>
+    <qualified-type-def type-id='type-id-1135' const='yes' id='type-id-1136'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1136' size-in-bits='64' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1138'/>
+    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1140'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1142'/>
     <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1144'/>
     <reference-type-def kind='lvalue' type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
     <qualified-type-def type-id='type-id-1146' const='yes' id='type-id-1147'/>
@@ -1779,23 +1778,23 @@ 
     <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1149'/>
     <qualified-type-def type-id='type-id-1150' const='yes' id='type-id-1151'/>
     <reference-type-def kind='lvalue' type-id='type-id-1151' size-in-bits='64' id='type-id-1152'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-1153'/>
-    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1155'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1156'/>
-    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1158'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1160'/>
-    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1162'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
-    <qualified-type-def type-id='type-id-1164' const='yes' id='type-id-1165'/>
+    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1154'/>
+    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1156'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1158'/>
+    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1160'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
+    <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1163'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1163' size-in-bits='64' id='type-id-1164'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-1165'/>
     <qualified-type-def type-id='type-id-1166' const='yes' id='type-id-1167'/>
     <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1168'/>
     <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1169'/>
     <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1171'/>
     <reference-type-def kind='lvalue' type-id='type-id-1171' size-in-bits='64' id='type-id-1172'/>
-    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1175'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1176'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1173'/>
+    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1175'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1175' size-in-bits='64' id='type-id-1176'/>
     <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1178'/>
     <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1179'/>
     <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1180'/>
@@ -1804,192 +1803,193 @@ 
     <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1184'/>
     <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1186'/>
     <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1189'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1191'/>
-    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1193'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1194'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1195'/>
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1188'/>
+    <qualified-type-def type-id='type-id-1189' const='yes' id='type-id-1190'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1190' size-in-bits='64' id='type-id-1191'/>
+    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-1192'/>
+    <qualified-type-def type-id='type-id-1193' const='yes' id='type-id-1194'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1194' size-in-bits='64' id='type-id-1195'/>
     <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-1197'/>
     <reference-type-def kind='lvalue' type-id='type-id-1197' size-in-bits='64' id='type-id-1198'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-1199'/>
-    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1201'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-1202'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1203'/>
-    <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1205'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1206'/>
-    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1208'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1208' size-in-bits='64' id='type-id-1209'/>
-    <qualified-type-def type-id='type-id-1210' const='yes' id='type-id-1211'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-1212'/>
-    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
+    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1200'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-1201'/>
+    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1203'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1203' size-in-bits='64' id='type-id-1204'/>
+    <qualified-type-def type-id='type-id-1205' const='yes' id='type-id-1206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1208'/>
+    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1210'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-1211'/>
+    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1213'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1214'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1215'/>
     <qualified-type-def type-id='type-id-1216' const='yes' id='type-id-1217'/>
     <reference-type-def kind='lvalue' type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1219'/>
-    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1221'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1221' size-in-bits='64' id='type-id-1222'/>
+    <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1220'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1222'/>
     <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1224'/>
     <reference-type-def kind='lvalue' type-id='type-id-1224' size-in-bits='64' id='type-id-1225'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1226'/>
-    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1228' size-in-bits='64' id='type-id-1229'/>
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1231'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-1232'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1233'/>
-    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1235'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1238'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
-    <qualified-type-def type-id='type-id-1240' const='yes' id='type-id-1241'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
+    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1227'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1227' size-in-bits='64' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1229' const='yes' id='type-id-1230'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1230' size-in-bits='64' id='type-id-1231'/>
+    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1233' size-in-bits='64' id='type-id-1234'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1236'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1236' size-in-bits='64' id='type-id-1237'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1238'/>
+    <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-1240'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1240' size-in-bits='64' id='type-id-1241'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-1242'/>
     <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1244'/>
     <reference-type-def kind='lvalue' type-id='type-id-1244' size-in-bits='64' id='type-id-1245'/>
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1247'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1247' size-in-bits='64' id='type-id-1248'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-1249'/>
-    <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1251'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1251' size-in-bits='64' id='type-id-1252'/>
-    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-1253'/>
-    <qualified-type-def type-id='type-id-1254' const='yes' id='type-id-1255'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-1256'/>
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1257'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-1246'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1248'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1248' size-in-bits='64' id='type-id-1249'/>
+    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-1250'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1252'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-1253'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-1254'/>
+    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1256'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1256' size-in-bits='64' id='type-id-1257'/>
     <qualified-type-def type-id='type-id-1258' const='yes' id='type-id-1259'/>
     <reference-type-def kind='lvalue' type-id='type-id-1259' size-in-bits='64' id='type-id-1260'/>
     <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-1261'/>
     <qualified-type-def type-id='type-id-1262' const='yes' id='type-id-1263'/>
     <reference-type-def kind='lvalue' type-id='type-id-1263' size-in-bits='64' id='type-id-1264'/>
-    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-1265'/>
-    <qualified-type-def type-id='type-id-1266' const='yes' id='type-id-1267'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1267' size-in-bits='64' id='type-id-1268'/>
+    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1266'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1266' size-in-bits='64' id='type-id-1267'/>
+    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-1268'/>
     <qualified-type-def type-id='type-id-1269' const='yes' id='type-id-1270'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1270' size-in-bits='64' id='type-id-1271'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1272'/>
-    <qualified-type-def type-id='type-id-1273' const='yes' id='type-id-1274'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1275'/>
-    <qualified-type-def type-id='type-id-1276' const='yes' id='type-id-1277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1277' size-in-bits='64' id='type-id-1278'/>
-    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-1279'/>
-    <qualified-type-def type-id='type-id-1280' const='yes' id='type-id-1281'/>
-    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1283'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1284'/>
-    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1286'/>
+    <qualified-type-def type-id='type-id-1271' const='yes' id='type-id-1272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1272' size-in-bits='64' id='type-id-1273'/>
+    <qualified-type-def type-id='type-id-1274' const='yes' id='type-id-1275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1275' size-in-bits='64' id='type-id-1276'/>
+    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-1277'/>
+    <qualified-type-def type-id='type-id-1278' const='yes' id='type-id-1279'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1279' size-in-bits='64' id='type-id-1280'/>
+    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-1282'/>
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-1284'/>
+    <qualified-type-def type-id='type-id-89' const='yes' id='type-id-1285'/>
+    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-1286'/>
     <reference-type-def kind='lvalue' type-id='type-id-1286' size-in-bits='64' id='type-id-1287'/>
-    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1288'/>
-    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1290'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
-    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-1292'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-1294'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-1288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1288' size-in-bits='64' id='type-id-1289'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-1290'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-1291'/>
+    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-1292'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1294'/>
     <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-1295'/>
-    <qualified-type-def type-id='type-id-89' const='yes' id='type-id-1296'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-1297'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
-    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-1299'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1299' size-in-bits='64' id='type-id-1300'/>
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1301'/>
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-1302'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-1303'/>
-    <qualified-type-def type-id='type-id-1304' const='yes' id='type-id-1305'/>
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-1306'/>
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1307'/>
-    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1308'/>
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1309'/>
-    <reference-type-def kind='lvalue' type-id='type-id-21' size-in-bits='64' id='type-id-1310'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1311'/>
-    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-1312'/>
-    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-69'/>
-    <reference-type-def kind='lvalue' type-id='type-id-23' size-in-bits='64' id='type-id-1314'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-1315'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-1316'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-1317'/>
-    <reference-type-def kind='lvalue' type-id='type-id-28' size-in-bits='64' id='type-id-1318'/>
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-1319'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-1320'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-1321'/>
-    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-1323'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-1324'/>
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-1325'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-1326'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-1327'/>
-    <reference-type-def kind='lvalue' type-id='type-id-365' size-in-bits='64' id='type-id-1328'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1329'/>
-    <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-1330'/>
-    <reference-type-def kind='rvalue' type-id='type-id-369' size-in-bits='64' id='type-id-1331'/>
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-1332'/>
-    <reference-type-def kind='lvalue' type-id='type-id-376' size-in-bits='64' id='type-id-1333'/>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1334'/>
-    <qualified-type-def type-id='type-id-1334' const='yes' id='type-id-1335'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1334' size-in-bits='64' id='type-id-1337'/>
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1338'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-1339'/>
-    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1340'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1341'/>
-    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-1343'/>
-    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-1344'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
-    <reference-type-def kind='lvalue' type-id='type-id-397' size-in-bits='64' id='type-id-1347'/>
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1348'/>
-    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-1349'/>
-    <reference-type-def kind='lvalue' type-id='type-id-405' size-in-bits='64' id='type-id-1350'/>
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1351'/>
-    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1352'/>
-    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-1353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-414' size-in-bits='64' id='type-id-1354'/>
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-1355'/>
-    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-1356'/>
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-1359'/>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-1361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-1362'/>
-    <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-1363'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
-    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-1366'/>
-    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-1367'/>
-    <pointer-type-def type-id='type-id-446' size-in-bits='64' id='type-id-1368'/>
-    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-1369'/>
-    <reference-type-def kind='lvalue' type-id='type-id-463' size-in-bits='64' id='type-id-1370'/>
-    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-1371'/>
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-1372'/>
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
-    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-1375'/>
-    <reference-type-def kind='lvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1376'/>
-    <reference-type-def kind='rvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1377'/>
-    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-1378'/>
-    <reference-type-def kind='lvalue' type-id='type-id-481' size-in-bits='64' id='type-id-1379'/>
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-1380'/>
-    <reference-type-def kind='lvalue' type-id='type-id-484' size-in-bits='64' id='type-id-1381'/>
-    <reference-type-def kind='rvalue' type-id='type-id-484' size-in-bits='64' id='type-id-1382'/>
-    <pointer-type-def type-id='type-id-484' size-in-bits='64' id='type-id-1383'/>
+    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1297'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
+    <reference-type-def kind='lvalue' type-id='type-id-21' size-in-bits='64' id='type-id-1299'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1300'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-1301'/>
+    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-69'/>
+    <reference-type-def kind='lvalue' type-id='type-id-23' size-in-bits='64' id='type-id-1303'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-1306'/>
+    <reference-type-def kind='lvalue' type-id='type-id-28' size-in-bits='64' id='type-id-1307'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-1308'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-1309'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-1310'/>
+    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-1312'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-1313'/>
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-1315'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-1316'/>
+    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1317'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-1318'/>
+    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1319'/>
+    <reference-type-def kind='rvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1320'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-1321'/>
+    <reference-type-def kind='lvalue' type-id='type-id-365' size-in-bits='64' id='type-id-1322'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1323'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1324' size-in-bits='64' id='type-id-1325'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1326'/>
+    <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-1327'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-1328'/>
+    <reference-type-def kind='lvalue' type-id='type-id-373' size-in-bits='64' id='type-id-1329'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-1330'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1331'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1332'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1333'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1334' size-in-bits='64' id='type-id-1335'/>
+    <reference-type-def kind='lvalue' type-id='type-id-386' size-in-bits='64' id='type-id-1336'/>
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-1337'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-1338'/>
+    <reference-type-def kind='lvalue' type-id='type-id-394' size-in-bits='64' id='type-id-1339'/>
+    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-1340'/>
+    <reference-type-def kind='lvalue' type-id='type-id-400' size-in-bits='64' id='type-id-1341'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-403' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-1344'/>
+    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-1345'/>
+    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-1348'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1349'/>
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-1350'/>
+    <reference-type-def kind='lvalue' type-id='type-id-422' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-1356'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-1358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-452' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-1360'/>
+    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-1361'/>
+    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-1363'/>
+    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-1364'/>
+    <reference-type-def kind='lvalue' type-id='type-id-466' size-in-bits='64' id='type-id-1365'/>
+    <reference-type-def kind='rvalue' type-id='type-id-466' size-in-bits='64' id='type-id-1366'/>
+    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-1367'/>
+    <reference-type-def kind='lvalue' type-id='type-id-470' size-in-bits='64' id='type-id-1368'/>
+    <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-1369'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-1371'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-1373' const='yes' id='type-id-1374'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1374' size-in-bits='64' id='type-id-1375'/>
+    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-1376'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1377'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1378'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-1379'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1379' size-in-bits='64' id='type-id-1380'/>
+    <reference-type-def kind='lvalue' type-id='type-id-473' size-in-bits='64' id='type-id-1381'/>
+    <reference-type-def kind='rvalue' type-id='type-id-473' size-in-bits='64' id='type-id-1382'/>
+    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-1383'/>
     <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
     <reference-type-def kind='lvalue' type-id='type-id-1386' size-in-bits='64' id='type-id-1387'/>
-    <reference-type-def kind='lvalue' type-id='type-id-488' size-in-bits='64' id='type-id-1388'/>
-    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-1389'/>
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-1390'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-1391'/>
+    <reference-type-def kind='lvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1388'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-1390'/>
+    <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-1391'/>
     <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
-    <reference-type-def kind='lvalue' type-id='type-id-503' size-in-bits='64' id='type-id-1394'/>
-    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-1395'/>
-    <reference-type-def kind='lvalue' type-id='type-id-507' size-in-bits='64' id='type-id-1396'/>
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-1397'/>
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-1399'/>
-    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-1400'/>
-    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1401'/>
-    <reference-type-def kind='lvalue' type-id='type-id-522' size-in-bits='64' id='type-id-1402'/>
-    <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-1403'/>
+    <reference-type-def kind='lvalue' type-id='type-id-492' size-in-bits='64' id='type-id-1394'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-1395'/>
+    <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-1396'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-1397'/>
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-1398'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1399'/>
+    <reference-type-def kind='lvalue' type-id='type-id-507' size-in-bits='64' id='type-id-1400'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-1401'/>
+    <reference-type-def kind='lvalue' type-id='type-id-511' size-in-bits='64' id='type-id-1402'/>
+    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-1403'/>
     <qualified-type-def type-id='type-id-1403' const='yes' id='type-id-1404'/>
     <reference-type-def kind='lvalue' type-id='type-id-1404' size-in-bits='64' id='type-id-1405'/>
-    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-1406'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-1407'/>
-    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-1408'/>
+    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-1406'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1407'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-1408'/>
     <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
     <reference-type-def kind='rvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
     <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1412'/>
-    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-1413'/>
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-1415'/>
     <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
     <reference-type-def kind='lvalue' type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
@@ -1999,223 +1999,223 @@ 
     <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1423'/>
     <reference-type-def kind='lvalue' type-id='type-id-1420' size-in-bits='64' id='type-id-1424'/>
     <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-1425'/>
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-1426'/>
     <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-1428'/>
     <qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1429'/>
     <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
     <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-1431'/>
     <reference-type-def kind='lvalue' type-id='type-id-1428' size-in-bits='64' id='type-id-1432'/>
     <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-1433'/>
-    <reference-type-def kind='lvalue' type-id='type-id-545' size-in-bits='64' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1435'/>
-    <reference-type-def kind='lvalue' type-id='type-id-549' size-in-bits='64' id='type-id-1436'/>
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-1437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-534' size-in-bits='64' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-1435'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1437'/>
     <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-1439'/>
     <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-1441'/>
-    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-1442'/>
-    <reference-type-def kind='lvalue' type-id='type-id-557' size-in-bits='64' id='type-id-1443'/>
-    <pointer-type-def type-id='type-id-557' size-in-bits='64' id='type-id-1444'/>
+    <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-1442'/>
+    <reference-type-def kind='lvalue' type-id='type-id-546' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-1444'/>
     <reference-type-def kind='lvalue' type-id='type-id-46' size-in-bits='64' id='type-id-1445'/>
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-1446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-1447'/>
-    <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-1448'/>
+    <reference-type-def kind='lvalue' type-id='type-id-612' size-in-bits='64' id='type-id-1447'/>
+    <pointer-type-def type-id='type-id-612' size-in-bits='64' id='type-id-1448'/>
     <qualified-type-def type-id='type-id-1448' const='yes' id='type-id-1449'/>
-    <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-617' size-in-bits='64' id='type-id-1450'/>
     <reference-type-def kind='lvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
-    <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-1453'/>
+    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-1453'/>
     <reference-type-def kind='lvalue' type-id='type-id-1454' size-in-bits='64' id='type-id-1455'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-1456'/>
-    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-1457'/>
-    <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-1458'/>
+    <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-1456'/>
+    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-1458'/>
     <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
-    <reference-type-def kind='rvalue' type-id='type-id-643' size-in-bits='64' id='type-id-1461'/>
-    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-1462'/>
-    <reference-type-def kind='lvalue' type-id='type-id-646' size-in-bits='64' id='type-id-1463'/>
-    <reference-type-def kind='rvalue' type-id='type-id-646' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='rvalue' type-id='type-id-632' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-1462'/>
+    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-1463'/>
+    <reference-type-def kind='rvalue' type-id='type-id-635' size-in-bits='64' id='type-id-1464'/>
     <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
-    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-1467'/>
-    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-1468'/>
-    <reference-type-def kind='rvalue' type-id='type-id-655' size-in-bits='64' id='type-id-1469'/>
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-1467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-644' size-in-bits='64' id='type-id-1468'/>
+    <reference-type-def kind='rvalue' type-id='type-id-644' size-in-bits='64' id='type-id-1469'/>
+    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-1470'/>
     <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
     <reference-type-def kind='lvalue' type-id='type-id-1473' size-in-bits='64' id='type-id-1474'/>
     <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-1476'/>
-    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-1477'/>
-    <reference-type-def kind='rvalue' type-id='type-id-668' size-in-bits='64' id='type-id-1478'/>
-    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-1479'/>
-    <reference-type-def kind='lvalue' type-id='type-id-671' size-in-bits='64' id='type-id-1480'/>
-    <reference-type-def kind='rvalue' type-id='type-id-671' size-in-bits='64' id='type-id-1481'/>
-    <pointer-type-def type-id='type-id-671' size-in-bits='64' id='type-id-1482'/>
-    <reference-type-def kind='lvalue' type-id='type-id-674' size-in-bits='64' id='type-id-1483'/>
-    <reference-type-def kind='rvalue' type-id='type-id-674' size-in-bits='64' id='type-id-1484'/>
-    <pointer-type-def type-id='type-id-674' size-in-bits='64' id='type-id-1485'/>
-    <reference-type-def kind='lvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1486'/>
-    <reference-type-def kind='rvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1487'/>
-    <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-1488'/>
-    <reference-type-def kind='lvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1489'/>
-    <reference-type-def kind='rvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1490'/>
-    <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-1491'/>
-    <reference-type-def kind='lvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1492'/>
-    <reference-type-def kind='rvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1493'/>
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-1494'/>
-    <reference-type-def kind='rvalue' type-id='type-id-686' size-in-bits='64' id='type-id-1495'/>
-    <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-1496'/>
+    <reference-type-def kind='lvalue' type-id='type-id-657' size-in-bits='64' id='type-id-1477'/>
+    <reference-type-def kind='rvalue' type-id='type-id-657' size-in-bits='64' id='type-id-1478'/>
+    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-1479'/>
+    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-1480'/>
+    <reference-type-def kind='rvalue' type-id='type-id-660' size-in-bits='64' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-1482'/>
+    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-1483'/>
+    <reference-type-def kind='rvalue' type-id='type-id-663' size-in-bits='64' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-1485'/>
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-1486'/>
+    <reference-type-def kind='rvalue' type-id='type-id-666' size-in-bits='64' id='type-id-1487'/>
+    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-1488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-1489'/>
+    <reference-type-def kind='rvalue' type-id='type-id-669' size-in-bits='64' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-1491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-672' size-in-bits='64' id='type-id-1492'/>
+    <reference-type-def kind='rvalue' type-id='type-id-672' size-in-bits='64' id='type-id-1493'/>
+    <pointer-type-def type-id='type-id-672' size-in-bits='64' id='type-id-1494'/>
+    <reference-type-def kind='rvalue' type-id='type-id-675' size-in-bits='64' id='type-id-1495'/>
+    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-1496'/>
     <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1498'/>
-    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-1499'/>
-    <reference-type-def kind='rvalue' type-id='type-id-689' size-in-bits='64' id='type-id-1500'/>
-    <reference-type-def kind='rvalue' type-id='type-id-692' size-in-bits='64' id='type-id-1501'/>
-    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-1502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-678' size-in-bits='64' id='type-id-1499'/>
+    <reference-type-def kind='rvalue' type-id='type-id-678' size-in-bits='64' id='type-id-1500'/>
+    <reference-type-def kind='rvalue' type-id='type-id-681' size-in-bits='64' id='type-id-1501'/>
+    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-1502'/>
     <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1505'/>
-    <reference-type-def kind='rvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-698' size-in-bits='64' id='type-id-1507'/>
-    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-1508'/>
-    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-1509'/>
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-1510'/>
-    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1511'/>
-    <reference-type-def kind='rvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1512'/>
-    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-1513'/>
-    <reference-type-def kind='lvalue' type-id='type-id-710' size-in-bits='64' id='type-id-1514'/>
-    <reference-type-def kind='rvalue' type-id='type-id-710' size-in-bits='64' id='type-id-1515'/>
+    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1505'/>
+    <reference-type-def kind='rvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-687' size-in-bits='64' id='type-id-1507'/>
+    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-1508'/>
+    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-1509'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-1510'/>
+    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1511'/>
+    <reference-type-def kind='rvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1512'/>
+    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-1513'/>
+    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1514'/>
+    <reference-type-def kind='rvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1515'/>
     <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
-    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1518'/>
-    <reference-type-def kind='rvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1519'/>
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-1520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-717' size-in-bits='64' id='type-id-1521'/>
-    <reference-type-def kind='rvalue' type-id='type-id-717' size-in-bits='64' id='type-id-1522'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-1518'/>
+    <reference-type-def kind='rvalue' type-id='type-id-702' size-in-bits='64' id='type-id-1519'/>
+    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-1520'/>
+    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1521'/>
+    <reference-type-def kind='rvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1522'/>
     <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-1524'/>
-    <reference-type-def kind='lvalue' type-id='type-id-723' size-in-bits='64' id='type-id-1525'/>
-    <reference-type-def kind='rvalue' type-id='type-id-723' size-in-bits='64' id='type-id-1526'/>
-    <pointer-type-def type-id='type-id-723' size-in-bits='64' id='type-id-1527'/>
-    <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-1528'/>
-    <reference-type-def kind='rvalue' type-id='type-id-727' size-in-bits='64' id='type-id-1529'/>
+    <reference-type-def kind='lvalue' type-id='type-id-712' size-in-bits='64' id='type-id-1525'/>
+    <reference-type-def kind='rvalue' type-id='type-id-712' size-in-bits='64' id='type-id-1526'/>
+    <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-1527'/>
+    <reference-type-def kind='lvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1528'/>
+    <reference-type-def kind='rvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1529'/>
     <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
-    <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-1532'/>
-    <reference-type-def kind='rvalue' type-id='type-id-736' size-in-bits='64' id='type-id-1533'/>
-    <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-1534'/>
+    <reference-type-def kind='lvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1532'/>
+    <reference-type-def kind='rvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1533'/>
+    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-1534'/>
     <reference-type-def kind='lvalue' type-id='type-id-1535' size-in-bits='64' id='type-id-1536'/>
-    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1537'/>
-    <reference-type-def kind='rvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-729' size-in-bits='64' id='type-id-1537'/>
+    <reference-type-def kind='rvalue' type-id='type-id-729' size-in-bits='64' id='type-id-1538'/>
     <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
-    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-1541'/>
-    <reference-type-def kind='lvalue' type-id='type-id-755' size-in-bits='64' id='type-id-1542'/>
-    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-1543'/>
-    <reference-type-def kind='lvalue' type-id='type-id-764' size-in-bits='64' id='type-id-1544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1545'/>
-    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-1546'/>
-    <reference-type-def kind='lvalue' type-id='type-id-771' size-in-bits='64' id='type-id-1547'/>
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-1548'/>
-    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-1549'/>
+    <pointer-type-def type-id='type-id-741' size-in-bits='64' id='type-id-1541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-1542'/>
+    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-1543'/>
+    <reference-type-def kind='lvalue' type-id='type-id-753' size-in-bits='64' id='type-id-1544'/>
+    <reference-type-def kind='lvalue' type-id='type-id-756' size-in-bits='64' id='type-id-1545'/>
+    <pointer-type-def type-id='type-id-756' size-in-bits='64' id='type-id-1546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1547'/>
+    <pointer-type-def type-id='type-id-760' size-in-bits='64' id='type-id-1548'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1549'/>
     <qualified-type-def type-id='type-id-1549' const='yes' id='type-id-1550'/>
     <reference-type-def kind='lvalue' type-id='type-id-1550' size-in-bits='64' id='type-id-1551'/>
-    <reference-type-def kind='lvalue' type-id='type-id-778' size-in-bits='64' id='type-id-1552'/>
-    <pointer-type-def type-id='type-id-778' size-in-bits='64' id='type-id-1553'/>
-    <reference-type-def kind='lvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1554'/>
-    <reference-type-def kind='rvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1555'/>
-    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-1556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-1557'/>
-    <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1558'/>
-    <reference-type-def kind='rvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1559'/>
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-1560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-791' size-in-bits='64' id='type-id-1561'/>
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1562'/>
-    <reference-type-def kind='rvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1563'/>
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-1564'/>
-    <reference-type-def kind='lvalue' type-id='type-id-797' size-in-bits='64' id='type-id-1565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1566'/>
-    <reference-type-def kind='rvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1567'/>
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-1568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1569'/>
-    <reference-type-def kind='rvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1570'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1572'/>
-    <reference-type-def kind='rvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1573'/>
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-1574'/>
-    <reference-type-def kind='lvalue' type-id='type-id-809' size-in-bits='64' id='type-id-1575'/>
+    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1552'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-1553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-771' size-in-bits='64' id='type-id-1554'/>
+    <reference-type-def kind='rvalue' type-id='type-id-771' size-in-bits='64' id='type-id-1555'/>
+    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-1556'/>
+    <reference-type-def kind='lvalue' type-id='type-id-774' size-in-bits='64' id='type-id-1557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-777' size-in-bits='64' id='type-id-1558'/>
+    <reference-type-def kind='rvalue' type-id='type-id-777' size-in-bits='64' id='type-id-1559'/>
+    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-1560'/>
+    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-1562'/>
+    <reference-type-def kind='rvalue' type-id='type-id-783' size-in-bits='64' id='type-id-1563'/>
+    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-1564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-789' size-in-bits='64' id='type-id-1566'/>
+    <reference-type-def kind='rvalue' type-id='type-id-789' size-in-bits='64' id='type-id-1567'/>
+    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-1568'/>
+    <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-1569'/>
+    <reference-type-def kind='rvalue' type-id='type-id-792' size-in-bits='64' id='type-id-1570'/>
+    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1571'/>
+    <reference-type-def kind='lvalue' type-id='type-id-795' size-in-bits='64' id='type-id-1572'/>
+    <reference-type-def kind='rvalue' type-id='type-id-795' size-in-bits='64' id='type-id-1573'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-1574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-798' size-in-bits='64' id='type-id-1575'/>
     <reference-type-def kind='lvalue' type-id='type-id-1576' size-in-bits='64' id='type-id-1577'/>
     <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-1578'/>
-    <reference-type-def kind='rvalue' type-id='type-id-812' size-in-bits='64' id='type-id-1579'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-1580'/>
-    <reference-type-def kind='lvalue' type-id='type-id-815' size-in-bits='64' id='type-id-1581'/>
-    <reference-type-def kind='rvalue' type-id='type-id-815' size-in-bits='64' id='type-id-1582'/>
+    <reference-type-def kind='rvalue' type-id='type-id-801' size-in-bits='64' id='type-id-1579'/>
+    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-1580'/>
+    <reference-type-def kind='lvalue' type-id='type-id-804' size-in-bits='64' id='type-id-1581'/>
+    <reference-type-def kind='rvalue' type-id='type-id-804' size-in-bits='64' id='type-id-1582'/>
     <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
     <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1585'/>
-    <reference-type-def kind='rvalue' type-id='type-id-821' size-in-bits='64' id='type-id-1586'/>
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-1587'/>
-    <reference-type-def kind='lvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1588'/>
-    <reference-type-def kind='rvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1589'/>
+    <reference-type-def kind='rvalue' type-id='type-id-810' size-in-bits='64' id='type-id-1586'/>
+    <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-1587'/>
+    <reference-type-def kind='lvalue' type-id='type-id-813' size-in-bits='64' id='type-id-1588'/>
+    <reference-type-def kind='rvalue' type-id='type-id-813' size-in-bits='64' id='type-id-1589'/>
     <reference-type-def kind='lvalue' type-id='type-id-1590' size-in-bits='64' id='type-id-1591'/>
     <pointer-type-def type-id='type-id-1590' size-in-bits='64' id='type-id-1592'/>
-    <reference-type-def kind='rvalue' type-id='type-id-830' size-in-bits='64' id='type-id-1593'/>
-    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-1594'/>
-    <reference-type-def kind='lvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1595'/>
-    <reference-type-def kind='rvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1596'/>
+    <reference-type-def kind='rvalue' type-id='type-id-819' size-in-bits='64' id='type-id-1593'/>
+    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-1594'/>
+    <reference-type-def kind='lvalue' type-id='type-id-822' size-in-bits='64' id='type-id-1595'/>
+    <reference-type-def kind='rvalue' type-id='type-id-822' size-in-bits='64' id='type-id-1596'/>
     <reference-type-def kind='lvalue' type-id='type-id-1597' size-in-bits='64' id='type-id-1598'/>
     <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-1599'/>
-    <reference-type-def kind='rvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1600'/>
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-1601'/>
-    <reference-type-def kind='lvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1602'/>
-    <reference-type-def kind='rvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1603'/>
+    <reference-type-def kind='rvalue' type-id='type-id-828' size-in-bits='64' id='type-id-1600'/>
+    <pointer-type-def type-id='type-id-828' size-in-bits='64' id='type-id-1601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-831' size-in-bits='64' id='type-id-1602'/>
+    <reference-type-def kind='rvalue' type-id='type-id-831' size-in-bits='64' id='type-id-1603'/>
     <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
     <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1606'/>
-    <reference-type-def kind='rvalue' type-id='type-id-848' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1608'/>
-    <reference-type-def kind='lvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1609'/>
-    <reference-type-def kind='rvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1610'/>
+    <reference-type-def kind='rvalue' type-id='type-id-837' size-in-bits='64' id='type-id-1607'/>
+    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1608'/>
+    <reference-type-def kind='lvalue' type-id='type-id-840' size-in-bits='64' id='type-id-1609'/>
+    <reference-type-def kind='rvalue' type-id='type-id-840' size-in-bits='64' id='type-id-1610'/>
     <reference-type-def kind='lvalue' type-id='type-id-1611' size-in-bits='64' id='type-id-1612'/>
     <pointer-type-def type-id='type-id-1611' size-in-bits='64' id='type-id-1613'/>
-    <reference-type-def kind='rvalue' type-id='type-id-857' size-in-bits='64' id='type-id-1614'/>
-    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-1615'/>
-    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1616'/>
-    <reference-type-def kind='rvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1617'/>
+    <reference-type-def kind='rvalue' type-id='type-id-846' size-in-bits='64' id='type-id-1614'/>
+    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-1615'/>
+    <reference-type-def kind='lvalue' type-id='type-id-849' size-in-bits='64' id='type-id-1616'/>
+    <reference-type-def kind='rvalue' type-id='type-id-849' size-in-bits='64' id='type-id-1617'/>
     <reference-type-def kind='lvalue' type-id='type-id-1618' size-in-bits='64' id='type-id-1619'/>
     <pointer-type-def type-id='type-id-1618' size-in-bits='64' id='type-id-1620'/>
-    <reference-type-def kind='rvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1621'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-1622'/>
-    <reference-type-def kind='lvalue' type-id='type-id-869' size-in-bits='64' id='type-id-1623'/>
-    <reference-type-def kind='rvalue' type-id='type-id-869' size-in-bits='64' id='type-id-1624'/>
+    <reference-type-def kind='rvalue' type-id='type-id-855' size-in-bits='64' id='type-id-1621'/>
+    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1622'/>
+    <reference-type-def kind='lvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1623'/>
+    <reference-type-def kind='rvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1624'/>
     <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-1626'/>
     <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1627'/>
-    <reference-type-def kind='lvalue' type-id='type-id-875' size-in-bits='64' id='type-id-1628'/>
-    <pointer-type-def type-id='type-id-875' size-in-bits='64' id='type-id-1629'/>
+    <reference-type-def kind='lvalue' type-id='type-id-864' size-in-bits='64' id='type-id-1628'/>
+    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-1629'/>
     <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
-    <reference-type-def kind='lvalue' type-id='type-id-888' size-in-bits='64' id='type-id-1632'/>
-    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-1633'/>
-    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-1634'/>
-    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1635'/>
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-1636'/>
+    <reference-type-def kind='lvalue' type-id='type-id-877' size-in-bits='64' id='type-id-1632'/>
+    <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-1634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-883' size-in-bits='64' id='type-id-1635'/>
+    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-1636'/>
     <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1638'/>
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-1639'/>
-    <reference-type-def kind='rvalue' type-id='type-id-901' size-in-bits='64' id='type-id-1640'/>
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-1641'/>
+    <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-1639'/>
+    <reference-type-def kind='rvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1640'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-1641'/>
     <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1643'/>
-    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-1644'/>
+    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1644'/>
     <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1646'/>
     <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1648'/>
-    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1649'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1650'/>
+    <reference-type-def kind='lvalue' type-id='type-id-897' size-in-bits='64' id='type-id-1649'/>
+    <pointer-type-def type-id='type-id-897' size-in-bits='64' id='type-id-1650'/>
     <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
-    <reference-type-def kind='lvalue' type-id='type-id-911' size-in-bits='64' id='type-id-1653'/>
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-1654'/>
-    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-1655'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-1656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1657'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-1658'/>
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1659'/>
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-1660'/>
-    <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-1661'/>
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-1662'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1653'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-1654'/>
+    <reference-type-def kind='lvalue' type-id='type-id-903' size-in-bits='64' id='type-id-1655'/>
+    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-1656'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1657'/>
+    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-909' size-in-bits='64' id='type-id-1659'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-1660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-1662'/>
     <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-885' size-in-bits='64' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-874' size-in-bits='64' id='type-id-1665'/>
     <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
     <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-1668'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-1669'/>
-    <reference-type-def kind='rvalue' type-id='type-id-932' size-in-bits='64' id='type-id-1670'/>
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-1671'/>
-    <reference-type-def kind='lvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1672'/>
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-1673'/>
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-1674'/>
-    <reference-type-def kind='lvalue' type-id='type-id-949' size-in-bits='64' id='type-id-1675'/>
+    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-1669'/>
+    <reference-type-def kind='rvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-1671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1672'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-1673'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-1674'/>
+    <reference-type-def kind='lvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1675'/>
     <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-1677'/>
     <reference-type-def kind='lvalue' type-id='type-id-1678' size-in-bits='64' id='type-id-1679'/>
     <reference-type-def kind='lvalue' type-id='type-id-1680' size-in-bits='64' id='type-id-1681'/>
@@ -2223,47 +2223,47 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1684' size-in-bits='64' id='type-id-1685'/>
     <reference-type-def kind='lvalue' type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
     <reference-type-def kind='lvalue' type-id='type-id-1688' size-in-bits='64' id='type-id-1689'/>
-    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-1690'/>
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-1691'/>
-    <reference-type-def kind='lvalue' type-id='type-id-956' size-in-bits='64' id='type-id-1692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-956' size-in-bits='64' id='type-id-1693'/>
-    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-1694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-1690'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-1691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1692'/>
+    <reference-type-def kind='rvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1693'/>
+    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-1694'/>
     <pointer-type-def type-id='type-id-1695' size-in-bits='64' id='type-id-1696'/>
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-1697'/>
-    <reference-type-def kind='lvalue' type-id='type-id-963' size-in-bits='64' id='type-id-1698'/>
-    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-1699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-966' size-in-bits='64' id='type-id-1700'/>
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-1701'/>
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1702'/>
-    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-1703'/>
-    <reference-type-def kind='lvalue' type-id='type-id-975' size-in-bits='64' id='type-id-1704'/>
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-1705'/>
-    <reference-type-def kind='lvalue' type-id='type-id-978' size-in-bits='64' id='type-id-1706'/>
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-981' size-in-bits='64' id='type-id-1708'/>
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-1709'/>
-    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-1710'/>
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-1711'/>
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-1712'/>
-    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1713'/>
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-1714'/>
-    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1715'/>
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1716'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-1717'/>
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1718'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1008' size-in-bits='64' id='type-id-1719'/>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-1721'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1722'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1723'/>
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1724'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1725'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1020' size-in-bits='64' id='type-id-1726'/>
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1727'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1023' size-in-bits='64' id='type-id-1728'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1729'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1730'/>
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1731'/>
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-1697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-1698'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-1699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-1700'/>
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-1701'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-1702'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-1703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-1704'/>
+    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-1705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-967' size-in-bits='64' id='type-id-1706'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-1707'/>
+    <reference-type-def kind='lvalue' type-id='type-id-970' size-in-bits='64' id='type-id-1708'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-1709'/>
+    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-1710'/>
+    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-1711'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1712'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-1713'/>
+    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-1714'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-1715'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-1716'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-1717'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-1718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-997' size-in-bits='64' id='type-id-1719'/>
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-1720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1721'/>
+    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1003' size-in-bits='64' id='type-id-1723'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1724'/>
+    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1725'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1726'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1727'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-1728'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1729'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1015' size-in-bits='64' id='type-id-1730'/>
+    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1731'/>
     <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-1733'/>
     <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1735'/>
     <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-1737'/>
@@ -2271,8 +2271,8 @@ 
     <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1741'/>
     <pointer-type-def type-id='type-id-1742' size-in-bits='64' id='type-id-1743'/>
     <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-1745'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1029' size-in-bits='64' id='type-id-1746'/>
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1747'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1746'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-31' size-in-bits='64' id='type-id-1748'/>
     <reference-type-def kind='rvalue' type-id='type-id-31' size-in-bits='64' id='type-id-1749'/>
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1750'/>
@@ -2280,70 +2280,70 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1751' size-in-bits='64' id='type-id-1752'/>
     <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1753'/>
     <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1037' size-in-bits='64' id='type-id-1756'/>
-    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1757'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1758'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1759'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1052' size-in-bits='64' id='type-id-1760'/>
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1761'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1762'/>
-    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1763'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1764'/>
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1765'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1066' size-in-bits='64' id='type-id-1766'/>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1767'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1070' size-in-bits='64' id='type-id-1768'/>
-    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-1769'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1074' size-in-bits='64' id='type-id-1770'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1078' size-in-bits='64' id='type-id-1771'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1078' size-in-bits='64' id='type-id-1772'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1773'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1774'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1775'/>
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1776'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1777'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1756'/>
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1757'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1034' size-in-bits='64' id='type-id-1758'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1759'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1760'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1762'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1763'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1049' size-in-bits='64' id='type-id-1764'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1765'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-1766'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1767'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-1768'/>
+    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1769'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1063' size-in-bits='64' id='type-id-1770'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1771'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1772'/>
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1773'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1071' size-in-bits='64' id='type-id-1774'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1775'/>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1776'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1777'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1778'/>
     <pointer-type-def type-id='type-id-1779' size-in-bits='64' id='type-id-1780'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1781'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1782'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1783'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1784'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1136' size-in-bits='64' id='type-id-1785'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1136' size-in-bits='64' id='type-id-1786'/>
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1787'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1788'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1789'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1790'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1791'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1792'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1793'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1794'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1154' size-in-bits='64' id='type-id-1795'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1157' size-in-bits='64' id='type-id-1796'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1157' size-in-bits='64' id='type-id-1797'/>
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-1798'/>
-    <reference-type-def kind='rvalue' type-id='type-id-746' size-in-bits='64' id='type-id-1799'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1161' size-in-bits='64' id='type-id-1800'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1115' size-in-bits='64' id='type-id-1781'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1115' size-in-bits='64' id='type-id-1782'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1783'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1122' size-in-bits='64' id='type-id-1784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-1785'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-1786'/>
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1787'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1132' size-in-bits='64' id='type-id-1788'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1789'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1790'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1791'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1139' size-in-bits='64' id='type-id-1792'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1139' size-in-bits='64' id='type-id-1793'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1794'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1795'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1796'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1797'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1798'/>
+    <reference-type-def kind='rvalue' type-id='type-id-735' size-in-bits='64' id='type-id-1799'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1800'/>
     <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1802'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-1803'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1804'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1803'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-1804'/>
     <reference-type-def kind='rvalue' type-id='type-id-1738' size-in-bits='64' id='type-id-1805'/>
     <pointer-type-def type-id='type-id-1806' size-in-bits='64' id='type-id-1807'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1808'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1809'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1810'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1811'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1812'/>
-    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1813'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1814'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1815'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1816'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1817'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1818'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1820'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1821'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1822'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-1808'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-1809'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1810'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1811'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1812'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1813'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-1814'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-1815'/>
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1816'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1817'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1818'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1819'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1820'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1821'/>
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1822'/>
     <reference-type-def kind='lvalue' type-id='type-id-1823' size-in-bits='64' id='type-id-1824'/>
     <reference-type-def kind='lvalue' type-id='type-id-1825' size-in-bits='64' id='type-id-1826'/>
     <reference-type-def kind='rvalue' type-id='type-id-1827' size-in-bits='64' id='type-id-1828'/>
@@ -2354,67 +2354,67 @@ 
     <reference-type-def kind='rvalue' type-id='type-id-1836' size-in-bits='64' id='type-id-1837'/>
     <reference-type-def kind='rvalue' type-id='type-id-1838' size-in-bits='64' id='type-id-1839'/>
     <reference-type-def kind='rvalue' type-id='type-id-1840' size-in-bits='64' id='type-id-1841'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-1842'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1843'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-1844'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1845'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1846'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1847'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1848'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-1849'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-1850'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1851'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1204' size-in-bits='64' id='type-id-1852'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-1853'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-1854'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-1855'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-1856'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-1857'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-1858'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1859'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1860'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1861'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1862'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1863'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1864'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1865'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1866'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-1867'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-1868'/>
-    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1869'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1227' size-in-bits='64' id='type-id-1870'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1230' size-in-bits='64' id='type-id-1871'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1230' size-in-bits='64' id='type-id-1872'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-1873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1874'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-1875'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-1876'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-1877'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1250' size-in-bits='64' id='type-id-1878'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1250' size-in-bits='64' id='type-id-1879'/>
-    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-1880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1254' size-in-bits='64' id='type-id-1881'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1254' size-in-bits='64' id='type-id-1882'/>
-    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-1883'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1884'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1885'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1886'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1262' size-in-bits='64' id='type-id-1887'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1262' size-in-bits='64' id='type-id-1888'/>
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1889'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1266' size-in-bits='64' id='type-id-1890'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1269' size-in-bits='64' id='type-id-1891'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1269' size-in-bits='64' id='type-id-1892'/>
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-1893'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-1894'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1276' size-in-bits='64' id='type-id-1895'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1276' size-in-bits='64' id='type-id-1896'/>
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1897'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-1898'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1899'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1900'/>
-    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-1901'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1289' size-in-bits='64' id='type-id-1902'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1842'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1843'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1844'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1845'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1846'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1847'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1848'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1849'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1850'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1852'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1854'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1855'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1856'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1199' size-in-bits='64' id='type-id-1857'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1199' size-in-bits='64' id='type-id-1858'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-1859'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1860'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1861'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1862'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1863'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1864'/>
+    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-1865'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1209' size-in-bits='64' id='type-id-1866'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1212' size-in-bits='64' id='type-id-1867'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1212' size-in-bits='64' id='type-id-1868'/>
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-1869'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1870'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-1871'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-1872'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-1873'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1232' size-in-bits='64' id='type-id-1874'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1875'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1876'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1877'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1239' size-in-bits='64' id='type-id-1878'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1239' size-in-bits='64' id='type-id-1879'/>
+    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-1880'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1881'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1882'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-1883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1247' size-in-bits='64' id='type-id-1884'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1247' size-in-bits='64' id='type-id-1885'/>
+    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-1886'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1251' size-in-bits='64' id='type-id-1887'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1251' size-in-bits='64' id='type-id-1888'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-1889'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-1890'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1891'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1892'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1893'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1262' size-in-bits='64' id='type-id-1894'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1895'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1896'/>
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1897'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1271' size-in-bits='64' id='type-id-1898'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1899'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1900'/>
+    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-1901'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1278' size-in-bits='64' id='type-id-1902'/>
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-1903'/>
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-1904'/>
     <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-1905'/>
@@ -2425,11 +2425,11 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-1910'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-1911'/>
     <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-1912'/>
-    <pointer-type-def type-id='type-id-1913' size-in-bits='64' id='type-id-1914'/>
-    <pointer-type-def type-id='type-id-1915' size-in-bits='64' id='type-id-62'/>
-    <qualified-type-def type-id='type-id-875' volatile='yes' id='type-id-1304'/>
-    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1916'/>
-    <qualified-type-def type-id='type-id-1029' volatile='yes' id='type-id-1917'/>
+    <pointer-type-def type-id='type-id-1913' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-1914' size-in-bits='64' id='type-id-1915'/>
+    <qualified-type-def type-id='type-id-864' volatile='yes' id='type-id-1293'/>
+    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1916'/>
+    <qualified-type-def type-id='type-id-1018' volatile='yes' id='type-id-1917'/>
     <pointer-type-def type-id='type-id-1917' size-in-bits='64' id='type-id-1918'/>
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-1919'/>
     <pointer-type-def type-id='type-id-1919' size-in-bits='64' id='type-id-1920'/>
@@ -2503,29 +2503,29 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-2010' size-in-bits='64' id='type-id-2014'/>
     <pointer-type-def type-id='type-id-2010' size-in-bits='64' id='type-id-2015'/>
     <namespace-decl name='std'>
-      <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1837' column='1' id='type-id-652'>
+      <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1837' column='1' id='type-id-641'>
         <member-type access='public'>
           <class-decl name='_Base_manager&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1844' column='1' id='type-id-2016'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;mongo::Status(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE21_M_not_empty_functionIS5_EEbRKPT_' filepath='/usr/include/c++/4.9/functional' line='1935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE21_M_not_empty_functionIS5_EEbRKPT_'>
-                <parameter type-id='type-id-214'/>
+                <parameter type-id='type-id-1375'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_' filepath='/usr/include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-217'/>
+                <parameter type-id='type-id-1378'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation' filepath='/usr/include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-625'/>
+                <parameter type-id='type-id-614'/>
                 <parameter type-id='type-id-2017'/>
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -2533,21 +2533,21 @@ 
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_St17integral_constantIbLb1EE' filepath='/usr/include/c++/4.9/functional' line='1950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_St17integral_constantIbLb1EE'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-217'/>
+                <parameter type-id='type-id-1378'/>
                 <parameter type-id='type-id-2018'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-625'/>
-                <return type-id='type-id-218'/>
+                <parameter type-id='type-id-614'/>
+                <return type-id='type-id-1379'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE8_M_cloneERSt9_Any_dataRKS8_St17integral_constantIbLb1EE' filepath='/usr/include/c++/4.9/functional' line='1868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE8_M_cloneERSt9_Any_dataRKS8_St17integral_constantIbLb1EE'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-625'/>
+                <parameter type-id='type-id-614'/>
                 <parameter type-id='type-id-2018'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -2565,13 +2565,13 @@ 
           <typedef-decl name='_Manager_type' type-id='type-id-179' filepath='/usr/include/c++/4.9/functional' line='2005' column='1' id='type-id-2019'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='_M_max_size' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1840' column='1'/>
+          <var-decl name='_M_max_size' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1840' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='_M_max_align' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1841' column='1'/>
+          <var-decl name='_M_max_align' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1841' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_functor' type-id='type-id-623' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2007' column='1'/>
+          <var-decl name='_M_functor' type-id='type-id-612' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2007' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_manager' type-id='type-id-2019' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2008' column='1'/>
@@ -2607,19 +2607,19 @@ 
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2016'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFN5mongo6StatusEPNS0_18InitializerContextEEPS4_E9_M_invokeERKSt9_Any_dataS3_' filepath='/usr/include/c++/4.9/functional' line='2022' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFN5mongo6StatusEPNS0_18InitializerContextEEPS4_E9_M_invokeERKSt9_Any_dataS3_'>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-1363'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-614'/>
+            <parameter type-id='type-id-1352'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Hashtable&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='170' column='1' id='type-id-655'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-908'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
+      <class-decl name='_Hashtable&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='170' column='1' id='type-id-644'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-897'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-918'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2021'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-946'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-882'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-901'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-935'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-871'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-890'/>
         <member-type access='private'>
           <typedef-decl name='__bucket_type' type-id='type-id-1642' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='199' column='1' id='type-id-1471'/>
         </member-type>
@@ -2627,19 +2627,19 @@ 
           <typedef-decl name='__hash_code' type-id='type-id-2023' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='231' column='1' id='type-id-2022'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__hashtable_alloc' type-id='type-id-901' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1473'/>
+          <typedef-decl name='__hashtable_alloc' type-id='type-id-890' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1473'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__node_base' type-id='type-id-1645' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='198' column='1' id='type-id-1475'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__rehash_state' type-id='type-id-2024' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-659'/>
+          <typedef-decl name='__rehash_state' type-id='type-id-2024' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-648'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1017' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-662'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1006' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-651'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_equal' type-id='type-id-1074' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-665'/>
+          <typedef-decl name='key_equal' type-id='type-id-1063' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-654'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2026' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='306' column='1' id='type-id-2025'/>
@@ -2657,16 +2657,16 @@ 
           <var-decl name='_M_buckets' type-id='type-id-1472' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='313' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bucket_count' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='314' column='1'/>
+          <var-decl name='_M_bucket_count' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='314' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_before_begin' type-id='type-id-1475' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='315' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_element_count' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='316' column='1'/>
+          <var-decl name='_M_element_count' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='316' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='256'>
-          <var-decl name='_M_rehash_policy' type-id='type-id-942' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='317' column='1'/>
+          <var-decl name='_M_rehash_policy' type-id='type-id-931' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='317' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
           <var-decl name='_M_single_bucket' type-id='type-id-1471' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='325' column='1'/>
@@ -2674,20 +2674,20 @@ 
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1073'/>
+            <parameter type-id='type-id-929'/>
+            <parameter type-id='type-id-870'/>
+            <parameter type-id='type-id-1065'/>
             <parameter type-id='type-id-940'/>
-            <parameter type-id='type-id-881'/>
-            <parameter type-id='type-id-1076'/>
-            <parameter type-id='type-id-951'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1096' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-657'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2701,8 +2701,8 @@ 
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2710,24 +2710,24 @@ 
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <parameter type-id='type-id-1469'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1084'/>
-            <parameter type-id='type-id-667'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1073'/>
+            <parameter type-id='type-id-656'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2735,10 +2735,10 @@ 
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <parameter type-id='type-id-2033'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1084'/>
-            <parameter type-id='type-id-667'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1073'/>
+            <parameter type-id='type-id-656'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2750,10 +2750,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-686'>
+      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-675'>
         <member-type access='protected'>
           <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1497'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-990'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-979'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_node' type-id='type-id-1666' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
             </data-member>
@@ -2766,7 +2766,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1498' is-artificial='yes'/>
-                <parameter type-id='type-id-691'/>
+                <parameter type-id='type-id-680'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -2786,13 +2786,13 @@ 
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='_Node_alloc_type' type-id='type-id-2034' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-689'/>
+          <typedef-decl name='_Node_alloc_type' type-id='type-id-2034' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-678'/>
         </member-type>
         <member-type access='protected'>
           <typedef-decl name='_Tp_alloc_type' type-id='type-id-2036' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2035'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-984' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1130'/>
+          <typedef-decl name='allocator_type' type-id='type-id-973' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1119'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_impl' type-id='type-id-1497' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
@@ -2806,7 +2806,7 @@ 
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1496' is-artificial='yes'/>
-            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-680'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2863,10 +2863,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-692'>
+      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-681'>
         <member-type access='protected'>
           <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1503'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-993'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-982'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_node' type-id='type-id-1666' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
             </data-member>
@@ -2879,7 +2879,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1504' is-artificial='yes'/>
-                <parameter type-id='type-id-697'/>
+                <parameter type-id='type-id-686'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -2899,13 +2899,13 @@ 
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='_Node_alloc_type' type-id='type-id-2037' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-695'/>
+          <typedef-decl name='_Node_alloc_type' type-id='type-id-2037' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-684'/>
         </member-type>
         <member-type access='protected'>
           <typedef-decl name='_Tp_alloc_type' type-id='type-id-2039' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2038'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-987' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1140'/>
+          <typedef-decl name='allocator_type' type-id='type-id-976' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1129'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_impl' type-id='type-id-1503' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
@@ -2919,7 +2919,7 @@ 
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1502' is-artificial='yes'/>
-            <parameter type-id='type-id-697'/>
+            <parameter type-id='type-id-686'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2984,18 +2984,18 @@ 
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::_Identity&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-706'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::_Identity&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-695'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1516'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-996'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-985'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3006,15 +3006,15 @@ 
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1517' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-712'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-701'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1517' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1515'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3022,10 +3022,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2042' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-710'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2042' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-699'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1284' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2043'/>
+          <typedef-decl name='const_reference' type-id='type-id-1273' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2043'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Const_Link_type' type-id='type-id-1958' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2044'/>
@@ -3057,30 +3057,30 @@ 
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-708'/>
+            <parameter type-id='type-id-697'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-708'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-697'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3095,7 +3095,7 @@ 
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
             <parameter type-id='type-id-1512'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3115,18 +3115,18 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-713'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-702'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1523'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-999'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-988'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3137,15 +3137,15 @@ 
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1524' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-719'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-708'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1524' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1522'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3153,10 +3153,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2055' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-717'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2055' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-706'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1014' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-720'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1003' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-709'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Const_Link_type' type-id='type-id-1962' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2056'/>
@@ -3194,30 +3194,30 @@ 
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-715'/>
+            <parameter type-id='type-id-704'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-715'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-704'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3232,7 +3232,7 @@ 
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
             <parameter type-id='type-id-1519'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3252,18 +3252,18 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-723'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-712'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1530'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1002'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-991'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3274,15 +3274,15 @@ 
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1531' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-729'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-718'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1531' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1529'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3290,19 +3290,19 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Const_Link_type' type-id='type-id-770' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2068'/>
+          <typedef-decl name='_Const_Link_type' type-id='type-id-759' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2068'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Link_type' type-id='type-id-1546' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2069'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-727'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-716'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1020' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-730'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1009' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-719'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-735' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2071'/>
+          <typedef-decl name='const_reference' type-id='type-id-724' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2071'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2073' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2072'/>
@@ -3328,30 +3328,30 @@ 
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-714'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-725'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-714'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3366,7 +3366,7 @@ 
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
             <parameter type-id='type-id-1526'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3386,18 +3386,18 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-736'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-725'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1539'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1005'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-994'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3408,15 +3408,15 @@ 
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1540' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-742'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-731'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1540' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1538'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3436,28 +3436,28 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Const_Link_type' type-id='type-id-774' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2080'/>
+          <typedef-decl name='_Const_Link_type' type-id='type-id-763' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2080'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Link_type' type-id='type-id-1548' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2081'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2082' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-740'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2082' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-729'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-743'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1012' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-732'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-752' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2083'/>
+          <typedef-decl name='const_iterator' type-id='type-id-741' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2083'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-751' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2084'/>
+          <typedef-decl name='const_reference' type-id='type-id-740' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2084'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-761' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-758'/>
+          <typedef-decl name='iterator' type-id='type-id-750' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-747'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-746'/>
+          <typedef-decl name='key_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-735'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_reverse_iterator' type-id='type-id-2086' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2085'/>
@@ -3477,30 +3477,30 @@ 
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-738'/>
+            <parameter type-id='type-id-727'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-738'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3515,7 +3515,7 @@ 
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
             <parameter type-id='type-id-1533'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3563,13 +3563,13 @@ 
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE5beginEv' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE5beginEv'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <return type-id='type-id-758'/>
+            <return type-id='type-id-747'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE3endEv' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE3endEv'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <return type-id='type-id-758'/>
+            <return type-id='type-id-747'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -3605,7 +3605,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_counted_base&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='107' column='1' id='type-id-778'>
+      <class-decl name='_Sp_counted_base&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='107' column='1' id='type-id-767'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2040'/>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_use_count' type-id='type-id-64' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='206' column='1'/>
@@ -3622,7 +3622,7 @@ 
         <member-function access='private'>
           <function-decl name='_Sp_counted_base' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1553' is-artificial='yes'/>
-            <parameter type-id='type-id-780'/>
+            <parameter type-id='type-id-769'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3669,7 +3669,7 @@ 
           <typedef-decl name='__type' type-id='type-id-2093' filepath='/usr/include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2091'/>
         </member-type>
       </class-decl>
-      <class-decl name='__shared_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='557' column='1' id='type-id-952'>
+      <class-decl name='__shared_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='557' column='1' id='type-id-941'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_pi' type-id='type-id-1553' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='727' column='1'/>
         </data-member>
@@ -3704,7 +3704,7 @@ 
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1691' is-artificial='yes'/>
-            <parameter type-id='type-id-954'/>
+            <parameter type-id='type-id-943'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3716,12 +3716,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;mongo::optionenvironment::Constraint, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-956'>
+      <class-decl name='__shared_ptr&lt;mongo::optionenvironment::Constraint, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-945'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_ptr' type-id='type-id-1420' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-952' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-941' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3732,7 +3732,7 @@ 
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-947'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3772,12 +3772,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;bool&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-960'>
+      <class-decl name='allocator&lt;bool&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-949'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-132'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2095'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-972' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2096'/>
+              <typedef-decl name='other' type-id='type-id-961' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2096'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3790,7 +3790,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1697' is-artificial='yes'/>
-            <parameter type-id='type-id-962'/>
+            <parameter type-id='type-id-951'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3802,12 +3802,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-963'>
+      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-952'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-134'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2097'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-963' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2098'/>
+              <typedef-decl name='other' type-id='type-id-952' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2098'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3826,7 +3826,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <parameter type-id='type-id-965'/>
+            <parameter type-id='type-id-954'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3838,12 +3838,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-966'>
+      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-955'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-136'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2101'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-966' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2102'/>
+              <typedef-decl name='other' type-id='type-id-955' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2102'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3862,7 +3862,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1701' is-artificial='yes'/>
-            <parameter type-id='type-id-968'/>
+            <parameter type-id='type-id-957'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3874,7 +3874,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-969'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-958'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-138'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3885,7 +3885,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1702' is-artificial='yes'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3897,7 +3897,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;long unsigned int&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-972'>
+      <class-decl name='allocator&lt;long unsigned int&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-961'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-140'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3908,7 +3908,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
-            <parameter type-id='type-id-974'/>
+            <parameter type-id='type-id-963'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3920,12 +3920,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-975'>
+      <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-964'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-142'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2105'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-975' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2106'/>
+              <typedef-decl name='other' type-id='type-id-964' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2106'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3944,7 +3944,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1705' is-artificial='yes'/>
-            <parameter type-id='type-id-977'/>
+            <parameter type-id='type-id-966'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3956,17 +3956,17 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-978'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-967'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-144'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2109'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-978' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2110'/>
+              <typedef-decl name='other' type-id='type-id-967' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2110'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1420' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1266'/>
+          <typedef-decl name='value_type' type-id='type-id-1420' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1255'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3977,7 +3977,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1707' is-artificial='yes'/>
-            <parameter type-id='type-id-980'/>
+            <parameter type-id='type-id-969'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3989,17 +3989,17 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-981'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-970'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-146'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2111'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-981' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2112'/>
+              <typedef-decl name='other' type-id='type-id-970' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2112'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1428' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1273'/>
+          <typedef-decl name='value_type' type-id='type-id-1428' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1262'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4010,7 +4010,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1709' is-artificial='yes'/>
-            <parameter type-id='type-id-983'/>
+            <parameter type-id='type-id-972'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4022,19 +4022,19 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-984'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-973'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-148'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2113'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-984' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2036'/>
+              <typedef-decl name='other' type-id='type-id-973' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2036'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2114'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-990' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2034'/>
+              <typedef-decl name='other' type-id='type-id-979' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2034'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4047,7 +4047,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1710' is-artificial='yes'/>
-            <parameter type-id='type-id-986'/>
+            <parameter type-id='type-id-975'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4059,19 +4059,19 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-987'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-976'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-150'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2115'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-987' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2039'/>
+              <typedef-decl name='other' type-id='type-id-976' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2039'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2116'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-993' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2037'/>
+              <typedef-decl name='other' type-id='type-id-982' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2037'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4084,7 +4084,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-989'/>
+            <parameter type-id='type-id-978'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4096,7 +4096,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-990'>
+      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-979'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-152'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4107,7 +4107,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-992'/>
+            <parameter type-id='type-id-981'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4132,7 +4132,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-993'>
+      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-982'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-154'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4143,7 +4143,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <parameter type-id='type-id-995'/>
+            <parameter type-id='type-id-984'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4168,7 +4168,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-996'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-985'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4179,7 +4179,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <parameter type-id='type-id-998'/>
+            <parameter type-id='type-id-987'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4191,7 +4191,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-999'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-988'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-158'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4202,7 +4202,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <parameter type-id='type-id-1001'/>
+            <parameter type-id='type-id-990'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4214,7 +4214,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1002'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-991'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-160'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4225,7 +4225,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1716' is-artificial='yes'/>
-            <parameter type-id='type-id-1004'/>
+            <parameter type-id='type-id-993'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4237,10 +4237,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1005'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-994'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-162'/>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-771' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2117'/>
+          <typedef-decl name='value_type' type-id='type-id-760' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2117'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4251,7 +4251,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1007'/>
+            <parameter type-id='type-id-996'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4276,10 +4276,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1008'>
+      <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-997'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-894' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2118'/>
+          <typedef-decl name='value_type' type-id='type-id-883' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2118'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4290,7 +4290,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1720' is-artificial='yes'/>
-            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-999'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4302,19 +4302,19 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1011'>
+      <class-decl name='allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1000'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2119'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-996' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2120'/>
+              <typedef-decl name='other' type-id='type-id-985' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2120'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2121'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1011' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2122'/>
+              <typedef-decl name='other' type-id='type-id-1000' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2122'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4327,7 +4327,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1722' is-artificial='yes'/>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4348,7 +4348,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaISsEC2ERKS_' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISsEC2ERKS_'>
             <parameter type-id='type-id-1722' is-artificial='yes'/>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4359,12 +4359,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1014'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1003'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-168'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2123'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-999' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2124'/>
+              <typedef-decl name='other' type-id='type-id-988' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2124'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4383,7 +4383,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1724' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1005'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4395,7 +4395,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1017'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1006'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-170'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4406,7 +4406,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1725' is-artificial='yes'/>
-            <parameter type-id='type-id-1019'/>
+            <parameter type-id='type-id-1008'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4418,17 +4418,17 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1020'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1009'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-172'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2128'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1002' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2129'/>
+              <typedef-decl name='other' type-id='type-id-991' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2129'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1177' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-733'/>
+          <typedef-decl name='value_type' type-id='type-id-1166' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-722'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4439,7 +4439,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1727' is-artificial='yes'/>
-            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1011'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4451,17 +4451,17 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1023'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1012'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-174'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2130'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1005' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2131'/>
+              <typedef-decl name='other' type-id='type-id-994' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2131'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1181' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-749'/>
+          <typedef-decl name='value_type' type-id='type-id-1170' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-738'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4472,7 +4472,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1729' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1014'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4484,17 +4484,17 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1026'>
+      <class-decl name='allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1015'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-176'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2132'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1026' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2133'/>
+              <typedef-decl name='other' type-id='type-id-1015' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2133'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1200' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1289'/>
+          <typedef-decl name='value_type' type-id='type-id-1189' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1278'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4505,7 +4505,7 @@ 
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1731' is-artificial='yes'/>
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1017'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4527,7 +4527,7 @@ 
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-31'>
         <member-type access='private'>
           <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-1754'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-969'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_p' type-id='type-id-39' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='277' column='1'/>
             </data-member>
@@ -4535,20 +4535,20 @@ 
               <function-decl name='_Alloc_hider' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1755' is-artificial='yes'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-971'/>
+                <parameter type-id='type-id-960'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-1037'>
+          <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-1026'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2134'/>
             <data-member access='public' static='yes'>
-              <var-decl name='_S_max_size' type-id='type-id-1041' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='50' column='1'/>
+              <var-decl name='_S_max_size' type-id='type-id-1030' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='50' column='1'/>
             </data-member>
             <data-member access='public' static='yes'>
-              <var-decl name='_S_terminal' type-id='type-id-332' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='55' column='1'/>
+              <var-decl name='_S_terminal' type-id='type-id-321' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='55' column='1'/>
             </data-member>
             <data-member access='public' static='yes'>
               <var-decl name='_S_empty_rep_storage' type-id='type-id-100' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='66' column='1'/>
@@ -4558,10 +4558,10 @@ 
         <member-type access='private'>
           <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-2134'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_length' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='150' column='1'/>
+              <var-decl name='_M_length' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='150' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_capacity' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='151' column='1'/>
+              <var-decl name='_M_capacity' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='151' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <var-decl name='_M_refcount' type-id='type-id-64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='152' column='1'/>
@@ -4569,7 +4569,7 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-969' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-2135'/>
+          <typedef-decl name='allocator_type' type-id='type-id-958' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-2135'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-120' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-2136'/>
@@ -4584,7 +4584,7 @@ 
           <typedef-decl name='reference' type-id='type-id-2141' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-2140'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-1280' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-1040'/>
+          <typedef-decl name='size_type' type-id='type-id-1269' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-1029'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_reverse_iterator' type-id='type-id-2143' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-2142'/>
@@ -4593,7 +4593,7 @@ 
           <typedef-decl name='reverse_iterator' type-id='type-id-2145' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-2144'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='npos' type-id='type-id-1041' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='285' column='1'/>
+          <var-decl name='npos' type-id='type-id-1030' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='285' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_dataplus' type-id='type-id-1754' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='289' column='1'/>
@@ -4607,33 +4607,33 @@ 
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1022'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='467' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1040'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1029'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4641,8 +4641,8 @@ 
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4650,16 +4650,16 @@ 
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
+            <parameter type-id='type-id-1029'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4673,8 +4673,8 @@ 
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1089'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-1078'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4686,11 +4686,11 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;mongo::Status(mongo::InitializerContext*)&gt;' size-in-bits='256' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2142' column='1' id='type-id-1078'>
+      <class-decl name='function&lt;mongo::Status(mongo::InitializerContext*)&gt;' size-in-bits='256' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2142' column='1' id='type-id-1067'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2146'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-652'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-641'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-210' filepath='/usr/include/c++/4.9/functional' line='2398' column='1' id='type-id-2147'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1371' filepath='/usr/include/c++/4.9/functional' line='2398' column='1' id='type-id-2147'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2147' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2399' column='1'/>
@@ -4710,7 +4710,7 @@ 
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/include/c++/4.9/functional' line='2404' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1773' is-artificial='yes'/>
-            <parameter type-id='type-id-1080'/>
+            <parameter type-id='type-id-1069'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4724,36 +4724,36 @@ 
         <member-function access='public'>
           <function-decl name='function&lt;mongo::Status (*)(mongo::InitializerContext*), void&gt;' filepath='/usr/include/c++/4.9/functional' line='2418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1773' is-artificial='yes'/>
-            <parameter type-id='type-id-212'/>
+            <parameter type-id='type-id-1373'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;mongo::Status (*)(mongo::InitializerContext*), void&gt;' mangled-name='_ZNSt8functionIFN5mongo6StatusEPNS0_18InitializerContextEEEC2IPS4_vEET_' filepath='/usr/include/c++/4.9/functional' line='2418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFN5mongo6StatusEPNS0_18InitializerContextEEEC2IPS4_vEET_'>
             <parameter type-id='type-id-1773' is-artificial='yes'/>
-            <parameter type-id='type-id-212'/>
+            <parameter type-id='type-id-1373'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;bool&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1086'>
+      <class-decl name='initializer_list&lt;bool&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1075'>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-316' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2148'/>
+          <typedef-decl name='const_iterator' type-id='type-id-305' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2148'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-316' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2149'/>
+          <typedef-decl name='iterator' type-id='type-id-305' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2149'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-2149' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-2148'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4764,7 +4764,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1089'>
+      <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1078'>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-59' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2150'/>
         </member-type>
@@ -4775,13 +4775,13 @@ 
           <var-decl name='_M_array' type-id='type-id-2151' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1776' is-artificial='yes'/>
             <parameter type-id='type-id-2150'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4792,24 +4792,24 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1092'>
+      <class-decl name='initializer_list&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1081'>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-1034' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2152'/>
+          <typedef-decl name='const_iterator' type-id='type-id-1023' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2152'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-1034' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2153'/>
+          <typedef-decl name='iterator' type-id='type-id-1023' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2153'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-2153' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1777' is-artificial='yes'/>
             <parameter type-id='type-id-2152'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4820,24 +4820,24 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1095'>
+      <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1084'>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-1184' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2154'/>
+          <typedef-decl name='const_iterator' type-id='type-id-1173' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2154'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-1184' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2155'/>
+          <typedef-decl name='iterator' type-id='type-id-1173' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2155'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-2155' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1778' is-artificial='yes'/>
             <parameter type-id='type-id-2154'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4848,8 +4848,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1126'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-686'/>
+      <class-decl name='list&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1115'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-675'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2157' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2156'/>
         </member-type>
@@ -4857,7 +4857,7 @@ 
           <typedef-decl name='reference' type-id='type-id-2159' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2158'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-545' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1133'/>
+          <typedef-decl name='value_type' type-id='type-id-534' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1122'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2161' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2160'/>
@@ -4880,30 +4880,30 @@ 
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1121'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1135'/>
-            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1124'/>
+            <parameter type-id='type-id-1121'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1128'/>
+            <parameter type-id='type-id-1117'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4918,7 +4918,7 @@ 
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
             <parameter type-id='type-id-2168'/>
-            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1121'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4929,8 +4929,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1136'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-692'/>
+      <class-decl name='list&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1125'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-681'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2170' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2169'/>
         </member-type>
@@ -4938,7 +4938,7 @@ 
           <typedef-decl name='reference' type-id='type-id-2172' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2171'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-549' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1143'/>
+          <typedef-decl name='value_type' type-id='type-id-538' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1132'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2174' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2173'/>
@@ -4961,30 +4961,30 @@ 
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1142'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1145'/>
-            <parameter type-id='type-id-1142'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1134'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1127'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4999,7 +4999,7 @@ 
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
             <parameter type-id='type-id-2181'/>
-            <parameter type-id='type-id-1142'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5010,9 +5010,9 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1146'>
+      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1135'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-713' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2182'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-702' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2182'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-2183'/>
@@ -5047,15 +5047,15 @@ 
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-1148'/>
+            <parameter type-id='type-id-1137'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5070,23 +5070,23 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
             <parameter type-id='type-id-2188'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-1148'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5094,7 +5094,7 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
             <parameter type-id='type-id-1790'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5102,17 +5102,17 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
             <parameter type-id='type-id-2188'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1150'>
+      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1139'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-723' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2189'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-712' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2189'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='mapped_type' type-id='type-id-553' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1154'/>
+          <typedef-decl name='mapped_type' type-id='type-id-542' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1143'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-2190'/>
@@ -5141,15 +5141,15 @@ 
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-1152'/>
+            <parameter type-id='type-id-1141'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5164,23 +5164,23 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
             <parameter type-id='type-id-2195'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-1152'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1141'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5188,7 +5188,7 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
             <parameter type-id='type-id-1793'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5196,26 +5196,26 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
             <parameter type-id='type-id-2195'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1157'>
+      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1146'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-736' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2196'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-725' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2196'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2083' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='150' column='1' id='type-id-2197'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-758' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2198'/>
+          <typedef-decl name='iterator' type-id='type-id-747' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2198'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_compare' type-id='type-id-1122' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2199'/>
+          <typedef-decl name='key_compare' type-id='type-id-1111' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2199'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='mapped_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1161'/>
+          <typedef-decl name='mapped_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1150'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-2200'/>
@@ -5238,15 +5238,15 @@ 
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-1148'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5260,24 +5260,24 @@ 
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1095'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1159'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1148'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5285,15 +5285,15 @@ 
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
             <parameter type-id='type-id-1797'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1095'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5318,49 +5318,49 @@ 
       </class-decl>
       <class-decl name='mersenne_twister_engine&lt;long unsigned int, 32ul, 624ul, 397ul, 31ul, 2567483615ul, 11ul, 4294967295ul, 7ul, 2636928640ul, 15ul, 4022730752ul, 18ul, 1812433253ul&gt;' size-in-bits='40000' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='451' column='1' id='type-id-1801'>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-1164'/>
+          <typedef-decl name='result_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-1153'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='word_size' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='485' column='1'/>
+          <var-decl name='word_size' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='485' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='state_size' type-id='type-id-622' mangled-name='_ZNSt23mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EE10state_sizeE' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='486' column='1'/>
+          <var-decl name='state_size' type-id='type-id-611' mangled-name='_ZNSt23mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EE10state_sizeE' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='486' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='shift_size' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='487' column='1'/>
+          <var-decl name='shift_size' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='487' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='mask_bits' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='488' column='1'/>
+          <var-decl name='mask_bits' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='488' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='xor_mask' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='489' column='1'/>
+          <var-decl name='xor_mask' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='489' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_u' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='490' column='1'/>
+          <var-decl name='tempering_u' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='490' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_d' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='491' column='1'/>
+          <var-decl name='tempering_d' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='491' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_s' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='492' column='1'/>
+          <var-decl name='tempering_s' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='492' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_b' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='493' column='1'/>
+          <var-decl name='tempering_b' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='493' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_t' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='494' column='1'/>
+          <var-decl name='tempering_t' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='494' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_c' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='495' column='1'/>
+          <var-decl name='tempering_c' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='495' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_l' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='496' column='1'/>
+          <var-decl name='tempering_l' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='496' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='initialization_multiplier' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='497' column='1'/>
+          <var-decl name='initialization_multiplier' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='497' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='default_seed' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='498' column='1'/>
+          <var-decl name='default_seed' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='498' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_x' type-id='type-id-98' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='621' column='1'/>
@@ -5371,12 +5371,12 @@ 
         <member-function access='public'>
           <function-decl name='mersenne_twister_engine' filepath='/usr/include/c++/4.9/bits/random.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1802' is-artificial='yes'/>
-            <parameter type-id='type-id-1164'/>
+            <parameter type-id='type-id-1153'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='move_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-1166'>
+      <class-decl name='move_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-1155'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-1805' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-2203'/>
         </member-type>
@@ -5411,24 +5411,24 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNKSt13move_iteratorIPSsEdeEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPSsEdeEv'>
-            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <return type-id='type-id-2203'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='base' mangled-name='_ZNKSt13move_iteratorIPSsE4baseEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPSsE4baseEv'>
-            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <return type-id='type-id-2204'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Bit_const_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1188'>
+      <class-decl name='reverse_iterator&lt;std::_Bit_const_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1177'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2205'/>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-2207' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='111' column='1' id='type-id-2206'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_type' type-id='type-id-628' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2208'/>
+          <typedef-decl name='iterator_type' type-id='type-id-617' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2208'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2210' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='112' column='1' id='type-id-2209'/>
@@ -5437,7 +5437,7 @@ 
           <typedef-decl name='reference' type-id='type-id-2212' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='113' column='1' id='type-id-2211'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='current' type-id='type-id-628' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
+          <var-decl name='current' type-id='type-id-617' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5455,15 +5455,15 @@ 
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1179'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Bit_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1192'>
+      <class-decl name='reverse_iterator&lt;std::_Bit_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1181'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2213'/>
         <member-type access='public'>
-          <typedef-decl name='iterator_type' type-id='type-id-631' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2214'/>
+          <typedef-decl name='iterator_type' type-id='type-id-620' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2214'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2216' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='112' column='1' id='type-id-2215'/>
@@ -5472,7 +5472,7 @@ 
           <typedef-decl name='reference' type-id='type-id-2218' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='113' column='1' id='type-id-2217'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='current' type-id='type-id-631' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
+          <var-decl name='current' type-id='type-id-620' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5490,17 +5490,17 @@ 
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1845' is-artificial='yes'/>
-            <parameter type-id='type-id-1194'/>
+            <parameter type-id='type-id-1183'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='set&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='90' column='1' id='type-id-1196'>
+      <class-decl name='set&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='90' column='1' id='type-id-1185'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-706' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='115' column='1' id='type-id-2219'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-695' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='115' column='1' id='type-id-2219'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_compare' type-id='type-id-1122' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='106' column='1' id='type-id-2220'/>
+          <typedef-decl name='value_compare' type-id='type-id-1111' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='106' column='1' id='type-id-2220'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2047' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='131' column='1' id='type-id-2221'/>
@@ -5523,15 +5523,15 @@ 
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1198'/>
+            <parameter type-id='type-id-1187'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5545,24 +5545,24 @@ 
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1092'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1198'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1187'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5570,21 +5570,21 @@ 
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
             <parameter type-id='type-id-1847'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1092'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;mongo::optionenvironment::Constraint&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1200'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-956'/>
+      <class-decl name='shared_ptr&lt;mongo::optionenvironment::Constraint&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1189'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1851' is-artificial='yes'/>
@@ -5594,7 +5594,7 @@ 
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-1202'/>
+            <parameter type-id='type-id-1191'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5620,8 +5620,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1207'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-782'/>
+      <class-decl name='tuple&lt;mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1196'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-771'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1856' is-artificial='yes'/>
@@ -5631,15 +5631,15 @@ 
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1856' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1325'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1856' is-artificial='yes'/>
-            <parameter type-id='type-id-1209'/>
+            <parameter type-id='type-id-1198'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5651,8 +5651,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1210'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-788'/>
+      <class-decl name='tuple&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1199'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-777'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1859' is-artificial='yes'/>
@@ -5663,14 +5663,14 @@ 
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1859' is-artificial='yes'/>
             <parameter type-id='type-id-2224'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1859' is-artificial='yes'/>
-            <parameter type-id='type-id-1212'/>
+            <parameter type-id='type-id-1201'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5682,8 +5682,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;unsigned int, unsigned int&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1213'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-794'/>
+      <class-decl name='tuple&lt;unsigned int, unsigned int&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1202'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-783'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1862' is-artificial='yes'/>
@@ -5693,15 +5693,15 @@ 
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1862' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1862' is-artificial='yes'/>
-            <parameter type-id='type-id-1215'/>
+            <parameter type-id='type-id-1204'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5713,19 +5713,19 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;mongo::BSONObjBuilder, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1216'>
+      <class-decl name='unique_ptr&lt;mongo::BSONObjBuilder, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1205'>
         <member-type access='private'>
           <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2225'>
             <member-type access='public'>
-              <typedef-decl name='type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2226'/>
+              <typedef-decl name='type' type-id='type-id-1323' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2226'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1207' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2227'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1196' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2227'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='deleter_type' type-id='type-id-1066' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1220'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1055' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1209'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2226' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2228'/>
@@ -5785,7 +5785,7 @@ 
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <parameter type-id='type-id-1218'/>
+            <parameter type-id='type-id-1207'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5803,7 +5803,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1223'>
+      <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1212'>
         <member-type access='private'>
           <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2230'>
             <member-type access='public'>
@@ -5812,10 +5812,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1210' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2233'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1199' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2233'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='deleter_type' type-id='type-id-1070' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1227'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1059' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1216'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2231' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2234'/>
@@ -5875,47 +5875,47 @@ 
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <parameter type-id='type-id-1225'/>
+            <parameter type-id='type-id-1214'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEcvbEv' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEcvbEv'>
-            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEdeEv' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEdeEv'>
-            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-2236'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EE3getEv' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EE3getEv'>
-            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-2234'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unordered_map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1230'>
+      <class-decl name='unordered_map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1219'>
         <member-type access='private'>
           <typedef-decl name='_Hashtable' type-id='type-id-2238' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='100' column='1' id='type-id-2237'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-662' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1234'/>
+          <typedef-decl name='allocator_type' type-id='type-id-651' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1223'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='hasher' type-id='type-id-2239' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1237'/>
+          <typedef-decl name='hasher' type-id='type-id-2239' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1226'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_equal' type-id='type-id-665' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1240'/>
+          <typedef-decl name='key_equal' type-id='type-id-654' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1229'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='mapped_type' type-id='type-id-935' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1243'/>
+          <typedef-decl name='mapped_type' type-id='type-id-924' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1232'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-1040' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2240'/>
+          <typedef-decl name='size_type' type-id='type-id-1029' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2240'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2025' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='122' column='1' id='type-id-2241'/>
@@ -5936,16 +5936,16 @@ 
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-2240'/>
-            <parameter type-id='type-id-1239'/>
-            <parameter type-id='type-id-1242'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1228'/>
+            <parameter type-id='type-id-1231'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1232'/>
+            <parameter type-id='type-id-1221'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5959,15 +5959,15 @@ 
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1232'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5975,7 +5975,7 @@ 
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-1872'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5984,23 +5984,23 @@ 
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-2033'/>
             <parameter type-id='type-id-2240'/>
-            <parameter type-id='type-id-1239'/>
-            <parameter type-id='type-id-1242'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1228'/>
+            <parameter type-id='type-id-1231'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;bool, std::allocator&lt;bool&gt; &gt;' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='526' column='1' id='type-id-1246'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-643'/>
+      <class-decl name='vector&lt;bool, std::allocator&lt;bool&gt; &gt;' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='526' column='1' id='type-id-1235'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-632'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='539' column='1' id='type-id-2245'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-1188' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='544' column='1' id='type-id-2246'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-1177' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='544' column='1' id='type-id-2246'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-1192' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='545' column='1' id='type-id-2247'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-1181' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='545' column='1' id='type-id-2247'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='558' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6011,31 +6011,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='562' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='567' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='571' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-315'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-304'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1248'/>
+            <parameter type-id='type-id-1237'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6049,8 +6049,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1086'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-1075'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6062,8 +6062,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1250'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-812'/>
+      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1239'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-801'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2249' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2248'/>
         </member-type>
@@ -6097,31 +6097,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1986'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1252'/>
+            <parameter type-id='type-id-1241'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6135,8 +6135,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1252'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-1241'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6144,7 +6144,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
             <parameter type-id='type-id-1879'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6152,7 +6152,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
             <parameter type-id='type-id-2262'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6164,8 +6164,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1254'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-821'/>
+      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1243'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-810'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2264' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2263'/>
         </member-type>
@@ -6199,31 +6199,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1989'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1256'/>
+            <parameter type-id='type-id-1245'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6237,8 +6237,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1256'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-1245'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6246,7 +6246,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
             <parameter type-id='type-id-1882'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6254,7 +6254,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
             <parameter type-id='type-id-2277'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6266,8 +6266,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1258'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-830'/>
+      <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1247'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-819'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2279' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2278'/>
         </member-type>
@@ -6301,31 +6301,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1992'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1260'/>
+            <parameter type-id='type-id-1249'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6339,8 +6339,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1260'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-1249'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6348,7 +6348,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
             <parameter type-id='type-id-1885'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6356,7 +6356,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
             <parameter type-id='type-id-2292'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6368,8 +6368,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1262'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-839'/>
+      <class-decl name='vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1251'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-828'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2294' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2293'/>
         </member-type>
@@ -6400,31 +6400,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1268'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1257'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1264'/>
+            <parameter type-id='type-id-1253'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6438,8 +6438,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1264'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-1253'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6447,7 +6447,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
             <parameter type-id='type-id-1888'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6455,7 +6455,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
             <parameter type-id='type-id-2307'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6467,8 +6467,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1269'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-848'/>
+      <class-decl name='vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1258'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-837'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2309' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2308'/>
         </member-type>
@@ -6499,31 +6499,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1275'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1264'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1271'/>
+            <parameter type-id='type-id-1260'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6537,8 +6537,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1271'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-1260'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6546,7 +6546,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
             <parameter type-id='type-id-1892'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6554,7 +6554,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
             <parameter type-id='type-id-2322'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6566,8 +6566,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1276'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-857'/>
+      <class-decl name='vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1265'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-846'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-126' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2323'/>
         </member-type>
@@ -6598,31 +6598,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1284'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1273'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
+            <parameter type-id='type-id-1267'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6636,8 +6636,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1267'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6645,15 +6645,15 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
             <parameter type-id='type-id-1896'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1092'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6693,19 +6693,19 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorISsSaISsEE4sizeEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE4sizeEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorISsSaISsEE5beginEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE5beginEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
             <return type-id='type-id-2323'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorISsSaISsEE3endEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE3endEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
             <return type-id='type-id-2323'/>
           </function-decl>
         </member-function>
@@ -6734,35 +6734,35 @@ 
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorISsSaISsEEC2ERKS0_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISsSaISsEEC2ERKS0_'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorISsSaISsEE12_M_check_lenEmPKc' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE12_M_check_lenEmPKc'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-1280'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNKSt6vectorISsSaISsEE8max_sizeEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE8max_sizeEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorISsSaISsEEaSERKS1_' filepath='/usr/include/c++/4.9/bits/vector.tcc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISsSaISsEEaSERKS1_'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
+            <parameter type-id='type-id-1267'/>
             <return type-id='type-id-1895'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorISsSaISsEEixEm' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEEixEm'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-2324'/>
           </function-decl>
         </member-function>
@@ -6774,14 +6774,14 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='capacity' mangled-name='_ZNKSt6vectorISsSaISsEE8capacityEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE8capacityEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZNSt6vectorISsSaISsEE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKSsS1_EEEEPSsmT_S9_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='1221' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISsSaISsEE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKSsS1_EEEEPSsmT_S9_'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-126'/>
             <parameter type-id='type-id-126'/>
             <return type-id='type-id-2327'/>
@@ -6807,8 +6807,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1285'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-866'/>
+      <class-decl name='vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1274'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-855'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2336' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2335'/>
         </member-type>
@@ -6839,31 +6839,31 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1291'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-1287'/>
+            <parameter type-id='type-id-1276'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6877,8 +6877,8 @@ 
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-1287'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-1276'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6886,7 +6886,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
             <parameter type-id='type-id-1900'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6894,7 +6894,7 @@ 
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
             <parameter type-id='type-id-2349'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6944,13 +6944,13 @@ 
         <enumerator name='memory_order_acq_rel' value='4'/>
         <enumerator name='memory_order_seq_cst' value='5'/>
       </enum-decl>
-      <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='300' column='1' id='type-id-628'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='300' column='1' id='type-id-617'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-624'/>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-628' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='305' column='1' id='type-id-1451'/>
+          <typedef-decl name='const_iterator' type-id='type-id-617' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='305' column='1' id='type-id-1451'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-316' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='304' column='1' id='type-id-2353'/>
+          <typedef-decl name='pointer' type-id='type-id-305' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='304' column='1' id='type-id-2353'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='302' column='1' id='type-id-2354'/>
@@ -6972,21 +6972,21 @@ 
         <member-function access='public' constructor='yes'>
           <function-decl name='_Bit_const_iterator' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-633'/>
+            <parameter type-id='type-id-622'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='214' column='1' id='type-id-631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='214' column='1' id='type-id-620'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-624'/>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-631' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='218' column='1' id='type-id-1454'/>
+          <typedef-decl name='iterator' type-id='type-id-620' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='218' column='1' id='type-id-1454'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1458' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='217' column='1' id='type-id-2355'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-639' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='216' column='1' id='type-id-2356'/>
+          <typedef-decl name='reference' type-id='type-id-628' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='216' column='1' id='type-id-2356'/>
         </member-type>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Bit_iterator' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7003,7 +7003,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bit_iterator_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='136' column='1' id='type-id-635'>
+      <class-decl name='_Bit_iterator_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='136' column='1' id='type-id-624'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2357'/>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_p' type-id='type-id-1460' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='139' column='1'/>
@@ -7020,7 +7020,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bit_reference' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='70' column='1' id='type-id-639'>
+      <class-decl name='_Bit_reference' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='70' column='1' id='type-id-628'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_p' type-id='type-id-1460' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='72' column='1'/>
         </data-member>
@@ -7042,15 +7042,15 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='411' column='1' id='type-id-643'>
+      <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='411' column='1' id='type-id-632'>
         <member-type access='public'>
           <class-decl name='_Bvector_impl' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='416' column='1' id='type-id-1465'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-972'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-961'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-631' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='419' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-620' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='419' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_finish' type-id='type-id-631' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='420' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-620' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='420' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='256'>
               <var-decl name='_M_end_of_storage' type-id='type-id-1460' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='421' column='1'/>
@@ -7064,7 +7064,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Bvector_impl' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1466' is-artificial='yes'/>
-                <parameter type-id='type-id-648'/>
+                <parameter type-id='type-id-637'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -7078,10 +7078,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Bit_alloc_type' type-id='type-id-2096' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='414' column='1' id='type-id-646'/>
+          <typedef-decl name='_Bit_alloc_type' type-id='type-id-2096' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='414' column='1' id='type-id-635'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-960' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='440' column='1' id='type-id-649'/>
+          <typedef-decl name='allocator_type' type-id='type-id-949' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='440' column='1' id='type-id-638'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_impl' type-id='type-id-1465' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='477' column='1'/>
@@ -7095,7 +7095,7 @@ 
         <member-function access='public'>
           <function-decl name='_Bvector_base' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1462' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7137,9 +7137,9 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, mongo::BSONObjBuilder*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-668'>
+      <class-decl name='_Head_base&lt;0ul, mongo::BSONObjBuilder*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-657'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1334' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1323' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7150,14 +7150,14 @@ 
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1479' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1325'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1479' is-artificial='yes'/>
-            <parameter type-id='type-id-670'/>
+            <parameter type-id='type-id-659'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7179,11 +7179,11 @@ 
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo14BSONObjBuilderELb0EE7_M_headERS3_' filepath='/usr/include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo14BSONObjBuilderELb0EE7_M_headERS3_'>
             <parameter type-id='type-id-1477'/>
-            <return type-id='type-id-1337'/>
+            <return type-id='type-id-1326'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-671'>
+      <class-decl name='_Head_base&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-660'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-2232' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
@@ -7203,7 +7203,7 @@ 
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1482' is-artificial='yes'/>
-            <parameter type-id='type-id-673'/>
+            <parameter type-id='type-id-662'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7224,12 +7224,12 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEELb0EE7_M_headERKS6_' filepath='/usr/include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEELb0EE7_M_headERKS6_'>
-            <parameter type-id='type-id-673'/>
+            <parameter type-id='type-id-662'/>
             <return type-id='type-id-2224'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-674'>
+      <class-decl name='_Head_base&lt;0ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-663'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-50' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
@@ -7242,14 +7242,14 @@ 
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1485' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1485' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
+            <parameter type-id='type-id-665'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7269,8 +7269,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-677'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
+      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-666'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1055'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1488' is-artificial='yes'/>
@@ -7280,14 +7280,14 @@ 
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1488' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1488' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
+            <parameter type-id='type-id-668'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7313,8 +7313,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-680'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1070'/>
+      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-669'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1059'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
@@ -7324,14 +7324,14 @@ 
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-682'/>
+            <parameter type-id='type-id-671'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7351,7 +7351,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-683'>
+      <class-decl name='_Head_base&lt;1ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-672'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-50' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
@@ -7364,14 +7364,14 @@ 
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-685'/>
+            <parameter type-id='type-id-674'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7432,36 +7432,36 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='2496' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-698'>
+      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='2496' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-687'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1666'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_data' type-id='type-id-545' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-534' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-702'>
+      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-691'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1666'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_data' type-id='type-id-549' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-538' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::Status, mongo::InitializerContext*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/functional' line='499' column='1' id='type-id-2146'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2369'/>
       </class-decl>
-      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='242' column='1' id='type-id-752'>
+      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='242' column='1' id='type-id-741'>
         <member-type access='public'>
           <typedef-decl name='_Base_ptr' type-id='type-id-2371' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='254' column='1' id='type-id-2370'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Link_type' type-id='type-id-774' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='255' column='1' id='type-id-2372'/>
+          <typedef-decl name='_Link_type' type-id='type-id-763' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='255' column='1' id='type-id-2372'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-752' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='253' column='1' id='type-id-755'/>
+          <typedef-decl name='_Self' type-id='type-id-741' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='253' column='1' id='type-id-744'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1184' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='246' column='1' id='type-id-2373'/>
+          <typedef-decl name='pointer' type-id='type-id-1173' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='246' column='1' id='type-id-2373'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1183' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='245' column='1' id='type-id-2374'/>
+          <typedef-decl name='reference' type-id='type-id-1172' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='245' column='1' id='type-id-2374'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-2370' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='318' column='1'/>
@@ -7482,17 +7482,17 @@ 
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <parameter type-id='type-id-760'/>
+            <parameter type-id='type-id-749'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='172' column='1' id='type-id-761'>
+      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='172' column='1' id='type-id-750'>
         <member-type access='public'>
           <typedef-decl name='_Base_ptr' type-id='type-id-1535' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='182' column='1' id='type-id-2375'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-761' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='181' column='1' id='type-id-764'/>
+          <typedef-decl name='_Self' type-id='type-id-750' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='181' column='1' id='type-id-753'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-2375' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='238' column='1'/>
@@ -7512,8 +7512,8 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEneERKS3_' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEneERKS3_'>
-            <parameter type-id='type-id-763' is-artificial='yes'/>
-            <parameter type-id='type-id-766'/>
+            <parameter type-id='type-id-752' is-artificial='yes'/>
+            <parameter type-id='type-id-755'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -7521,12 +7521,12 @@ 
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEppEi' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEppEi'>
             <parameter type-id='type-id-1543' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-764'/>
+            <return type-id='type-id-753'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEptEv' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEptEv'>
-            <parameter type-id='type-id-763' is-artificial='yes'/>
+            <parameter type-id='type-id-752' is-artificial='yes'/>
             <return type-id='type-id-2376'/>
           </function-decl>
         </member-function>
@@ -7538,14 +7538,14 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-767'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-775'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-756'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-764'/>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='_M_storage' type-id='type-id-108' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='147' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-771'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-775'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-760'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-764'/>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='_M_storage' type-id='type-id-110' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='147' column='1'/>
         </data-member>
@@ -7556,12 +7556,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='92' column='1' id='type-id-775'>
+      <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='92' column='1' id='type-id-764'>
         <member-type access='public'>
           <typedef-decl name='_Base_ptr' type-id='type-id-1549' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='94' column='1' id='type-id-1535'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Const_Base_ptr' type-id='type-id-777' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='95' column='1' id='type-id-2371'/>
+          <typedef-decl name='_Const_Base_ptr' type-id='type-id-766' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='95' column='1' id='type-id-2371'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_color' type-id='type-id-2351' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='97' column='1'/>
@@ -7576,11 +7576,11 @@ 
           <var-decl name='_M_right' type-id='type-id-1535' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='100' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-782'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-800'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-668'/>
+      <class-decl name='_Tuple_impl&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-771'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-789'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-657'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-800' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-785'/>
+          <typedef-decl name='_Inherited' type-id='type-id-789' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-774'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7591,15 +7591,15 @@ 
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1325'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-784'/>
+            <parameter type-id='type-id-773'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7613,15 +7613,15 @@ 
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEE7_M_headERS5_' filepath='/usr/include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEE7_M_headERS5_'>
             <parameter type-id='type-id-1554'/>
-            <return type-id='type-id-1337'/>
+            <return type-id='type-id-1326'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-788'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-803'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-671'/>
+      <class-decl name='_Tuple_impl&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-777'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-792'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-660'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-803' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-791'/>
+          <typedef-decl name='_Inherited' type-id='type-id-792' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-780'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7633,14 +7633,14 @@ 
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1560' is-artificial='yes'/>
             <parameter type-id='type-id-2224'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1560' is-artificial='yes'/>
-            <parameter type-id='type-id-790'/>
+            <parameter type-id='type-id-779'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7653,16 +7653,16 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEE7_M_headERKS8_' filepath='/usr/include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEE7_M_headERKS8_'>
-            <parameter type-id='type-id-790'/>
+            <parameter type-id='type-id-779'/>
             <return type-id='type-id-2224'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-794'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-806'/>
-        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-674'/>
+      <class-decl name='_Tuple_impl&lt;0ul, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-783'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-795'/>
+        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-663'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-806' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-797'/>
+          <typedef-decl name='_Inherited' type-id='type-id-795' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-786'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7673,15 +7673,15 @@ 
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-796'/>
+            <parameter type-id='type-id-785'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7693,9 +7693,9 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-800'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-789'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1576'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-677'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-666'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1568' is-artificial='yes'/>
@@ -7705,14 +7705,14 @@ 
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1568' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1568' is-artificial='yes'/>
-            <parameter type-id='type-id-802'/>
+            <parameter type-id='type-id-791'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7730,9 +7730,9 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-803'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-792'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1576'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-680'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-669'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1571' is-artificial='yes'/>
@@ -7742,14 +7742,14 @@ 
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1571' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1571' is-artificial='yes'/>
-            <parameter type-id='type-id-805'/>
+            <parameter type-id='type-id-794'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7761,11 +7761,11 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-806'>
+      <class-decl name='_Tuple_impl&lt;1ul, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-795'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1576'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-683'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-672'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1576' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-809'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1576' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-798'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7776,14 +7776,14 @@ 
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-808'/>
+            <parameter type-id='type-id-797'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7803,10 +7803,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-812'>
+      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-801'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1583'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-952'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2257' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -7825,7 +7825,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1585' is-artificial='yes'/>
-                <parameter type-id='type-id-817'/>
+                <parameter type-id='type-id-806'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -7839,10 +7839,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2377' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-815'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2377' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-804'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-963' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-818'/>
+          <typedef-decl name='allocator_type' type-id='type-id-952' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-807'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2378' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2257'/>
@@ -7859,7 +7859,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7874,7 +7874,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7896,7 +7896,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
             <parameter type-id='type-id-1579'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7908,10 +7908,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-821'>
+      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-810'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1590'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-966'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2272' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -7930,7 +7930,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1592' is-artificial='yes'/>
-                <parameter type-id='type-id-826'/>
+                <parameter type-id='type-id-815'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -7944,10 +7944,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2379' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-824'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2379' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-813'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-966' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-827'/>
+          <typedef-decl name='allocator_type' type-id='type-id-955' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-816'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2380' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2272'/>
@@ -7964,7 +7964,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7979,7 +7979,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1587' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8001,7 +8001,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1587' is-artificial='yes'/>
             <parameter type-id='type-id-1586'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8013,10 +8013,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-830'>
+      <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-819'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1597'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-964'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2287' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8035,7 +8035,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1599' is-artificial='yes'/>
-                <parameter type-id='type-id-835'/>
+                <parameter type-id='type-id-824'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8049,10 +8049,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2381' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-833'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2381' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-822'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-975' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-836'/>
+          <typedef-decl name='allocator_type' type-id='type-id-964' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-825'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2382' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2287'/>
@@ -8069,7 +8069,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1594' is-artificial='yes'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8084,7 +8084,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1594' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8106,7 +8106,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1594' is-artificial='yes'/>
             <parameter type-id='type-id-1593'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8118,10 +8118,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-839'>
+      <class-decl name='_Vector_base&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-828'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1604'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-978'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-967'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2296' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8140,7 +8140,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1606' is-artificial='yes'/>
-                <parameter type-id='type-id-844'/>
+                <parameter type-id='type-id-833'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8154,10 +8154,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2383' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-842'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2383' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-831'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-978' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-845'/>
+          <typedef-decl name='allocator_type' type-id='type-id-967' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-834'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2384' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2296'/>
@@ -8174,7 +8174,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1601' is-artificial='yes'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8189,7 +8189,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1601' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8211,7 +8211,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1601' is-artificial='yes'/>
             <parameter type-id='type-id-1600'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8223,10 +8223,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-848'>
+      <class-decl name='_Vector_base&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-837'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1611'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-981'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2311' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8245,7 +8245,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1613' is-artificial='yes'/>
-                <parameter type-id='type-id-853'/>
+                <parameter type-id='type-id-842'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8259,10 +8259,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2385' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-851'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2385' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-840'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-981' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-854'/>
+          <typedef-decl name='allocator_type' type-id='type-id-970' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-843'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2386' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2311'/>
@@ -8279,7 +8279,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8294,7 +8294,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8316,7 +8316,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
             <parameter type-id='type-id-1607'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8328,10 +8328,10 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-857'>
+      <class-decl name='_Vector_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-846'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1618'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1011'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1000'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2328' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8350,7 +8350,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1620' is-artificial='yes'/>
-                <parameter type-id='type-id-862'/>
+                <parameter type-id='type-id-851'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8370,7 +8370,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseISsSaISsEE12_Vector_implC2ERKS0_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseISsSaISsEE12_Vector_implC2ERKS0_'>
                 <parameter type-id='type-id-1620' is-artificial='yes'/>
-                <parameter type-id='type-id-862'/>
+                <parameter type-id='type-id-851'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8384,10 +8384,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2387' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-860'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2387' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-849'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1011' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-863'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1000' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-852'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2388' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2328'/>
@@ -8404,7 +8404,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8419,7 +8419,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8441,7 +8441,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
             <parameter type-id='type-id-1614'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8473,8 +8473,8 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseISsSaISsEE19_M_get_Tp_allocatorEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseISsSaISsEE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-859' is-artificial='yes'/>
-            <return type-id='type-id-862'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <return type-id='type-id-851'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8487,8 +8487,8 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt12_Vector_baseISsSaISsEE13get_allocatorEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseISsSaISsEE13get_allocatorEv'>
-            <parameter type-id='type-id-859' is-artificial='yes'/>
-            <return type-id='type-id-863'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <return type-id='type-id-852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8501,15 +8501,15 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseISsSaISsEEC2ERKS0_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseISsSaISsEEC2ERKS0_'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-866'>
+      <class-decl name='_Vector_base&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-855'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1625'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1026'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1015'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2338' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8528,7 +8528,7 @@ 
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1627' is-artificial='yes'/>
-                <parameter type-id='type-id-871'/>
+                <parameter type-id='type-id-860'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8542,10 +8542,10 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2389' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-869'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2389' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-858'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1026' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-872'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1015' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-861'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2390' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2338'/>
@@ -8562,7 +8562,7 @@ 
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1622' is-artificial='yes'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8577,7 +8577,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1622' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8599,7 +8599,7 @@ 
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1622' is-artificial='yes'/>
             <parameter type-id='type-id-1621'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8639,7 +8639,7 @@ 
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::BSONObjBuilder, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2393'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1333' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2394'/>
+          <typedef-decl name='type' type-id='type-id-1322' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2394'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::optionenvironment::Constraint, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2395'>
@@ -8654,7 +8654,7 @@ 
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::BSONObjBuilder*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2399'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1337' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2400'/>
+          <typedef-decl name='type' type-id='type-id-1326' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2400'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2401'>
@@ -8717,7 +8717,7 @@ 
           <typedef-decl name='__type' type-id='type-id-2133' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2424'/>
         </member-type>
       </class-decl>
-      <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-875'>
+      <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-864'>
         <member-type access='private'>
           <typedef-decl name='__int_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-1630'/>
         </member-type>
@@ -8740,7 +8740,7 @@ 
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-877'/>
+            <parameter type-id='type-id-866'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8763,8 +8763,8 @@ 
       <class-decl name='__copy_move&lt;false, false, std::random_access_iterator_tag&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='327' column='1' id='type-id-2426'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;const std::basic_string&lt;char&gt;*, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKSsPSsEET0_T_S7_S6_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKSsPSsEET0_T_S7_S6_'>
-            <parameter type-id='type-id-1034'/>
-            <parameter type-id='type-id-1034'/>
+            <parameter type-id='type-id-1023'/>
+            <parameter type-id='type-id-1023'/>
             <parameter type-id='type-id-1750'/>
             <return type-id='type-id-1750'/>
           </function-decl>
@@ -8830,7 +8830,7 @@ 
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2440'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-771' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1680'/>
+          <typedef-decl name='__type' type-id='type-id-760' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1680'/>
         </member-type>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2441'>
@@ -8845,17 +8845,17 @@ 
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2444'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1177' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1684'/>
+          <typedef-decl name='__type' type-id='type-id-1166' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1684'/>
         </member-type>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2445'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1181' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1686'/>
+          <typedef-decl name='__type' type-id='type-id-1170' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1686'/>
         </member-type>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2446'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1200' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1688'/>
+          <typedef-decl name='__type' type-id='type-id-1189' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1688'/>
         </member-type>
       </class-decl>
       <class-decl name='__uninitialized_copy&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='64' column='1' id='type-id-2447'>
@@ -8869,8 +8869,8 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt;, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSsES3_EET0_T_S6_S5_' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSsES3_EET0_T_S6_S5_'>
-            <parameter type-id='type-id-1166'/>
-            <parameter type-id='type-id-1166'/>
+            <parameter type-id='type-id-1155'/>
+            <parameter type-id='type-id-1155'/>
             <parameter type-id='type-id-1750'/>
             <return type-id='type-id-1750'/>
           </function-decl>
@@ -8972,7 +8972,7 @@ 
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2470'>
         <member-type access='private'>
-          <typedef-decl name='__size_type' type-id='type-id-1280' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2471'/>
+          <typedef-decl name='__size_type' type-id='type-id-1269' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2471'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind_alloc' type-id='type-id-2408' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2472'/>
@@ -9007,7 +9007,7 @@ 
           <typedef-decl name='rebind_alloc' type-id='type-id-2410' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2484'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1266' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1732'/>
+          <typedef-decl name='value_type' type-id='type-id-1255' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1732'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2486' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2485'/>
@@ -9027,7 +9027,7 @@ 
           <typedef-decl name='rebind_alloc' type-id='type-id-2412' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2492'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1273' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1734'/>
+          <typedef-decl name='value_type' type-id='type-id-1262' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1734'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2494' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2493'/>
@@ -9089,7 +9089,7 @@ 
           <typedef-decl name='rebind_alloc' type-id='type-id-2416' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2508'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1282' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1738'/>
+          <typedef-decl name='value_type' type-id='type-id-1271' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1738'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2510' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2509'/>
@@ -9144,13 +9144,13 @@ 
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='max_size' mangled-name='_ZNSt16allocator_traitsISaISsEE8max_sizeERKS0_' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISsEE8max_sizeERKS0_'>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-2473'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_max_size&lt;const std::allocator&lt;std::basic_string&lt;char&gt; &gt;, void&gt;' mangled-name='_ZNSt16allocator_traitsISaISsEE11_S_max_sizeIKS0_vEEmRT_i' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISsEE11_S_max_sizeIKS0_vEEmRT_i'>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-2473'/>
           </function-decl>
@@ -9187,7 +9187,7 @@ 
           <typedef-decl name='rebind_alloc' type-id='type-id-2420' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2524'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-733' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1740'/>
+          <typedef-decl name='value_type' type-id='type-id-722' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1740'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2526' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2525'/>
@@ -9207,7 +9207,7 @@ 
           <typedef-decl name='rebind_alloc' type-id='type-id-2422' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2531'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-749' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1742'/>
+          <typedef-decl name='value_type' type-id='type-id-738' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1742'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2533' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2532'/>
@@ -9227,7 +9227,7 @@ 
           <typedef-decl name='rebind_alloc' type-id='type-id-2424' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2539'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1289' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1744'/>
+          <typedef-decl name='value_type' type-id='type-id-1278' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1744'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2541' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2540'/>
@@ -9244,8 +9244,8 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic' line='617' column='1' id='type-id-1029'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-875'/>
+      <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic' line='617' column='1' id='type-id-1018'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-864'/>
         <member-type access='public'>
           <typedef-decl name='__integral_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/atomic' line='619' column='1' id='type-id-2543'/>
         </member-type>
@@ -9265,7 +9265,7 @@ 
         <member-function access='public'>
           <function-decl name='atomic' filepath='/usr/include/c++/4.9/atomic' line='624' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1747' is-artificial='yes'/>
-            <parameter type-id='type-id-1031'/>
+            <parameter type-id='type-id-1020'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9280,12 +9280,12 @@ 
       <class-decl name='binary_function&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-2544'/>
       <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::BSONObjBuilder&gt;, const std::default_delete&lt;mongo::BSONObjBuilder&gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1967' column='1' id='type-id-2545'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1068' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2229'/>
+          <typedef-decl name='type' type-id='type-id-1057' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2229'/>
         </member-type>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, const std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1967' column='1' id='type-id-2546'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1072' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2235'/>
+          <typedef-decl name='type' type-id='type-id-1061' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2235'/>
         </member-type>
       </class-decl>
       <class-decl name='conditional&lt;true, std::pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, bool&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1962' column='1' id='type-id-2547'>
@@ -9293,7 +9293,7 @@ 
           <typedef-decl name='type' type-id='type-id-2549' filepath='/usr/include/c++/4.9/type_traits' line='1963' column='1' id='type-id-2548'/>
         </member-type>
       </class-decl>
-      <class-decl name='default_delete&lt;mongo::BSONObjBuilder&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1066'>
+      <class-decl name='default_delete&lt;mongo::BSONObjBuilder&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1055'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1767' is-artificial='yes'/>
@@ -9302,13 +9302,13 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_'>
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1323'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1070'>
+      <class-decl name='default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1059'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1769' is-artificial='yes'/>
@@ -9316,59 +9316,59 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='340' column='1' id='type-id-1074'>
+      <class-decl name='equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='340' column='1' id='type-id-1063'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2544'/>
       </class-decl>
-      <class-decl name='hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='3079' column='1' id='type-id-1082'>
+      <class-decl name='hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='3079' column='1' id='type-id-1071'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2428'/>
       </class-decl>
-      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1098'>
+      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1087'>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2550'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-314' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-303' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1101'>
+      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1090'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-314' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-303' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1104'>
+      <class-decl name='integral_constant&lt;long int, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1093'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1000000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1000000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1107'>
+      <class-decl name='integral_constant&lt;long int, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1096'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1110'>
+      <class-decl name='integral_constant&lt;long int, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1099'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1113'>
+      <class-decl name='integral_constant&lt;long int, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1102'>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-27' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2551'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long unsigned int, 2ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1116'>
+      <class-decl name='integral_constant&lt;long unsigned int, 2ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1105'>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2552'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZNSt17integral_constantImLm2EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZNSt17integral_constantImLm2EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1119'>
+      <class-decl name='integral_constant&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1108'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZNSt17integral_constantImLm8EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZNSt17integral_constantImLm8EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, bool, long int, bool const*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='118' column='1' id='type-id-2205'/>
@@ -9383,7 +9383,7 @@ 
           <typedef-decl name='pointer' type-id='type-id-59' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2554'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-333' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2555'/>
+          <typedef-decl name='reference' type-id='type-id-322' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2555'/>
         </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2556'>
@@ -9393,10 +9393,10 @@ 
           <typedef-decl name='difference_type' type-id='type-id-2559' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-2558'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1034' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2560'/>
+          <typedef-decl name='pointer' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2560'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1033' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2561'/>
+          <typedef-decl name='reference' type-id='type-id-1022' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2561'/>
         </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2562'>
@@ -9407,10 +9407,10 @@ 
           <typedef-decl name='reference' type-id='type-id-1748' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-2563'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-1282'/>
+          <typedef-decl name='value_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-1271'/>
         </member-type>
       </class-decl>
-      <class-decl name='less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='367' column='1' id='type-id-1122'>
+      <class-decl name='less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='367' column='1' id='type-id-1111'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2544'/>
       </class-decl>
       <class-decl name='make_unsigned&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1666' column='1' id='type-id-2564'>
@@ -9419,7 +9419,7 @@ 
         </member-type>
       </class-decl>
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/new' line='99' column='1' id='type-id-2094'/>
-      <class-decl name='pair&lt;bool, long unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1170'>
+      <class-decl name='pair&lt;bool, long unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1159'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-1' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
@@ -9435,15 +9435,15 @@ 
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1810' is-artificial='yes'/>
-            <parameter type-id='type-id-315'/>
-            <parameter type-id='type-id-1300'/>
+            <parameter type-id='type-id-304'/>
+            <parameter type-id='type-id-1289'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1810' is-artificial='yes'/>
-            <parameter type-id='type-id-1172'/>
+            <parameter type-id='type-id-1161'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9455,9 +9455,9 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1173'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1162'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1032' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-1403' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
@@ -9471,7 +9471,7 @@ 
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1813' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1022'/>
             <parameter type-id='type-id-1405'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -9479,7 +9479,7 @@ 
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1813' is-artificial='yes'/>
-            <parameter type-id='type-id-1175'/>
+            <parameter type-id='type-id-1164'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9491,12 +9491,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1177'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1166'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1032' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-553' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
+          <var-decl name='second' type-id='type-id-542' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9507,15 +9507,15 @@ 
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1816' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-555'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-544'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1816' is-artificial='yes'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1168'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9527,12 +9527,12 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1181'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1170'>
         <member-type access='public'>
-          <typedef-decl name='first_type' type-id='type-id-1032' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='98' column='1' id='type-id-2566'/>
+          <typedef-decl name='first_type' type-id='type-id-1021' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='98' column='1' id='type-id-2566'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1032' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-31' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
@@ -9546,15 +9546,15 @@ 
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1819' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1022'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1819' is-artificial='yes'/>
-            <parameter type-id='type-id-1183'/>
+            <parameter type-id='type-id-1172'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9566,7 +9566,7 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1185'>
+      <class-decl name='pair&lt;std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1174'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-1549' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
@@ -9590,7 +9590,7 @@ 
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <parameter type-id='type-id-1187'/>
+            <parameter type-id='type-id-1176'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9668,7 +9668,7 @@ 
       </class-decl>
       <class-decl name='pointer_traits&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2585'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-774' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2586'/>
+          <typedef-decl name='rebind' type-id='type-id-763' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2586'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2587'/>
@@ -9679,7 +9679,7 @@ 
       </class-decl>
       <class-decl name='pointer_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2588'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1034' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2589'/>
+          <typedef-decl name='rebind' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2589'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2590'/>
@@ -9704,7 +9704,7 @@ 
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2595'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1180' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2596'/>
+          <typedef-decl name='rebind' type-id='type-id-1169' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2596'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2597'/>
@@ -9715,7 +9715,7 @@ 
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2598'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1184' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2599'/>
+          <typedef-decl name='rebind' type-id='type-id-1173' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2599'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2600'/>
@@ -9726,7 +9726,7 @@ 
       </class-decl>
       <class-decl name='pointer_traits&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2601'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1203' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2602'/>
+          <typedef-decl name='rebind' type-id='type-id-1192' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2602'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2603'/>
@@ -9737,70 +9737,70 @@ 
       </class-decl>
       <class-decl name='ratio&lt;1000000000l, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2604'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1000l, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2605'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2606'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2607'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2608'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2609'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='remove_reference&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2610'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1032' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1823'/>
+          <typedef-decl name='type' type-id='type-id-1021' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1823'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::InitializerContext*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2611'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1363' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1825'/>
+          <typedef-decl name='type' type-id='type-id-1352' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1825'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::Status (*&amp;)(mongo::InitializerContext*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2612'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-212' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1827'/>
+          <typedef-decl name='type' type-id='type-id-1373' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1827'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2613'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1011' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1829'/>
+          <typedef-decl name='type' type-id='type-id-1000' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1829'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2614'>
@@ -9817,17 +9817,17 @@ 
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2617'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1066' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1836'/>
+          <typedef-decl name='type' type-id='type-id-1055' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1836'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2618'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1070' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1838'/>
+          <typedef-decl name='type' type-id='type-id-1059' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1838'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2619'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1276' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1840'/>
+          <typedef-decl name='type' type-id='type-id-1265' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1840'/>
         </member-type>
       </class-decl>
       <class-decl name='tuple_element&lt;1ul, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/utility' line='97' column='1' id='type-id-2620'>
@@ -9837,14 +9837,14 @@ 
       </class-decl>
       <class-decl name='unary_function&lt;mongo::InitializerContext*, mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2369'/>
       <typedef-decl name='_Bit_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='67' column='1' id='type-id-1459'/>
-      <typedef-decl name='__umap_hashtable' type-id='type-id-655' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='52' column='1' id='type-id-2238'/>
-      <typedef-decl name='false_type' type-id='type-id-1098' filepath='/usr/include/c++/4.9/type_traits' line='90' column='1' id='type-id-2622'/>
+      <typedef-decl name='__umap_hashtable' type-id='type-id-644' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='52' column='1' id='type-id-2238'/>
+      <typedef-decl name='false_type' type-id='type-id-1087' filepath='/usr/include/c++/4.9/type_traits' line='90' column='1' id='type-id-2622'/>
       <typedef-decl name='memory_order' type-id='type-id-2352' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='64' column='1' id='type-id-2425'/>
       <typedef-decl name='ptrdiff_t' type-id='type-id-27' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-2559'/>
       <typedef-decl name='size_t' type-id='type-id-82' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-46'/>
-      <typedef-decl name='string' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-1204'/>
-      <typedef-decl name='true_type' type-id='type-id-1101' filepath='/usr/include/c++/4.9/type_traits' line='87' column='1' id='type-id-2018'/>
-      <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1764' column='1' id='type-id-623'>
+      <typedef-decl name='string' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-1193'/>
+      <typedef-decl name='true_type' type-id='type-id-1090' filepath='/usr/include/c++/4.9/type_traits' line='87' column='1' id='type-id-2018'/>
+      <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1764' column='1' id='type-id-612'>
         <data-member access='public'>
           <var-decl name='_M_unused' type-id='type-id-2623' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1779' column='1'/>
         </data-member>
@@ -9859,7 +9859,7 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_access' mangled-name='_ZNKSt9_Any_data9_M_accessEv' filepath='/usr/include/c++/4.9/functional' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessEv'>
-            <parameter type-id='type-id-627' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-616' name='this' is-artificial='yes'/>
             <return type-id='type-id-45'/>
           </function-decl>
         </member-function>
@@ -9872,19 +9872,19 @@ 
         <member-function access='public'>
           <function-decl name='_M_access&lt;mongo::Status (**)(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v'>
             <parameter type-id='type-id-1449' name='this' is-artificial='yes'/>
-            <return type-id='type-id-219'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_access&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERKT_v' filepath='/usr/include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERKT_v'>
-            <parameter type-id='type-id-627' name='this' is-artificial='yes'/>
-            <return type-id='type-id-214'/>
+            <parameter type-id='type-id-616' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1375'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v'>
             <parameter type-id='type-id-1449' name='this' is-artificial='yes'/>
-            <return type-id='type-id-216'/>
+            <return type-id='type-id-1377'/>
           </function-decl>
         </member-function>
       </union-decl>
@@ -9896,7 +9896,7 @@ 
           <var-decl name='_M_const_object' type-id='type-id-45' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1759' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_M_function_pointer' type-id='type-id-1914' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1760' column='1'/>
+          <var-decl name='_M_function_pointer' type-id='type-id-1915' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1760' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='_M_member_pointer' type-id='type-id-61' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761' column='1'/>
@@ -10000,13 +10000,13 @@ 
       <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2650'/>
       <function-decl name='__do_alloc_on_copy&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZSt18__do_alloc_on_copyISaISsEEvRT_RKS1_St17integral_constantIbLb0EE' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18__do_alloc_on_copyISaISsEEvRT_RKS1_St17integral_constantIbLb0EE'>
         <parameter type-id='type-id-1721'/>
-        <parameter type-id='type-id-1013'/>
+        <parameter type-id='type-id-1002'/>
         <parameter type-id='type-id-2622'/>
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='__alloc_on_copy&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZSt15__alloc_on_copyISaISsEEvRT_RKS1_' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15__alloc_on_copyISaISsEEvRT_RKS1_'>
         <parameter type-id='type-id-1721' name='__one' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1'/>
-        <parameter type-id='type-id-1013' name='__two' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1'/>
+        <parameter type-id='type-id-1002' name='__two' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1'/>
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='__do_alloc_on_move&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZSt18__do_alloc_on_moveISaISsEEvRT_S2_St17integral_constantIbLb1EE' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18__do_alloc_on_moveISaISsEEvRT_S2_St17integral_constantIbLb1EE'>
@@ -10021,17 +10021,17 @@ 
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='operator!=&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZStneISsEbRKSaIT_ES3_' filepath='/usr/include/c++/4.9/bits/allocator.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneISsEbRKSaIT_ES3_'>
-        <parameter type-id='type-id-1013'/>
-        <parameter type-id='type-id-1013'/>
+        <parameter type-id='type-id-1002'/>
+        <parameter type-id='type-id-1002'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_OS6_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_OS6_'>
-        <parameter type-id='type-id-1033' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1'/>
+        <parameter type-id='type-id-1022' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1'/>
         <parameter type-id='type-id-1749' name='__rhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2456' column='1'/>
         <return type-id='type-id-31'/>
       </function-decl>
       <function-decl name='operator==&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZSteqIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
-        <parameter type-id='type-id-1033' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
+        <parameter type-id='type-id-1022' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
         <parameter type-id='type-id-59' name='__rhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2539' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
@@ -10041,8 +10041,8 @@ 
         <return type-id='type-id-2350'/>
       </function-decl>
       <function-decl name='__addressof&lt;mongo::Status (* const)(mongo::InitializerContext*)&gt;' mangled-name='_ZSt11__addressofIKPFN5mongo6StatusEPNS0_18InitializerContextEEEPT_RS7_' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIKPFN5mongo6StatusEPNS0_18InitializerContextEEEPT_RS7_'>
-        <parameter type-id='type-id-214' name='__r' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-215'/>
+        <parameter type-id='type-id-1375' name='__r' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1376'/>
       </function-decl>
       <function-decl name='__addressof&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZSt11__addressofISsEPT_RS0_' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofISsEPT_RS0_'>
         <parameter type-id='type-id-1748' name='__r' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1'/>
@@ -10054,11 +10054,11 @@ 
       </function-decl>
       <function-decl name='forward&lt;const std::basic_string&lt;char&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRKSsEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSsEOT_RNSt16remove_referenceIS2_E4typeE'>
         <parameter type-id='type-id-1824' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1033'/>
+        <return type-id='type-id-1022'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::InitializerContext*&gt;' mangled-name='_ZSt7forwardIPN5mongo18InitializerContextEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo18InitializerContextEEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-1826' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1364'/>
+        <return type-id='type-id-1353'/>
       </function-decl>
       <function-decl name='forward&lt;std::basic_string&lt;char&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRSsEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSsEOT_RNSt16remove_referenceIS1_E4typeE'>
         <parameter type-id='type-id-1832' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'/>
@@ -10069,7 +10069,7 @@ 
         <return type-id='type-id-1749'/>
       </function-decl>
       <function-decl name='move&lt;mongo::Status (*&amp;)(mongo::InitializerContext*)&gt;' mangled-name='_ZSt4moveIRPFN5mongo6StatusEPNS0_18InitializerContextEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFN5mongo6StatusEPNS0_18InitializerContextEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-216' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1377' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-1828'/>
       </function-decl>
       <function-decl name='move&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt;&amp;&gt;' mangled-name='_ZSt4moveIRSaISsEEONSt16remove_referenceIT_E4typeEOS3_' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSaISsEEONSt16remove_referenceIT_E4typeEOS3_'>
@@ -10094,35 +10094,35 @@ 
         <return type-id='type-id-65'/>
       </function-decl>
       <namespace-decl name='__detail'>
-        <class-decl name='_Default_ranged_hash' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='457' column='1' id='type-id-879'/>
-        <class-decl name='_Equality&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-882'>
+        <class-decl name='_Default_ranged_hash' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='457' column='1' id='type-id-868'/>
+        <class-decl name='_Equality&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-871'>
         </class-decl>
-        <class-decl name='_Hash_code_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1228' column='1' id='type-id-888'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-911'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-920'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-923'/>
+        <class-decl name='_Hash_code_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1228' column='1' id='type-id-877'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-900'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-909'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-912'/>
           <member-type access='protected'>
             <typedef-decl name='__hash_code' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-2651'/>
           </member-type>
           <member-type access='protected'>
-            <typedef-decl name='__node_type' type-id='type-id-894' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-891'/>
+            <typedef-decl name='__node_type' type-id='type-id-883' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-880'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='hasher' type-id='type-id-1082' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2239'/>
+            <typedef-decl name='hasher' type-id='type-id-1071' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2239'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='_Hash_code_base' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1254' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1633' is-artificial='yes'/>
-              <parameter type-id='type-id-951'/>
-              <parameter type-id='type-id-1084'/>
               <parameter type-id='type-id-940'/>
-              <parameter type-id='type-id-881'/>
+              <parameter type-id='type-id-1073'/>
+              <parameter type-id='type-id-929'/>
+              <parameter type-id='type-id-870'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='280' column='1' id='type-id-894'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-898'/>
+        <class-decl name='_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='280' column='1' id='type-id-883'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-887'/>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='_M_hash_code' type-id='type-id-46' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='282' column='1'/>
           </data-member>
@@ -10145,19 +10145,19 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hash_node_value_base&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='245' column='1' id='type-id-898'>
+        <class-decl name='_Hash_node_value_base&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='245' column='1' id='type-id-887'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1637'/>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='_M_storage' type-id='type-id-106' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='249' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-901'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-914'/>
+        <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-890'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-903'/>
           <member-type access='public'>
             <typedef-decl name='__bucket_type' type-id='type-id-1646' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-1642'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_alloc_type' type-id='type-id-1008' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-905'/>
+            <typedef-decl name='__node_alloc_type' type-id='type-id-997' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-894'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='__node_base' type-id='type-id-1637' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-1645'/>
@@ -10168,7 +10168,7 @@ 
           <member-function access='public'>
             <function-decl name='_Hashtable_alloc' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1910' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1641' is-artificial='yes'/>
-              <parameter type-id='type-id-903'/>
+              <parameter type-id='type-id-892'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10180,17 +10180,17 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-908'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-888'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-917'/>
+        <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-897'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-877'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-906'/>
           <member-type access='public'>
             <typedef-decl name='__hash_code' type-id='type-id-2651' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2023'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_type' type-id='type-id-891' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1651'/>
+            <typedef-decl name='__node_type' type-id='type-id-880' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1651'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='value_type' type-id='type-id-1173' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2652'/>
+            <typedef-decl name='value_type' type-id='type-id-1162' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2652'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='__ireturn_type' type-id='type-id-2548' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1691' column='1' id='type-id-2653'/>
@@ -10210,17 +10210,17 @@ 
           <member-function access='protected'>
             <function-decl name='_Hashtable_base' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1698' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1650' is-artificial='yes'/>
-              <parameter type-id='type-id-951'/>
-              <parameter type-id='type-id-1084'/>
               <parameter type-id='type-id-940'/>
-              <parameter type-id='type-id-881'/>
-              <parameter type-id='type-id-1076'/>
+              <parameter type-id='type-id-1073'/>
+              <parameter type-id='type-id-929'/>
+              <parameter type-id='type-id-870'/>
+              <parameter type-id='type-id-1065'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::__detail::_Select1st, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-911'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-949'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::__detail::_Select1st, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-900'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-938'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1654' is-artificial='yes'/>
@@ -10228,8 +10228,8 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-914'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1008'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-903'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-997'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1656' is-artificial='yes'/>
@@ -10237,8 +10237,8 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-917'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1074'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-906'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1063'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1658' is-artificial='yes'/>
@@ -10246,8 +10246,8 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;1, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-920'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1082'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;1, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-909'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1071'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1660' is-artificial='yes'/>
@@ -10255,8 +10255,8 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;2, std::__detail::_Mod_range_hashing, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-923'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-938'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;2, std::__detail::_Mod_range_hashing, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-912'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-927'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1662' is-artificial='yes'/>
@@ -10269,10 +10269,10 @@ 
         </class-decl>
         <class-decl name='_Insert_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='685' column='1' id='type-id-1663'>
           <member-type access='protected'>
-            <typedef-decl name='__hashtable' type-id='type-id-655' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='690' column='1' id='type-id-885'/>
+            <typedef-decl name='__hashtable' type-id='type-id-644' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='690' column='1' id='type-id-874'/>
           </member-type>
           <member-type access='protected'>
-            <typedef-decl name='value_type' type-id='type-id-2652' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-926'/>
+            <typedef-decl name='value_type' type-id='type-id-2652' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-915'/>
           </member-type>
           <member-type access='protected'>
             <typedef-decl name='__ireturn_type' type-id='type-id-2653' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-2658'/>
@@ -10292,15 +10292,15 @@ 
             <var-decl name='_M_prev' type-id='type-id-1668' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='80' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Map_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-929'>
+        <class-decl name='_Map_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-918'>
           <member-type access='public'>
-            <typedef-decl name='key_type' type-id='type-id-746' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-932'/>
+            <typedef-decl name='key_type' type-id='type-id-735' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-921'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='mapped_type' type-id='type-id-2621' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-935'/>
+            <typedef-decl name='mapped_type' type-id='type-id-2621' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-924'/>
           </member-type>
         </class-decl>
-        <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-938'>
+        <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-927'>
           <member-type access='public'>
             <typedef-decl name='first_argument_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-2661'/>
           </member-type>
@@ -10311,12 +10311,12 @@ 
             <typedef-decl name='second_argument_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-2663'/>
           </member-type>
         </class-decl>
-        <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-942'>
+        <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-931'>
           <member-type access='public'>
             <typedef-decl name='_State' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2024'/>
           </member-type>
           <data-member access='public' static='yes'>
-            <var-decl name='_S_growth_factor' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='503' column='1'/>
+            <var-decl name='_S_growth_factor' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='503' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='_M_max_load_factor' type-id='type-id-22' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='505' column='1'/>
@@ -10332,17 +10332,17 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Rehash_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='940' column='1' id='type-id-946'/>
-        <class-decl name='_Select1st' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='96' column='1' id='type-id-949'/>
+        <class-decl name='_Rehash_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='940' column='1' id='type-id-935'/>
+        <class-decl name='_Select1st' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='96' column='1' id='type-id-938'/>
         <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2655'/>
         <class-decl name='_Local_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2657'/>
         <class-decl name='_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2654'/>
         <class-decl name='_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2656'/>
       </namespace-decl>
       <function-decl name='max&lt;long unsigned int&gt;' mangled-name='_ZSt3maxImERKT_S2_S2_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3maxImERKT_S2_S2_'>
-        <parameter type-id='type-id-1300' name='__a' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
-        <parameter type-id='type-id-1300' name='__b' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
-        <return type-id='type-id-1300'/>
+        <parameter type-id='type-id-1289' name='__a' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
+        <parameter type-id='type-id-1289' name='__b' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
+        <return type-id='type-id-1289'/>
       </function-decl>
       <function-decl name='__niter_base&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_'>
         <parameter type-id='type-id-126' name='__it' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='278' column='1'/>
@@ -10365,8 +10365,8 @@ 
         <return type-id='type-id-2204'/>
       </function-decl>
       <function-decl name='__copy_move_a&lt;false, const std::basic_string&lt;char&gt;*, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSt13__copy_move_aILb0EPKSsPSsET1_T0_S4_S3_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__copy_move_aILb0EPKSsPSsET1_T0_S4_S3_'>
-        <parameter type-id='type-id-1034' name='__first' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
-        <parameter type-id='type-id-1034' name='__last' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
+        <parameter type-id='type-id-1023' name='__first' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
+        <parameter type-id='type-id-1023' name='__last' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
         <parameter type-id='type-id-1750' name='__result' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
         <return type-id='type-id-1750'/>
       </function-decl>
@@ -10454,18 +10454,18 @@ 
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='operator==&lt;std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSteqIPSsEbRKSt13move_iteratorIT_ES5_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqIPSsEbRKSt13move_iteratorIT_ES5_'>
-        <parameter type-id='type-id-1168' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1054' column='1'/>
-        <parameter type-id='type-id-1168' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1055' column='1'/>
+        <parameter type-id='type-id-1157' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1054' column='1'/>
+        <parameter type-id='type-id-1157' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1055' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator!=&lt;std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZStneIPSsEbRKSt13move_iteratorIT_ES5_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1066' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIPSsEbRKSt13move_iteratorIT_ES5_'>
-        <parameter type-id='type-id-1168' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
-        <parameter type-id='type-id-1168' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
+        <parameter type-id='type-id-1157' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
+        <parameter type-id='type-id-1157' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__make_move_if_noexcept_iterator&lt;std::basic_string&lt;char&gt;*, std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt; &gt;' mangled-name='_ZSt32__make_move_if_noexcept_iteratorIPSsSt13move_iteratorIS0_EET0_T_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__make_move_if_noexcept_iteratorIPSsSt13move_iteratorIS0_EET0_T_'>
         <parameter type-id='type-id-1750' name='__i' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
-        <return type-id='type-id-1166'/>
+        <return type-id='type-id-1155'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSt18uninitialized_copyIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEPSsET0_T_SA_S9_' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEPSsET0_T_SA_S9_'>
         <parameter type-id='type-id-126' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
@@ -10480,8 +10480,8 @@ 
         <return type-id='type-id-1750'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt;, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSt18uninitialized_copyISt13move_iteratorIPSsES1_ET0_T_S4_S3_' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyISt13move_iteratorIPSsES1_ET0_T_S4_S3_'>
-        <parameter type-id='type-id-1166' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
-        <parameter type-id='type-id-1166' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-1155' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-1155' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
         <parameter type-id='type-id-1750' name='__result' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
         <return type-id='type-id-1750'/>
       </function-decl>
@@ -10500,8 +10500,8 @@ 
         <return type-id='type-id-1750'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt;, std::basic_string&lt;char&gt;*, std::basic_string&lt;char&gt; &gt;' mangled-name='_ZSt22__uninitialized_copy_aISt13move_iteratorIPSsES1_SsET0_T_S4_S3_RSaIT1_E' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__uninitialized_copy_aISt13move_iteratorIPSsES1_SsET0_T_S4_S3_RSaIT1_E'>
-        <parameter type-id='type-id-1166' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
-        <parameter type-id='type-id-1166' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-1155' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-1155' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
         <parameter type-id='type-id-1750' name='__result' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
         <parameter type-id='type-id-1721'/>
         <return type-id='type-id-1750'/>
@@ -10514,12 +10514,12 @@ 
         <return type-id='type-id-1750'/>
       </function-decl>
       <namespace-decl name='chrono'>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1045'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1034'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-27' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1049'/>
+            <typedef-decl name='rep' type-id='type-id-27' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1038'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1049' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1038' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10530,7 +10530,7 @@ 
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1759' is-artificial='yes'/>
-              <parameter type-id='type-id-1047'/>
+              <parameter type-id='type-id-1036'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10542,9 +10542,9 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1052'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1041'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1049' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1038' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10555,7 +10555,7 @@ 
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1761' is-artificial='yes'/>
-              <parameter type-id='type-id-1054'/>
+              <parameter type-id='type-id-1043'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10567,9 +10567,9 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1056'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1045'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1049' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1038' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10580,7 +10580,7 @@ 
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1763' is-artificial='yes'/>
-              <parameter type-id='type-id-1058'/>
+              <parameter type-id='type-id-1047'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10592,12 +10592,12 @@ 
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='546' column='1' id='type-id-1060'>
+        <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='546' column='1' id='type-id-1049'>
           <member-type access='public'>
-            <typedef-decl name='duration' type-id='type-id-1045' filepath='/usr/include/c++/4.9/chrono' line='549' column='1' id='type-id-1063'/>
+            <typedef-decl name='duration' type-id='type-id-1034' filepath='/usr/include/c++/4.9/chrono' line='549' column='1' id='type-id-1052'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__d' type-id='type-id-1063' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='596' column='1'/>
+            <var-decl name='__d' type-id='type-id-1052' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='596' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/include/c++/4.9/chrono' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10608,20 +10608,20 @@ 
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/include/c++/4.9/chrono' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1765' is-artificial='yes'/>
-              <parameter type-id='type-id-1065'/>
+              <parameter type-id='type-id-1054'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='milliseconds' type-id='type-id-1052' filepath='/usr/include/c++/4.9/chrono' line='533' column='1' id='type-id-2664'/>
-        <typedef-decl name='seconds' type-id='type-id-1056' filepath='/usr/include/c++/4.9/chrono' line='536' column='1' id='type-id-2665'/>
+        <typedef-decl name='milliseconds' type-id='type-id-1041' filepath='/usr/include/c++/4.9/chrono' line='533' column='1' id='type-id-2664'/>
+        <typedef-decl name='seconds' type-id='type-id-1045' filepath='/usr/include/c++/4.9/chrono' line='536' column='1' id='type-id-2665'/>
         <namespace-decl name='_V2'>
           <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='716' column='1' id='type-id-2666'>
             <member-type access='public'>
-              <typedef-decl name='time_point' type-id='type-id-1060' filepath='/usr/include/c++/4.9/chrono' line='721' column='1' id='type-id-1042'/>
+              <typedef-decl name='time_point' type-id='type-id-1049' filepath='/usr/include/c++/4.9/chrono' line='721' column='1' id='type-id-1031'/>
             </member-type>
             <data-member access='public' static='yes'>
-              <var-decl name='is_steady' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='727' column='1'/>
+              <var-decl name='is_steady' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='727' column='1'/>
             </data-member>
           </class-decl>
         </namespace-decl>
@@ -10637,7 +10637,7 @@ 
         <return type-id='type-id-2402'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0ul, std::basic_ostringstream&lt;char&gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEISt14default_deleteIS4_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EIS9_DpT1_EE' filepath='/usr/include/c++/4.9/tuple' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEISt14default_deleteIS4_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EIS9_DpT1_EE'>
-        <parameter type-id='type-id-790' name='__t' filepath='/usr/include/c++/4.9/tuple' line='750' column='1'/>
+        <parameter type-id='type-id-779' name='__t' filepath='/usr/include/c++/4.9/tuple' line='750' column='1'/>
         <return type-id='type-id-2392'/>
       </function-decl>
       <function-decl name='get&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' mangled-name='_ZSt3getILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_' filepath='/usr/include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_'>
@@ -10649,7 +10649,7 @@ 
         <return type-id='type-id-2402'/>
       </function-decl>
       <function-decl name='get&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt3getILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERKSD_' filepath='/usr/include/c++/4.9/tuple' line='766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERKSD_'>
-        <parameter type-id='type-id-1212' name='__t' filepath='/usr/include/c++/4.9/tuple' line='766' column='1'/>
+        <parameter type-id='type-id-1201' name='__t' filepath='/usr/include/c++/4.9/tuple' line='766' column='1'/>
         <return type-id='type-id-2392'/>
       </function-decl>
     </namespace-decl>
@@ -10704,7 +10704,7 @@ 
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-122' is-artificial='yes'/>
-            <parameter type-id='type-id-335'/>
+            <parameter type-id='type-id-324'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -10735,7 +10735,7 @@ 
           <typedef-decl name='difference_type' type-id='type-id-2558' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-2697'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_type' type-id='type-id-1034' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='717' column='1' id='type-id-2365'/>
+          <typedef-decl name='iterator_type' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='717' column='1' id='type-id-2365'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2560' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-2698'/>
@@ -10744,7 +10744,7 @@ 
           <typedef-decl name='reference' type-id='type-id-2561' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-2699'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1034' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-1023' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10755,14 +10755,14 @@ 
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-128' is-artificial='yes'/>
-            <parameter type-id='type-id-1036'/>
+            <parameter type-id='type-id-1025'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEC2ERKS2_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEC2ERKS2_'>
             <parameter type-id='type-id-128' is-artificial='yes'/>
-            <parameter type-id='type-id-1036'/>
+            <parameter type-id='type-id-1025'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -10774,14 +10774,14 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEdeEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEdeEv'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-229' is-artificial='yes'/>
             <return type-id='type-id-2699'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEE4baseEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEE4baseEv'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
-            <return type-id='type-id-1036'/>
+            <parameter type-id='type-id-229' is-artificial='yes'/>
+            <return type-id='type-id-1025'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10826,13 +10826,13 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEEdeEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEEdeEv'>
-            <parameter type-id='type-id-243' is-artificial='yes'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
             <return type-id='type-id-2701'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEE4baseEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEE4baseEv'>
-            <parameter type-id='type-id-243' is-artificial='yes'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
             <return type-id='type-id-1752'/>
           </function-decl>
         </member-function>
@@ -10842,7 +10842,7 @@ 
           <typedef-decl name='const_pointer' type-id='type-id-59' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2702'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-333' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2138'/>
+          <typedef-decl name='const_reference' type-id='type-id-322' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2138'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-39' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2696'/>
@@ -10851,7 +10851,7 @@ 
           <typedef-decl name='reference' type-id='type-id-203' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2141'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-1280'/>
+          <typedef-decl name='size_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-1269'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10862,7 +10862,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-139' is-artificial='yes'/>
-            <parameter type-id='type-id-254'/>
+            <parameter type-id='type-id-243'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -10980,7 +10980,7 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-227' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2294'/>
+          <typedef-decl name='const_reference' type-id='type-id-216' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2294'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2483' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2384'/>
@@ -11002,7 +11002,7 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-229' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2309'/>
+          <typedef-decl name='const_reference' type-id='type-id-218' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2309'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2491' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2386'/>
@@ -11031,7 +11031,7 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-231' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2325'/>
+          <typedef-decl name='const_reference' type-id='type-id-220' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2325'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2506' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2388'/>
@@ -11093,7 +11093,7 @@ 
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-233' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2336'/>
+          <typedef-decl name='const_reference' type-id='type-id-222' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2336'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2538' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2390'/>
@@ -11107,122 +11107,122 @@ 
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='100' column='1' id='type-id-2724'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_exponent10' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;float&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='100' column='1' id='type-id-2725'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_exponent10' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;long double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='100' column='1' id='type-id-2726'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_exponent10' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2727'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-332' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-321' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-332' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIcE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-321' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIcE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2728'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2729'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-343' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-332' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-343' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-332' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2730'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-1299' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-1288' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-1299' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-1288' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;short int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2731'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-620' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-609' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-620' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-609' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='new_allocator&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-132'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-316' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2732'/>
+          <typedef-decl name='const_pointer' type-id='type-id-305' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2732'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-315' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2733'/>
+          <typedef-decl name='const_reference' type-id='type-id-304' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2733'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-181' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2734'/>
@@ -11239,7 +11239,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-245'/>
+            <parameter type-id='type-id-234'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11273,7 +11273,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-248'/>
+            <parameter type-id='type-id-237'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11307,7 +11307,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-137' is-artificial='yes'/>
-            <parameter type-id='type-id-251'/>
+            <parameter type-id='type-id-240'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11321,10 +11321,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-140'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1301' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2744'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1290' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2744'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1300' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2745'/>
+          <typedef-decl name='const_reference' type-id='type-id-1289' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2745'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1911' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2746'/>
@@ -11341,7 +11341,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-141' is-artificial='yes'/>
-            <parameter type-id='type-id-257'/>
+            <parameter type-id='type-id-246'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11375,7 +11375,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-143' is-artificial='yes'/>
-            <parameter type-id='type-id-260'/>
+            <parameter type-id='type-id-249'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11409,7 +11409,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-145' is-artificial='yes'/>
-            <parameter type-id='type-id-263'/>
+            <parameter type-id='type-id-252'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11443,7 +11443,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-147' is-artificial='yes'/>
-            <parameter type-id='type-id-266'/>
+            <parameter type-id='type-id-255'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11457,10 +11457,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-148'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-548' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2758'/>
+          <typedef-decl name='const_pointer' type-id='type-id-537' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2758'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-547' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2157'/>
+          <typedef-decl name='const_reference' type-id='type-id-536' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2157'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1435' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2759'/>
@@ -11477,7 +11477,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-149' is-artificial='yes'/>
-            <parameter type-id='type-id-269'/>
+            <parameter type-id='type-id-258'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11491,10 +11491,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-150'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-552' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2760'/>
+          <typedef-decl name='const_pointer' type-id='type-id-541' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2760'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-551' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2170'/>
+          <typedef-decl name='const_reference' type-id='type-id-540' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2170'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1437' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2761'/>
@@ -11511,7 +11511,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-151' is-artificial='yes'/>
-            <parameter type-id='type-id-272'/>
+            <parameter type-id='type-id-261'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11525,10 +11525,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-152'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-701' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2762'/>
+          <typedef-decl name='const_pointer' type-id='type-id-690' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2762'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-700' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2763'/>
+          <typedef-decl name='const_reference' type-id='type-id-689' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2763'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1508' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2764'/>
@@ -11545,7 +11545,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-153' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-264'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11574,7 +11574,7 @@ 
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-153' is-artificial='yes'/>
             <parameter type-id='type-id-2764'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11587,10 +11587,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-154'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-705' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2766'/>
+          <typedef-decl name='const_pointer' type-id='type-id-694' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2766'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-704' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2767'/>
+          <typedef-decl name='const_reference' type-id='type-id-693' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2767'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1510' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2768'/>
@@ -11607,7 +11607,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-155' is-artificial='yes'/>
-            <parameter type-id='type-id-278'/>
+            <parameter type-id='type-id-267'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11636,7 +11636,7 @@ 
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-155' is-artificial='yes'/>
             <parameter type-id='type-id-2768'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11669,7 +11669,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-157' is-artificial='yes'/>
-            <parameter type-id='type-id-281'/>
+            <parameter type-id='type-id-270'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11703,7 +11703,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-159' is-artificial='yes'/>
-            <parameter type-id='type-id-284'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11717,10 +11717,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-160'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-770' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2778'/>
+          <typedef-decl name='const_pointer' type-id='type-id-759' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2778'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-769' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2779'/>
+          <typedef-decl name='const_reference' type-id='type-id-758' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2779'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1546' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2780'/>
@@ -11737,7 +11737,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-161' is-artificial='yes'/>
-            <parameter type-id='type-id-287'/>
+            <parameter type-id='type-id-276'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11751,10 +11751,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-162'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-774' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2782'/>
+          <typedef-decl name='const_pointer' type-id='type-id-763' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2782'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-773' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2783'/>
+          <typedef-decl name='const_reference' type-id='type-id-762' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2783'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1548' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2498'/>
@@ -11771,7 +11771,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
-            <parameter type-id='type-id-290'/>
+            <parameter type-id='type-id-279'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11806,17 +11806,17 @@ 
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
             <parameter type-id='type-id-2498'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-164'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-897' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2785'/>
+          <typedef-decl name='const_pointer' type-id='type-id-886' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2785'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-896' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2786'/>
+          <typedef-decl name='const_reference' type-id='type-id-885' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2786'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2787'/>
@@ -11833,7 +11833,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-165' is-artificial='yes'/>
-            <parameter type-id='type-id-293'/>
+            <parameter type-id='type-id-282'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11847,10 +11847,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-166'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1034' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2789'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1023' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2789'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1033' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2790'/>
+          <typedef-decl name='const_reference' type-id='type-id-1022' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2790'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11861,7 +11861,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
-            <parameter type-id='type-id-296'/>
+            <parameter type-id='type-id-285'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11882,7 +11882,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISsEC2ERKS1_' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsEC2ERKS1_'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
-            <parameter type-id='type-id-296'/>
+            <parameter type-id='type-id-285'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11896,7 +11896,7 @@ 
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISsE10deallocateEPSsm' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsE10deallocateEPSsm'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
             <parameter type-id='type-id-2505'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11911,7 +11911,7 @@ 
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-45'/>
             <return type-id='type-id-2505'/>
           </function-decl>
@@ -11925,8 +11925,8 @@ 
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISsE8max_sizeEv' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorISsE8max_sizeEv'>
-            <parameter type-id='type-id-297' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-286' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11952,7 +11952,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-169' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
+            <parameter type-id='type-id-288'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11966,10 +11966,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-170'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1176' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2795'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1165' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2795'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1175' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2796'/>
+          <typedef-decl name='const_reference' type-id='type-id-1164' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2796'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1813' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2797'/>
@@ -11986,7 +11986,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-171' is-artificial='yes'/>
-            <parameter type-id='type-id-302'/>
+            <parameter type-id='type-id-291'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12000,10 +12000,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-172'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1180' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2799'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1169' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2799'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1179' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2800'/>
+          <typedef-decl name='const_reference' type-id='type-id-1168' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2800'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1816' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2522'/>
@@ -12020,7 +12020,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-173' is-artificial='yes'/>
-            <parameter type-id='type-id-305'/>
+            <parameter type-id='type-id-294'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12034,10 +12034,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-174'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1184' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2802'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1173' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2802'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1183' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2803'/>
+          <typedef-decl name='const_reference' type-id='type-id-1172' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2803'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1819' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2376'/>
@@ -12054,7 +12054,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-175' is-artificial='yes'/>
-            <parameter type-id='type-id-308'/>
+            <parameter type-id='type-id-297'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12068,10 +12068,10 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-176'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1203' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2805'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1192' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2805'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1202' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2806'/>
+          <typedef-decl name='const_reference' type-id='type-id-1191' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2806'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1851' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2537'/>
@@ -12088,7 +12088,7 @@ 
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-177' is-artificial='yes'/>
-            <parameter type-id='type-id-311'/>
+            <parameter type-id='type-id-300'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12110,7 +12110,7 @@ 
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-177' is-artificial='yes'/>
             <parameter type-id='type-id-2537'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12128,13 +12128,13 @@ 
       <class-decl name='__normal_iterator&lt;mongo::optionenvironment::KeyConstraint**, std::vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2319'/>
       <class-decl name='__normal_iterator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*, std::vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2346'/>
       <function-decl name='operator!=&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxneIPKSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESB_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxneIPKSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESB_'>
-        <parameter type-id='type-id-239' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
-        <parameter type-id='type-id-239' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
+        <parameter type-id='type-id-228' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
+        <parameter type-id='type-id-228' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator!=&lt;std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxneIPSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESA_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxneIPSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESA_'>
-        <parameter type-id='type-id-242' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
-        <parameter type-id='type-id-242' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
+        <parameter type-id='type-id-231' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
+        <parameter type-id='type-id-231' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
@@ -12154,7 +12154,7 @@ 
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-1316'/>
+      <return type-id='type-id-1305'/>
     </function-decl>
     <function-decl name='remove' filepath='/usr/include/stdio.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-59'/>
@@ -12252,12 +12252,12 @@ 
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-1312'/>
+      <parameter type-id='type-id-1301'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-339'/>
+      <parameter type-id='type-id-328'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='clearerr' filepath='/usr/include/stdio.h' line='826' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12339,7 +12339,7 @@ 
       <return type-id='type-id-65'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1914'/>
+      <parameter type-id='type-id-1915'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='/usr/include/stdlib.h' line='549' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12408,7 +12408,7 @@ 
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-46'/>
     </function-decl>
@@ -12458,104 +12458,104 @@ 
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-59'/>
-      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1284'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='gmtime' filepath='/usr/include/time.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1293'/>
+      <parameter type-id='type-id-1282'/>
       <return type-id='type-id-1904'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1293'/>
+      <parameter type-id='type-id-1282'/>
       <return type-id='type-id-1904'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1284'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='ctime' filepath='/usr/include/time.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1293'/>
+      <parameter type-id='type-id-1282'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcscpy' filepath='/usr/include/wchar.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcsncpy' filepath='/usr/include/wchar.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcscat' filepath='/usr/include/wchar.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcsncat' filepath='/usr/include/wchar.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcscmp' filepath='/usr/include/wchar.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wcscoll' filepath='/usr/include/wchar.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcscspn' filepath='/usr/include/wchar.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcsspn' filepath='/usr/include/wchar.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcslen' filepath='/usr/include/wchar.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wmemcpy' filepath='/usr/include/wchar.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wmemmove' filepath='/usr/include/wchar.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
@@ -12574,77 +12574,77 @@ 
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='mbsinit' filepath='/usr/include/wchar.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-335'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='mbrtowc' filepath='/usr/include/wchar.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-59'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-103'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-59'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-337'/>
+      <parameter type-id='type-id-326'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-1309'/>
+      <parameter type-id='type-id-1298'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='450' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-21'/>
     </function-decl>
     <function-decl name='wcstof' filepath='/usr/include/wchar.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='459' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='wcstol' filepath='/usr/include/wchar.h' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='wcstoul' filepath='/usr/include/wchar.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-82'/>
     </function-decl>
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-102'/>
@@ -12656,71 +12656,71 @@ 
     </function-decl>
     <function-decl name='fwprintf' filepath='/usr/include/wchar.h' line='594' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wprintf' filepath='/usr/include/wchar.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wscanf' filepath='/usr/include/wchar.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='swscanf' filepath='/usr/include/wchar.h' line='645' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='701' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
@@ -12756,7 +12756,7 @@ 
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-105'/>
       <return type-id='type-id-23'/>
     </function-decl>
@@ -12768,8 +12768,8 @@ 
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1284'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wctype' filepath='/usr/include/wctype.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12791,18 +12791,18 @@ 
       <return type-id='type-id-87'/>
     </function-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='AssertionException' size-in-bits='256' visibility='default' filepath='src/mongo/util/assert_util.h' line='151' column='1' id='type-id-347'>
+      <class-decl name='AssertionException' size-in-bits='256' visibility='default' filepath='src/mongo/util/assert_util.h' line='151' column='1' id='type-id-336'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1949'/>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' filepath='src/mongo/util/assert_util.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
-            <parameter type-id='type-id-422'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-411'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' filepath='src/mongo/util/assert_util.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
@@ -12810,84 +12810,84 @@ 
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' filepath='src/mongo/util/assert_util.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' mangled-name='_ZN5mongo18AssertionExceptionC2ERKSsi' filepath='src/mongo/util/assert_util.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18AssertionExceptionC2ERKSsi'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~AssertionException' filepath='src/mongo/util/assert_util.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~AssertionException' mangled-name='_ZN5mongo18AssertionExceptionD0Ev' filepath='src/mongo/util/assert_util.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18AssertionExceptionD0Ev'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~AssertionException' mangled-name='_ZN5mongo18AssertionExceptionD2Ev' filepath='src/mongo/util/assert_util.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18AssertionExceptionD2Ev'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='7'>
           <function-decl name='severe' mangled-name='_ZNK5mongo18AssertionException6severeEv' filepath='src/mongo/util/assert_util.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo18AssertionException6severeEv'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='8'>
           <function-decl name='isUserAssertion' mangled-name='_ZNK5mongo18AssertionException15isUserAssertionEv' filepath='src/mongo/util/assert_util.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo18AssertionException15isUserAssertionEv'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-350'>
+      <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-339'>
         <member-type access='public'>
           <typedef-decl name='WordType' type-id='type-id-50' filepath='src/mongo/platform/atomic_word.h' line='45' column='1' id='type-id-2808'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_value' type-id='type-id-1029' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149' column='1'/>
+          <var-decl name='_value' type-id='type-id-1018' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1310' is-artificial='yes'/>
             <parameter type-id='type-id-2808'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj'>
-            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1310' is-artificial='yes'/>
             <parameter type-id='type-id-2808'/>
             <return type-id='type-id-2808'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj'>
-            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1310' is-artificial='yes'/>
             <parameter type-id='type-id-2808'/>
             <return type-id='type-id-2808'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-365'>
+      <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-354'>
         <member-type access='public'>
           <class-decl name='FieldNameSizeTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='598' column='1' id='type-id-2809'/>
         </member-type>
@@ -12902,13 +12902,13 @@ 
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
@@ -12916,14 +12916,14 @@ 
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-2809'/>
@@ -12931,101 +12931,101 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-369'>
+      <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-358'>
         <member-type access='public'>
-          <class-decl name='SorterDeserializeSettings' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='569' column='1' id='type-id-373'/>
+          <class-decl name='SorterDeserializeSettings' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='569' column='1' id='type-id-362'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='kMinBSONLength' type-id='type-id-332' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='96' column='1'/>
+          <var-decl name='kMinBSONLength' type-id='type-id-321' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='96' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_objdata' type-id='type-id-59' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='600' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_ownedBuffer' type-id='type-id-477' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='601' column='1'/>
+          <var-decl name='_ownedBuffer' type-id='type-id-466' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='601' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-477'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-466'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1320'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-371'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2EPKc'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7objdataEv'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
+            <parameter type-id='type-id-361' is-artificial='yes'/>
             <return type-id='type-id-59'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7objsizeEv'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
+            <parameter type-id='type-id-361' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='isValid' mangled-name='_ZNK5mongo7BSONObj7isValidEv' filepath='src/mongo/bson/bsonobj.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7isValidEv'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
+            <parameter type-id='type-id-361' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='init' mangled-name='_ZN5mongo7BSONObj4initEPKc' filepath='src/mongo/bson/bsonobj.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObj4initEPKc'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObjBuilder' size-in-bits='768' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='59' column='1' id='type-id-376'>
+      <class-decl name='BSONObjBuilder' size-in-bits='768' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='59' column='1' id='type-id-365'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_b' type-id='type-id-1346' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='727' column='1'/>
+          <var-decl name='_b' type-id='type-id-1335' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='727' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_buf' type-id='type-id-1345' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='728' column='1'/>
+          <var-decl name='_buf' type-id='type-id-1334' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='728' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='320'>
           <var-decl name='_offset' type-id='type-id-23' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='729' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
-          <var-decl name='_s' type-id='type-id-380' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='730' column='1'/>
+          <var-decl name='_s' type-id='type-id-369' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='730' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='640'>
-          <var-decl name='_tracker' type-id='type-id-1343' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='731' column='1'/>
+          <var-decl name='_tracker' type-id='type-id-1332' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='731' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='704'>
           <var-decl name='_doneCalled' type-id='type-id-1' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='732' column='1'/>
@@ -13038,139 +13038,139 @@ 
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-378'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1346'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-1335'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-392'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-381'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2Ei' filepath='src/mongo/bson/bsonobjbuilder.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderC2Ei'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderD2Ev' filepath='src/mongo/bson/bsonobjbuilder.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderD2Ev'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendArray' mangled-name='_ZN5mongo14BSONObjBuilder11appendArrayENS_10StringDataERKNS_7BSONObjE' filepath='src/mongo/bson/bsonobjbuilder.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder11appendArrayENS_10StringDataERKNS_7BSONObjE'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-371'/>
-            <return type-id='type-id-1333'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-360'/>
+            <return type-id='type-id-1322'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi' filepath='src/mongo/bson/bsonobjbuilder.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
             <parameter type-id='type-id-23'/>
-