diff mbox series

[2/2] writer: Avoid using dynamic hashing in type maps

Message ID 877dt3tjtp.fsf@redhat.com
State New
Headers
Series [1/2] Use flat representation to canonicalize anonymous classes and unions |

Commit Message

Dodji Seketeli Sept. 9, 2020, 8:50 a.m. UTC 
  Hello,

This patch the second of a series of two which intends to improve type
equality handling, particularly in the abixml writer, for the small
number of types that are not canonicalized.

When using type maps the hash used for a given type T is usually the
pointer value of the canonical type of T.

In the rare cases where T doesn't have a canonical type, we were using
a 'dynamic hash' computed by recursively walking the components of T
and progressively building a hash that way.

The dynamic hashing code hasn't been updated in a while and would need
some overhaul to support hashing with schemes like MD5 or maybe sha
even.  It might be useful for various use cases that have been
proposed by some users over the years but nobody was motivated enough
to implement it.

In the mean time, rather than trying to come up with a fully beefed up
dynamic hashing code, we'd rather just return a constant number for
non canonicalized types.  In practise that amounts to forcing the code
of the maps to always use structural comparison for those non
canonicalized types.

Note that the amount of non-canonicalized types should be fairly
small.  For now, the only non-canonicalized types should be
declaration-only types and those are quite fast to compare anyway.

This patch thus introduces a new hashing scheme for maps in the
writer which just uses a numerical constant as the hash for
non-canonicalized types.

	* include/abg-fwd.h (hash_as_canonical_type_or_constant): Declare ...
	* src/abg-ir.cc (hash_as_canonical_type_or_constant): ... new
	function.
	* src/abg-writer.cc (type_hasher::operator()): Use the new
	hash_as_canonical_type_or_constant.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 include/abg-fwd.h                                |   3 +
 src/abg-ir.cc                                    |  39 +++
 src/abg-writer.cc                                |   2 +-
 tests/data/test-read-dwarf/test16-pr18904.so.abi | 302 +++++++++++------------
 4 files changed, 194 insertions(+), 152 deletions(-)

Comments

Dodji Seketeli Sept. 10, 2020, 2:27 p.m. UTC | #1 
Hello,

Dodji Seketeli <dodji@redhat.com> writes:

> Hey,
>
> Giuliano Procida <gprocida@google.com> writes:
>
>> This probably fixes the hash/equality issue. At least, it makes no
>> difference (for a simple stock kernel) on top of, or without, my change
>> that switched to using plain pointers.
>
> Okay, that is good to know, thanks.
>
>>
>> It does cause the XML writer to emit (more) XML elements with duplicate
>> ids, perhaps where anonymous types are being identified very late in the
>> process. You can see this with the following, before and after the change.
>> Admittedly, there are already about 400 ids that appear to be duplicated!
>>
>> find tests -name '*abi' | while read x; do sed -En "s;.*
>> id='([^']*)'.*;\1;p" $x | sort | uniq -c | grep -vw 1 | sort -nr | sed
>> "s;^;$x: ;"; done
>
>
> This is interesting.  I went through most of the duplicated IDs reported
> by your script.  Thank you for putting this together.
>
> I have just filled an enhancement request for a potential tool à la
> abilint (probably reusing abilint infrastructure) that would
> analyze/sanitize abixml files to detect potential pathological cases for
> these: https://sourceware.org/bugzilla/show_bug.cgi?id=26591.
>
> Most of the current redundant IDs in the tests/data/test-read-dwarf are
> for array sub-ranges.  They are are always sub-types of arrays in C and
> C++.  They have their own ID but we don't de-duplicate these at the
> moment.  So this is not an symptom of a problem per se.
>
> There are other cases that are mostly related to C++.  I have listed
> these in the enhancement request above.
>
> From manual inspection of the cases reported by your script, I haven't
> noticed a case resulting from a type equality problem.  If you do, I'd
> be glad to look into.
>
>
>> I'd still prefer less code to more code and to switch to making the XML
>> writer not care about equality at all.
>
> I still think that the writer should try (as much as possible, but no
> more) to ensure that types are emitted just once.  In the past, it was
> the first point where this was done.  Then slowly, we built
> de-duplication features throughout the stack.  They are not perfect yet,
> so I think we still need to ensuring that at the writer level.  Much
> less now, but we still do.
>
> Note that we do much less de-duplication at the level of the writer than
> we used to do in the past.  Hopefully at some point we won't need it
> that anymore, and that point I'll be happy to remove that from the
> writer.  But I don't think that time has come yet.
>
> [...]
>
>>> --- a/src/abg-ir.cc
>>> +++ b/src/abg-ir.cc
>>> @@ -23085,6 +23085,45 @@ size_t
>>>  hash_type_or_decl(const type_or_decl_base_sptr& tod)
>>>  {return hash_type_or_decl(tod.get());}
>>>
>>> +/// Hash a type by either returning the pointer value of its canonical
>>> +/// type or by returning a constant if the type doesn't have a
>>> +/// canonical type.
>>> +///
>>> +/// @param t the type to consider.
>>> +///
>>> +/// @return the hash value.
>>> +size_t
>>> +hash_as_canonical_type_or_constant(const type_base *t)
>>> +{
>>> +  type_base *canonical_type = 0;
>>> +
>>> +  if (t)
>>> +    canonical_type = t->get_naked_canonical_type();
>>> +
>>> +  if (!canonical_type)
>>> +    {
>>>
>>
>> Is the following code definitely compatible with the definition of equality
>> or is there a chance you'll determine two different canonical types of
>> definitions of declarations but equality would actually succeed? If you
>> have any doubts, then it's safer to remove this.
>
> If two decl-only classes have definitions, then their definitions are
> compared.
>
> So I do expect the following code to comply with the equality code, yes.
>
>>
>>
>>> +      // If the type doesn't have a canonical type, maybe it's because
>>> +      // it's a declaration-only type?  If that's the case, let's try
>>> +      // to get the canonical type of the definition of this
>>> +      // declaration.
>>> +      decl_base *decl = is_decl(t);
>>> +      if (decl
>>> +         && decl->get_is_declaration_only()
>>> +         && decl->get_naked_definition_of_declaration())
>>> +       {
>>> +         type_base *definition =
>>> +           is_type(decl->get_naked_definition_of_declaration());
>>> +         ABG_ASSERT(definition);
>>> +         canonical_type = definition->get_naked_canonical_type();
>>> +       }
>>> +    }
>>> +
>>> +  if (canonical_type)
>>> +    return reinterpret_cast<size_t>(canonical_type);
>>> +
>>> +  return 0xDEADBABE;
>>> +}
>>> +
>>>  /// Test if the pretty representation of a given @ref function_decl is
>>>  /// lexicographically less then the pretty representation of another
>>>  /// @ref function_decl.
>>> diff --git a/src/abg-writer.cc b/src/abg-writer.cc
>>> index 4c751c2..59060e1 100644
>>> --- a/src/abg-writer.cc
>>> +++ b/src/abg-writer.cc
>>> @@ -136,7 +136,7 @@ struct type_hasher
>>>  {
>>>    size_t
>>>    operator()(const type_base* t) const
>>> -  {return hash_type(t);}
>>> +  {return hash_as_canonical_type_or_constant(t);}
>>>  }; // end struct type_hasher
>>>
>>>  /// A convenience typedef for a map that associates a pointer to type
>>> diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi
>>> b/tests/data/test-read-dwarf/test16-pr18904.so.abi
>>> index 0075a6e..377d322 100644
>>>
>>
>> Modulo my comments above,
>>
>> Signed-off-by: Giuliano Procida <gprocida@google.com>
>
> Thanks! 

Applied to master at https://sourceware.org/git/?p=libabigail.git;a=commit;h=5cf2473d3ca3acdb5664313e33c4ced618cf023a.

Cheers,
diff mbox series

Patch

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index 4b09929..a2caf9b 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -1333,6 +1333,9 @@  hash_type_or_decl(const type_or_decl_base *);
 size_t
 hash_type_or_decl(const type_or_decl_base_sptr &);
 
+size_t
+hash_as_canonical_type_or_constant(const type_base* t);
+
 bool
 function_decl_is_less_than(const function_decl&f, const function_decl &s);
 
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index d98d4bd..088eebb 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -23085,6 +23085,45 @@  size_t
 hash_type_or_decl(const type_or_decl_base_sptr& tod)
 {return hash_type_or_decl(tod.get());}
 
+/// Hash a type by either returning the pointer value of its canonical
+/// type or by returning a constant if the type doesn't have a
+/// canonical type.
+///
+/// @param t the type to consider.
+///
+/// @return the hash value.
+size_t
+hash_as_canonical_type_or_constant(const type_base *t)
+{
+  type_base *canonical_type = 0;
+
+  if (t)
+    canonical_type = t->get_naked_canonical_type();
+
+  if (!canonical_type)
+    {
+      // If the type doesn't have a canonical type, maybe it's because
+      // it's a declaration-only type?  If that's the case, let's try
+      // to get the canonical type of the definition of this
+      // declaration.
+      decl_base *decl = is_decl(t);
+      if (decl
+	  && decl->get_is_declaration_only()
+	  && decl->get_naked_definition_of_declaration())
+	{
+	  type_base *definition =
+	    is_type(decl->get_naked_definition_of_declaration());
+	  ABG_ASSERT(definition);
+	  canonical_type = definition->get_naked_canonical_type();
+	}
+    }
+
+  if (canonical_type)
+    return reinterpret_cast<size_t>(canonical_type);
+
+  return 0xDEADBABE;
+}
+
 /// Test if the pretty representation of a given @ref function_decl is
 /// lexicographically less then the pretty representation of another
 /// @ref function_decl.
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 4c751c2..59060e1 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -136,7 +136,7 @@  struct type_hasher
 {
   size_t
   operator()(const type_base* t) const
-  {return hash_type(t);}
+  {return hash_as_canonical_type_or_constant(t);}
 }; // end struct type_hasher
 
 /// A convenience typedef for a map that associates a pointer to type
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 0075a6e..377d322 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -35191,7 +35191,7 @@ 
             </union-decl>
           </member-type>
           <member-type access='private'>
-            <union-decl name='__anonymous_union__1' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-3198'>
+            <union-decl name='__anonymous_union__1' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-3197'>
               <data-member access='private'>
                 <var-decl name='_M_local_buf' type-id='type-id-3055' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='122' column='1'/>
               </data-member>
@@ -35201,7 +35201,7 @@ 
             </union-decl>
           </member-type>
           <member-type access='private'>
-            <union-decl name='__anonymous_union__2' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-3199'>
+            <union-decl name='__anonymous_union__2' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='121' column='1' id='type-id-3197'>
               <data-member access='private'>
                 <var-decl name='_M_local_buf' type-id='type-id-3055' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='122' column='1'/>
               </data-member>
@@ -36488,13 +36488,13 @@ 
       </namespace-decl>
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-3172'>
         <member-type access='private'>
-          <typedef-decl name='seekdir' type-id='type-id-3200' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='455' column='1' id='type-id-3152'/>
+          <typedef-decl name='seekdir' type-id='type-id-3198' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='455' column='1' id='type-id-3152'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='openmode' type-id='type-id-3201' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='423' column='1' id='type-id-3150'/>
+          <typedef-decl name='openmode' type-id='type-id-3199' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='423' column='1' id='type-id-3150'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iostate' type-id='type-id-3202' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='392' column='1' id='type-id-3148'/>
+          <typedef-decl name='iostate' type-id='type-id-3200' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='392' column='1' id='type-id-3148'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='fmtflags' type-id='type-id-3125' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='317' column='1' id='type-id-3146'/>
@@ -36624,14 +36624,14 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='_Ios_Seekdir' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='187' column='1' id='type-id-3200'>
+      <enum-decl name='_Ios_Seekdir' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='187' column='1' id='type-id-3198'>
         <underlying-type type-id='type-id-14'/>
         <enumerator name='_S_beg' value='0'/>
         <enumerator name='_S_cur' value='1'/>
         <enumerator name='_S_end' value='2'/>
         <enumerator name='_S_ios_seekdir_end' value='65536'/>
       </enum-decl>
-      <enum-decl name='_Ios_Openmode' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='109' column='1' id='type-id-3201'>
+      <enum-decl name='_Ios_Openmode' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='109' column='1' id='type-id-3199'>
         <underlying-type type-id='type-id-14'/>
         <enumerator name='_S_app' value='1'/>
         <enumerator name='_S_ate' value='2'/>
@@ -36641,7 +36641,7 @@ 
         <enumerator name='_S_trunc' value='32'/>
         <enumerator name='_S_ios_openmode_end' value='65536'/>
       </enum-decl>
-      <enum-decl name='_Ios_Iostate' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='149' column='1' id='type-id-3202'>
+      <enum-decl name='_Ios_Iostate' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='149' column='1' id='type-id-3200'>
         <underlying-type type-id='type-id-14'/>
         <enumerator name='_S_goodbit' value='0'/>
         <enumerator name='_S_badbit' value='1'/>
@@ -36680,9 +36680,9 @@ 
         <return type-id='type-id-3052'/>
       </function-decl>
       <function-decl name='operator|' mangled-name='_ZStorSt13_Ios_OpenmodeS_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStorSt13_Ios_OpenmodeS_'>
-        <parameter type-id='type-id-3201'/>
-        <parameter type-id='type-id-3201'/>
-        <return type-id='type-id-3201'/>
+        <parameter type-id='type-id-3199'/>
+        <parameter type-id='type-id-3199'/>
+        <return type-id='type-id-3199'/>
       </function-decl>
       <function-decl name='operator&amp;=' mangled-name='_ZStaNRSt13_Ios_FmtflagsS_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStaNRSt13_Ios_FmtflagsS_'>
         <parameter type-id='type-id-3162'/>
@@ -36710,7 +36710,7 @@ 
       </function-decl>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1259'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3203'/>
+          <typedef-decl name='value_type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3201'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-243' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
@@ -36718,13 +36718,13 @@ 
         <member-function access='public' const='yes'>
           <function-decl name='operator std::integral_constant&lt;bool, true&gt;::value_type' mangled-name='_ZNKSt17integral_constantIbLb1EEcvbEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3145' is-artificial='yes'/>
-            <return type-id='type-id-3203'/>
+            <return type-id='type-id-3201'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1260'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3204'/>
+          <typedef-decl name='value_type' type-id='type-id-150' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-3202'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-243' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
@@ -36732,7 +36732,7 @@ 
         <member-function access='public' const='yes'>
           <function-decl name='operator std::integral_constant&lt;bool, false&gt;::value_type' mangled-name='_ZNKSt17integral_constantIbLb0EEcvbEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3143' is-artificial='yes'/>
-            <return type-id='type-id-3204'/>
+            <return type-id='type-id-3202'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -36740,23 +36740,23 @@ 
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-3136'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3103'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-3205'>
+          <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-3203'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3136' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-3206'/>
+              <typedef-decl name='other' type-id='type-id-3136' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-3204'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-3207'/>
+          <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-3205'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-3208'/>
+          <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-3206'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-3209'/>
+          <typedef-decl name='const_pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-3207'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-166' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-3210'/>
+          <typedef-decl name='value_type' type-id='type-id-166' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-3208'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='allocator' mangled-name='_ZNSaIcEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -36805,53 +36805,53 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-3211'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-3209'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1171'/>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3212'/>
+          <typedef-decl name='value_type' type-id='type-id-3208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3210'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-3213'/>
+          <typedef-decl name='pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-3211'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='103' column='1' id='type-id-3214'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='103' column='1' id='type-id-3212'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-3215'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-3213'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-3216'/>
+          <typedef-decl name='size_type' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='142' column='1' id='type-id-3214'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-3217'/>
+          <typedef-decl name='rebind_alloc' type-id='type-id-1195' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-3215'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIcEE8allocateERS0_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3169'/>
-            <parameter type-id='type-id-3216'/>
-            <return type-id='type-id-3213'/>
+            <parameter type-id='type-id-3214'/>
+            <return type-id='type-id-3211'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIcEE8allocateERS0_mPKv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3169'/>
-            <parameter type-id='type-id-3216'/>
-            <parameter type-id='type-id-3215'/>
-            <return type-id='type-id-3213'/>
+            <parameter type-id='type-id-3214'/>
+            <parameter type-id='type-id-3213'/>
+            <return type-id='type-id-3211'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3169'/>
-            <parameter type-id='type-id-3213'/>
-            <parameter type-id='type-id-3216'/>
+            <parameter type-id='type-id-3211'/>
+            <parameter type-id='type-id-3214'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='max_size' mangled-name='_ZNSt16allocator_traitsISaIcEE8max_sizeERKS0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3138'/>
-            <return type-id='type-id-3216'/>
+            <return type-id='type-id-3214'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -36863,92 +36863,92 @@ 
       </class-decl>
       <class-decl name='__allocator_traits_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='43' column='1' id='type-id-1171'>
         <member-type access='protected'>
-          <typedef-decl name='__pointer' type-id='type-id-3208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1180'/>
+          <typedef-decl name='__pointer' type-id='type-id-3206' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1180'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='__c_pointer' type-id='type-id-3209' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-3218'/>
+          <typedef-decl name='__c_pointer' type-id='type-id-3207' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-3216'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='__size_type' type-id='type-id-3207' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1187'/>
+          <typedef-decl name='__size_type' type-id='type-id-3205' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1187'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__rebind' type-id='type-id-3206' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1208'/>
+          <typedef-decl name='__rebind' type-id='type-id-3204' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1208'/>
         </member-type>
       </class-decl>
-      <class-decl name='__detector&lt;char*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3219'>
+      <class-decl name='__detector&lt;char*, void, std::__allocator_traits_base::__pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3217'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3220'/>
+          <typedef-decl name='type' type-id='type-id-1180' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3218'/>
         </member-type>
       </class-decl>
-      <typedef-decl name='__detected_or_t' type-id='type-id-3220' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1173'/>
-      <class-decl name='__detector&lt;char const*, void, std::__allocator_traits_base::__c_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3221'>
+      <typedef-decl name='__detected_or_t' type-id='type-id-3218' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1173'/>
+      <class-decl name='__detector&lt;char const*, void, std::__allocator_traits_base::__c_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3219'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3218' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3222'/>
+          <typedef-decl name='type' type-id='type-id-3216' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3220'/>
         </member-type>
       </class-decl>
-      <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-3223'>
+      <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-3221'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-3224'/>
+          <typedef-decl name='type' type-id='type-id-151' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2426' column='1' id='type-id-3222'/>
         </member-type>
       </class-decl>
-      <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3225'>
+      <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3223'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3226'/>
+          <typedef-decl name='type' type-id='type-id-1187' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3224'/>
         </member-type>
       </class-decl>
-      <class-decl name='__detector&lt;std::allocator&lt;char&gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;char&gt;, char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3227'>
+      <class-decl name='__detector&lt;std::allocator&lt;char&gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;char&gt;, char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3225'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3228'/>
+          <typedef-decl name='type' type-id='type-id-1208' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3226'/>
         </member-type>
       </class-decl>
-      <typedef-decl name='__detected_or_t_' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2453' column='1' id='type-id-3229'/>
-      <typedef-decl name='__alloc_rebind' type-id='type-id-3229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='74' column='1' id='type-id-1195'/>
-      <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3230'>
+      <typedef-decl name='__detected_or_t_' type-id='type-id-1173' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2453' column='1' id='type-id-3227'/>
+      <typedef-decl name='__alloc_rebind' type-id='type-id-3227' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='74' column='1' id='type-id-1195'/>
+      <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3228'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-3231'/>
+          <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-3229'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='183' column='1' id='type-id-3232'/>
+          <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='183' column='1' id='type-id-3230'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3105' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='184' column='1' id='type-id-3233'/>
+          <typedef-decl name='reference' type-id='type-id-3105' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='184' column='1' id='type-id-3231'/>
         </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-190' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-1964'/>
-      <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='189' column='1' id='type-id-3234'>
+      <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='189' column='1' id='type-id-3232'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='193' column='1' id='type-id-3235'/>
+          <typedef-decl name='difference_type' type-id='type-id-1964' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='193' column='1' id='type-id-3233'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='194' column='1' id='type-id-3236'/>
+          <typedef-decl name='pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='194' column='1' id='type-id-3234'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='195' column='1' id='type-id-3237'/>
+          <typedef-decl name='reference' type-id='type-id-3116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='195' column='1' id='type-id-3235'/>
         </member-type>
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3193'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3195'/>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-3139'>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-153' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-3238'/>
+          <typedef-decl name='iterator' type-id='type-id-153' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-3236'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-3239'/>
+          <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-3237'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-153' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-3240'/>
+          <typedef-decl name='const_iterator' type-id='type-id-153' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-3238'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-3238' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='58' column='1'/>
+          <var-decl name='_M_array' type-id='type-id-3236' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/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-3239' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-3237' visibility='default' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' mangled-name='_ZNSt16initializer_listIcEC4EPKcm' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3171' is-artificial='yes'/>
-            <parameter type-id='type-id-3240'/>
-            <parameter type-id='type-id-3239'/>
+            <parameter type-id='type-id-3238'/>
+            <parameter type-id='type-id-3237'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
@@ -36961,19 +36961,19 @@ 
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt16initializer_listIcE4sizeEv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3141' is-artificial='yes'/>
-            <return type-id='type-id-3239'/>
+            <return type-id='type-id-3237'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='begin' mangled-name='_ZNKSt16initializer_listIcE5beginEv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3141' is-artificial='yes'/>
-            <return type-id='type-id-3240'/>
+            <return type-id='type-id-3238'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='end' mangled-name='_ZNKSt16initializer_listIcE3endEv' filepath='/export/users/iverbin/gcc/libstdc++-v3/libsupc++/initializer_list' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3141' is-artificial='yes'/>
-            <return type-id='type-id-3240'/>
+            <return type-id='type-id-3238'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -36984,7 +36984,7 @@ 
         <parameter type-id='type-id-292'/>
         <return type-id='type-id-3063'/>
       </function-decl>
-      <class-decl name='__numeric_traits_integer&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3241'>
+      <class-decl name='__numeric_traits_integer&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3239'>
         <data-member access='public' static='yes'>
           <var-decl name='__min' type-id='type-id-3121' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__minE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
@@ -36998,7 +36998,7 @@ 
           <var-decl name='__digits' type-id='type-id-197' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_integer&lt;short int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3242'>
+      <class-decl name='__numeric_traits_integer&lt;short int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3240'>
         <data-member access='public' static='yes'>
           <var-decl name='__min' type-id='type-id-3124' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__minE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
@@ -37012,7 +37012,7 @@ 
           <var-decl name='__digits' type-id='type-id-197' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_integer&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3243'>
+      <class-decl name='__numeric_traits_integer&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3241'>
         <data-member access='public' static='yes'>
           <var-decl name='__min' type-id='type-id-3037' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
@@ -37026,7 +37026,7 @@ 
           <var-decl name='__digits' type-id='type-id-197' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_integer&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3244'>
+      <class-decl name='__numeric_traits_integer&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3242'>
         <data-member access='public' static='yes'>
           <var-decl name='__min' type-id='type-id-891' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
@@ -37040,7 +37040,7 @@ 
           <var-decl name='__digits' type-id='type-id-197' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_floating&lt;long double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3245'>
+      <class-decl name='__numeric_traits_floating&lt;long double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3243'>
         <data-member access='public' static='yes'>
           <var-decl name='__max_digits10' type-id='type-id-197' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
@@ -37054,7 +37054,7 @@ 
           <var-decl name='__max_exponent10' type-id='type-id-197' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_floating&lt;double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3246'>
+      <class-decl name='__numeric_traits_floating&lt;double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3244'>
         <data-member access='public' static='yes'>
           <var-decl name='__max_digits10' type-id='type-id-197' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
@@ -37068,7 +37068,7 @@ 
           <var-decl name='__max_exponent10' type-id='type-id-197' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_floating&lt;float&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3247'>
+      <class-decl name='__numeric_traits_floating&lt;float&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='100' column='1' id='type-id-3245'>
         <data-member access='public' static='yes'>
           <var-decl name='__max_digits10' type-id='type-id-197' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
@@ -37082,7 +37082,7 @@ 
           <var-decl name='__max_exponent10' type-id='type-id-197' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__numeric_traits_integer&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3248'>
+      <class-decl name='__numeric_traits_integer&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='55' column='1' id='type-id-3246'>
         <data-member access='public' static='yes'>
           <var-decl name='__min' type-id='type-id-197' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
@@ -37098,19 +37098,19 @@ 
       </class-decl>
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-3103'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-3249'/>
+          <typedef-decl name='size_type' type-id='type-id-1084' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-3247'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3250'/>
+          <typedef-decl name='pointer' type-id='type-id-213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3248'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3251'/>
+          <typedef-decl name='const_pointer' type-id='type-id-153' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3249'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3105' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3252'/>
+          <typedef-decl name='reference' type-id='type-id-3105' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3250'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3253'/>
+          <typedef-decl name='const_reference' type-id='type-id-3116' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3251'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIcEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -37135,37 +37135,37 @@ 
         <member-function access='private' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE7addressERc' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3114' is-artificial='yes'/>
-            <parameter type-id='type-id-3252'/>
-            <return type-id='type-id-3250'/>
+            <parameter type-id='type-id-3250'/>
+            <return type-id='type-id-3248'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE7addressERKc' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3114' is-artificial='yes'/>
-            <parameter type-id='type-id-3253'/>
-            <return type-id='type-id-3251'/>
+            <parameter type-id='type-id-3251'/>
+            <return type-id='type-id-3249'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE8allocateEmPKv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3104' is-artificial='yes'/>
-            <parameter type-id='type-id-3249'/>
+            <parameter type-id='type-id-3247'/>
             <parameter type-id='type-id-151'/>
-            <return type-id='type-id-3250'/>
+            <return type-id='type-id-3248'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIcE10deallocateEPcm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3104' is-artificial='yes'/>
-            <parameter type-id='type-id-3250'/>
-            <parameter type-id='type-id-3249'/>
+            <parameter type-id='type-id-3248'/>
+            <parameter type-id='type-id-3247'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIcE8max_sizeEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3114' is-artificial='yes'/>
-            <return type-id='type-id-3249'/>
+            <return type-id='type-id-3247'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
@@ -37195,26 +37195,26 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__alloc_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-3254'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3211'/>
+      <class-decl name='__alloc_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-3252'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3209'/>
         <member-type access='public'>
-          <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-3255'>
+          <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='122' column='1' id='type-id-3253'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3217' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-3183'/>
+              <typedef-decl name='other' type-id='type-id-3215' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='123' column='1' id='type-id-3183'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3212' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-3095'/>
+          <typedef-decl name='value_type' type-id='type-id-3210' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-3095'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3213' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-3180'/>
+          <typedef-decl name='pointer' type-id='type-id-3211' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='59' column='1' id='type-id-3180'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-3214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='60' column='1' id='type-id-3189'/>
+          <typedef-decl name='const_pointer' type-id='type-id-3212' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='60' column='1' id='type-id-3189'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-3216' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='61' column='1' id='type-id-3181'/>
+          <typedef-decl name='size_type' type-id='type-id-3214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='61' column='1' id='type-id-3181'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-3096' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-3185'/>
@@ -37268,13 +37268,13 @@ 
       </class-decl>
       <class-decl name='__normal_iterator&lt;char*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='748' column='1' id='type-id-3100'>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-3231' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-3256'/>
+          <typedef-decl name='difference_type' type-id='type-id-3229' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-3254'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3233' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3257'/>
+          <typedef-decl name='reference' type-id='type-id-3231' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3255'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3232' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-3258'/>
+          <typedef-decl name='pointer' type-id='type-id-3230' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-3256'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-213' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='751' column='1'/>
@@ -37295,13 +37295,13 @@ 
         <member-function access='private' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEdeEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='780' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3111' is-artificial='yes'/>
-            <return type-id='type-id-3257'/>
+            <return type-id='type-id-3255'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEptEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='784' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3111' is-artificial='yes'/>
-            <return type-id='type-id-3258'/>
+            <return type-id='type-id-3256'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -37333,35 +37333,35 @@ 
         <member-function access='private' const='yes'>
           <function-decl name='operator[]' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEixEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='812' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3111' is-artificial='yes'/>
-            <parameter type-id='type-id-3256'/>
-            <return type-id='type-id-3257'/>
+            <parameter type-id='type-id-3254'/>
+            <return type-id='type-id-3255'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator+=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEpLEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='816' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3102' is-artificial='yes'/>
-            <parameter type-id='type-id-3256'/>
+            <parameter type-id='type-id-3254'/>
             <return type-id='type-id-3101'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEplEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='820' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3111' is-artificial='yes'/>
-            <parameter type-id='type-id-3256'/>
+            <parameter type-id='type-id-3254'/>
             <return type-id='type-id-3100'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator-=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEmIEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='824' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3102' is-artificial='yes'/>
-            <parameter type-id='type-id-3256'/>
+            <parameter type-id='type-id-3254'/>
             <return type-id='type-id-3101'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEmiEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='828' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3111' is-artificial='yes'/>
-            <parameter type-id='type-id-3256'/>
+            <parameter type-id='type-id-3254'/>
             <return type-id='type-id-3100'/>
           </function-decl>
         </member-function>
@@ -37374,13 +37374,13 @@ 
       </class-decl>
       <class-decl name='__normal_iterator&lt;char const*, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='748' column='1' id='type-id-3097'>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-3235' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-3259'/>
+          <typedef-decl name='difference_type' type-id='type-id-3233' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='759' column='1' id='type-id-3257'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3237' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3260'/>
+          <typedef-decl name='reference' type-id='type-id-3235' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='760' column='1' id='type-id-3258'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3236' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-3261'/>
+          <typedef-decl name='pointer' type-id='type-id-3234' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='761' column='1' id='type-id-3259'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-153' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='751' column='1'/>
@@ -37401,13 +37401,13 @@ 
         <member-function access='private' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEdeEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='780' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3109' is-artificial='yes'/>
-            <return type-id='type-id-3260'/>
+            <return type-id='type-id-3258'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEptEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='784' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3109' is-artificial='yes'/>
-            <return type-id='type-id-3261'/>
+            <return type-id='type-id-3259'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -37439,35 +37439,35 @@ 
         <member-function access='private' const='yes'>
           <function-decl name='operator[]' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEixEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='812' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3109' is-artificial='yes'/>
-            <parameter type-id='type-id-3259'/>
-            <return type-id='type-id-3260'/>
+            <parameter type-id='type-id-3257'/>
+            <return type-id='type-id-3258'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator+=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEpLEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='816' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3259'/>
+            <parameter type-id='type-id-3257'/>
             <return type-id='type-id-3098'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEplEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='820' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3109' is-artificial='yes'/>
-            <parameter type-id='type-id-3259'/>
+            <parameter type-id='type-id-3257'/>
             <return type-id='type-id-3097'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator-=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEmIEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='824' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3259'/>
+            <parameter type-id='type-id-3257'/>
             <return type-id='type-id-3098'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEmiEl' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='828' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3109' is-artificial='yes'/>
-            <parameter type-id='type-id-3259'/>
+            <parameter type-id='type-id-3257'/>
             <return type-id='type-id-3097'/>
           </function-decl>
         </member-function>
@@ -38096,71 +38096,71 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C99'>
-    <array-type-def dimensions='1' type-id='type-id-3262' size-in-bits='1024' id='type-id-3263'>
+    <array-type-def dimensions='1' type-id='type-id-3260' size-in-bits='1024' id='type-id-3261'>
       <subrange length='16' type-id='type-id-4' id='type-id-177'/>
     </array-type-def>
-    <typedef-decl name='ORSLBusySet' type-id='type-id-3264' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='62' column='1' id='type-id-3265'/>
-    <class-decl name='ORSLBusySet' size-in-bits='1088' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='52' column='1' id='type-id-3264'>
+    <typedef-decl name='ORSLBusySet' type-id='type-id-3262' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='62' column='1' id='type-id-3263'/>
+    <class-decl name='ORSLBusySet' size-in-bits='1088' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='52' column='1' id='type-id-3262'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-3266' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='53' column='1'/>
+        <var-decl name='type' type-id='type-id-3264' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cpu_set' type-id='type-id-3267' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='55' column='1'/>
+        <var-decl name='cpu_set' type-id='type-id-3265' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='55' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='BusySetType' type-id='type-id-3268' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='49' column='1' id='type-id-3266'/>
-    <enum-decl name='ORSLBusySetType' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='45' column='1' id='type-id-3268'>
+    <typedef-decl name='BusySetType' type-id='type-id-3266' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='49' column='1' id='type-id-3264'/>
+    <enum-decl name='ORSLBusySetType' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='45' column='1' id='type-id-3266'>
       <underlying-type type-id='type-id-14'/>
       <enumerator name='BUSY_SET_EMPTY' value='0'/>
       <enumerator name='BUSY_SET_PARTIAL' value='1'/>
       <enumerator name='BUSY_SET_FULL' value='2'/>
     </enum-decl>
-    <typedef-decl name='cpu_set_t' type-id='type-id-3269' filepath='/usr/include/bits/sched.h' line='128' column='1' id='type-id-3267'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='1024' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-3267' visibility='default' filepath='/usr/include/bits/sched.h' line='125' column='1' id='type-id-3269'>
+    <typedef-decl name='cpu_set_t' type-id='type-id-3267' filepath='/usr/include/bits/sched.h' line='128' column='1' id='type-id-3265'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='1024' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-3265' visibility='default' filepath='/usr/include/bits/sched.h' line='125' column='1' id='type-id-3267'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__bits' type-id='type-id-3263' visibility='default' filepath='/usr/include/bits/sched.h' line='127' column='1'/>
+        <var-decl name='__bits' type-id='type-id-3261' visibility='default' filepath='/usr/include/bits/sched.h' line='127' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__cpu_mask' type-id='type-id-6' filepath='/usr/include/bits/sched.h' line='118' column='1' id='type-id-3262'/>
-    <typedef-decl name='ORSLTag' type-id='type-id-213' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='65' column='1' id='type-id-3270'/>
-    <typedef-decl name='ORSLPartialGranularity' type-id='type-id-3271' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='151' column='1' id='type-id-3272'/>
-    <enum-decl name='ORSLPartialGranularity' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='148' column='1' id='type-id-3271'>
+    <typedef-decl name='__cpu_mask' type-id='type-id-6' filepath='/usr/include/bits/sched.h' line='118' column='1' id='type-id-3260'/>
+    <typedef-decl name='ORSLTag' type-id='type-id-213' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='65' column='1' id='type-id-3268'/>
+    <typedef-decl name='ORSLPartialGranularity' type-id='type-id-3269' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='151' column='1' id='type-id-3270'/>
+    <enum-decl name='ORSLPartialGranularity' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='148' column='1' id='type-id-3269'>
       <underlying-type type-id='type-id-14'/>
       <enumerator name='GRAN_CARD' value='0'/>
       <enumerator name='GRAN_THREAD' value='1'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-3265' size-in-bits='64' id='type-id-3273'/>
-    <qualified-type-def type-id='type-id-3265' const='yes' id='type-id-3274'/>
-    <pointer-type-def type-id='type-id-3274' size-in-bits='64' id='type-id-3275'/>
-    <qualified-type-def type-id='type-id-3272' const='yes' id='type-id-3276'/>
-    <qualified-type-def type-id='type-id-3270' const='yes' id='type-id-3277'/>
+    <pointer-type-def type-id='type-id-3263' size-in-bits='64' id='type-id-3271'/>
+    <qualified-type-def type-id='type-id-3263' const='yes' id='type-id-3272'/>
+    <pointer-type-def type-id='type-id-3272' size-in-bits='64' id='type-id-3273'/>
+    <qualified-type-def type-id='type-id-3270' const='yes' id='type-id-3274'/>
+    <qualified-type-def type-id='type-id-3268' const='yes' id='type-id-3275'/>
     <function-decl name='ORSLRelease' mangled-name='ORSLRelease' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLRelease'>
       <parameter type-id='type-id-197' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1'/>
       <parameter type-id='type-id-475' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='327' column='1'/>
-      <parameter type-id='type-id-3275' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='328' column='1'/>
-      <parameter type-id='type-id-3277' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='329' column='1'/>
+      <parameter type-id='type-id-3273' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='328' column='1'/>
+      <parameter type-id='type-id-3275' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='329' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='ORSLReservePartial' mangled-name='ORSLReservePartial' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLReservePartial'>
-      <parameter type-id='type-id-3276' name='gran' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1'/>
+      <parameter type-id='type-id-3274' name='gran' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1'/>
       <parameter type-id='type-id-197' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='290' column='1'/>
       <parameter type-id='type-id-475' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='291' column='1'/>
-      <parameter type-id='type-id-3273' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='291' column='1'/>
-      <parameter type-id='type-id-3277' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='292' column='1'/>
+      <parameter type-id='type-id-3271' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='291' column='1'/>
+      <parameter type-id='type-id-3275' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='292' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='ORSLTryReserve' mangled-name='ORSLTryReserve' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLTryReserve'>
       <parameter type-id='type-id-197' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1'/>
       <parameter type-id='type-id-475' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='262' column='1'/>
-      <parameter type-id='type-id-3275' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='263' column='1'/>
-      <parameter type-id='type-id-3277' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='264' column='1'/>
+      <parameter type-id='type-id-3273' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='263' column='1'/>
+      <parameter type-id='type-id-3275' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='264' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='ORSLReserve' mangled-name='ORSLReserve' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ORSLReserve'>
       <parameter type-id='type-id-197' name='n' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1'/>
       <parameter type-id='type-id-475' name='inds' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='230' column='1'/>
-      <parameter type-id='type-id-3275' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='231' column='1'/>
-      <parameter type-id='type-id-3277' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='232' column='1'/>
+      <parameter type-id='type-id-3273' name='bsets' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='231' column='1'/>
+      <parameter type-id='type-id-3275' name='tag' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' line='232' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
   </abi-instr>