projects / platform / upstream / libabigail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 630c334)
Support reading data member offset from DW_AT_bit_offset
authorDodji Seketeli <dodji@redhat.com>
Wed, 23 Nov 2016 17:12:50 +0000 (18:12 +0100)
committerDodji Seketeli <dodji@redhat.com>
Thu, 24 Nov 2016 14:25:43 +0000 (15:25 +0100)
There are times where the DW_AT_data_member_location attribute is set
to zero and where the actual offset of the data member is the value of
the DW_AT_bit_offset.  This seems to be happening when a union type is
involved.

To get the offset of a data member, this patch makes us read the
DW_AT_bit_offset when it's present.  Otherwise, it gets the offset
from the DW_AT_data_member_location as we used to do.

In the passing the patch fixes the offset of base classes; the
nubmer of bytes value was what was being used, rather than the number
bits value.

* src/abg-dwarf-reader.cc (die_member_offset): Better comments.
Support reading the bit offset also from the DW_AT_bit_offset
attribute when it's present.  Make sure this always returns a
value in bits.
(build_class_type_and_add_to_ir): No need to multiply (by 8) the
value returned by die_member_offset anymore because it's now in
bits directly.
* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt: Adjust.
* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt: Adjust.
* tests/data/test-read-dwarf/test1.abi: Adjust.
* tests/data/test-read-dwarf/test11-pr18828.so.abi: Adjust.
* tests/data/test-read-dwarf/test12-pr18844.so.abi: Adjust.
* tests/data/test-read-dwarf/test13-pr18894.so.abi: Adjust.
* tests/data/test-read-dwarf/test14-pr18893.so.abi: Adjust.
* tests/data/test-read-dwarf/test15-pr18892.so.abi: Adjust.
* tests/data/test-read-dwarf/test16-pr18904.so.abi: Adjust.
* tests/data/test-read-dwarf/test17-pr19027.so.abi: Adjust.
* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
Adjust.
* tests/data/test-read-dwarf/test21-pr19092.so.abi: Adjust.
* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
14 files changed:
src/abg-dwarf-reader.cc patch | blob | history
tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt patch | blob | history
tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt patch | blob | history
tests/data/test-read-dwarf/test1.abi patch | blob | history
tests/data/test-read-dwarf/test11-pr18828.so.abi patch | blob | history
tests/data/test-read-dwarf/test12-pr18844.so.abi patch | blob | history
tests/data/test-read-dwarf/test13-pr18894.so.abi patch | blob | history
tests/data/test-read-dwarf/test14-pr18893.so.abi patch | blob | history
tests/data/test-read-dwarf/test15-pr18892.so.abi patch | blob | history
tests/data/test-read-dwarf/test16-pr18904.so.abi patch | blob | history
tests/data/test-read-dwarf/test17-pr19027.so.abi patch | blob | history
tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi patch | blob | history
tests/data/test-read-dwarf/test21-pr19092.so.abi patch | blob | history
tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi patch | blob | history

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 63c0e8cc820bdeb645a5fb4680881af35b14edab..e6e9a596e1b32ca67e9ce671fbd55cafcebd26b3 100644 (file)
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -6772,25 +6772,32 @@ eval_last_constant_dwarf_sub_expr(Dwarf_Op*     expr,
 /// value of the DW_AT_data_member_location attribute.
 ///
 /// There is a huge gotcha in here.  The value of the
-/// DW_AT_data_member_location is not a constant that one would just
-/// read and be done with it.  Rather, it's a DWARF expression that
-/// one has to interpret.  There are three general cases to consider:
+/// DW_AT_data_member_location is not necessarily a constant that one
+/// would just read and be done with it.  Rather, it can be a DWARF
+/// expression that one has to interpret.  In general, the offset can
+/// be given by the DW_AT_bit_offset attribute.  In that case the
+/// offset is a constant.  But it can also be given by the
+/// DW_AT_data_member_location attribute.  In that case it's a DWARF
+/// location expression.
+///
+/// When the it's the DW_AT_data_member_location that is present,
+/// there are three cases to possibly take into account:
 ///
-///     1/ The offset in the vtable where the offset of the of a
-///        virtual base can be found, aka vptr offset.  Given the
-///        address of a given object O, the vptr offset for B is given
-///        by the (DWARF) expression:
+///     1/ The offset in the vtable where the offset of a virtual base
+///        can be found, aka vptr offset.  Given the address of a
+///        given object O, the vptr offset for B is given by the
+///        (DWARF) expression:
 ///
 ///            address(O) + *(*address(0) - VIRTUAL_OFFSET)
 ///
 ///        where VIRTUAL_OFFSET is a constant value; In this case,
 ///        this function returns the constant VIRTUAL_OFFSET, as this
-///        is enough to detect changes in the place of a given virtual
-///        base, relative to the other virtual bases.
+///        is enough to detect changes in a given virtual base
+///        relative to the other virtual bases.
 ///
 ///     2/ The offset of a regular data member.  Given the address of
-///        a struct object, the memory location for a particular data
-///        member is given by the (DWARF) expression:
+///        a struct object named O, the memory location for a
+///        particular data member is given by the (DWARF) expression:
 ///
 ///            address(O) + OFFSET
 ///
@@ -6804,23 +6811,39 @@ eval_last_constant_dwarf_sub_expr(Dwarf_Op*     expr,
 ///
 ///@param die the DIE to read the information from.
 ///
-///@param offset the resulting constant.  This argument is set iff the
-///function returns true.
+///@param offset the resulting constant offset, in bits.  This
+///argument is set iff the function returns true.
 static bool
-die_member_offset(Dwarf_Die* die,
-                 ssize_t& offset)
+die_member_offset(Dwarf_Die* die, ssize_t& offset)
 {
   Dwarf_Op* expr = NULL;
   size_t expr_len = 0;
+  size_t off = 0;
+
+  if (die_unsigned_constant_attribute(die, DW_AT_bit_offset, off))
+    {
+      // The DW_AT_bit_offset is present.  If it contains a non-zero
+      // value, let's read that one.
+      if (off != 0)
+       {
+         offset = off;
+         return true;
+       }
+    }
 
   if (!die_location_expr(die, DW_AT_data_member_location, &expr, &expr_len))
     return false;
 
+  // Otherwise, the DW_AT_data_member_location attribute is present.
+  // In that case, let's evaluate it and get its constant
+  // sub-expression and return that one.
+
   bool is_tls_address = false;
   if (!eval_last_constant_dwarf_sub_expr(expr, expr_len,
                                         offset, is_tls_address))
     return false;
 
+  offset *= 8;
   return true;
 }
 
@@ -8051,7 +8074,6 @@ build_class_type_and_add_to_ir(read_context&      ctxt,
              ssize_t offset_in_bits = 0;
              bool is_laid_out = false;
              is_laid_out = die_member_offset(&child, offset_in_bits);
-             offset_in_bits *= 8;
              // For now, is_static == !is_laid_out.  When we have
              // templates, we'll try to be more specific.  For now,
              // this approximation should do OK.
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index 4ce87928db19c73fa203df507c1ff06b13e4b879..261d3e6777e364928eda92053f0f3e602bd2d648 100644 (file)
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1322,36 +1322,14 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             type of 'VarDesc::__anonymous_union__::__anonymous_struct__ ' changed:
               type name changed from 'VarDesc::__anonymous_union__::__anonymous_struct__' to 'varDescFlags::__anonymous_struct__'
 
-              7 data member deletions:
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::alloc_disp', at offset 0 (in bits)
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::has_length', at offset 0 (in bits)
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_noncont_dst', at offset 0 (in bits)
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_noncont_src', at offset 0 (in bits)
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_stack_buf', at offset 0 (in bits)
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_static', at offset 0 (in bits)
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::sink_addr', at offset 0 (in bits)
-
-              13 data member insertions:
-                'uint32_t varDescFlags::__anonymous_struct__::alloc_disp', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::always_copy', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::always_delete', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::has_length', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::is_noncont_dst', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::is_pointer', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::is_stack_buf', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::is_static', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::is_static_dstn', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::pin', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::preallocated', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::sink_addr', at offset 0 (in bits)
-                'uint32_t varDescFlags::__anonymous_struct__::targetptr', at offset 0 (in bits)
-              no data member change (1 filtered);
+              6 data member insertions:
+                'uint32_t varDescFlags::__anonymous_struct__::pin', at offset 18 (in bits)
+                'uint32_t varDescFlags::__anonymous_struct__::always_delete', at offset 19 (in bits)
+                'uint32_t varDescFlags::__anonymous_struct__::always_copy', at offset 20 (in bits)
+                'uint32_t varDescFlags::__anonymous_struct__::is_noncont_dst', at offset 21 (in bits)
+                'uint32_t varDescFlags::__anonymous_struct__::is_noncont_src', at offset 22 (in bits)
+                'uint32_t varDescFlags::__anonymous_struct__::alloc_disp', at offset 23 (in bits)
+              no data member changes (8 filtered);
 
            no data member change (1 filtered);
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index 5bb541c8ff05a8f3b1c6f028633d14e4b6eb3a5f..ab0bd489947df3826a689b1e6146a9186ceb41e9 100644 (file)
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1322,36 +1322,14 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             type of 'VarDesc::__anonymous_union__::__anonymous_struct__ ' changed:
               type name changed from 'VarDesc::__anonymous_union__::__anonymous_struct__' to 'varDescFlags::__anonymous_struct__'
 
-              7 data member deletions:
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::alloc_disp', at offset 0 (in bits) at offload_common.h:246:1
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::has_length', at offset 0 (in bits) at offload_common.h:240:1
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_noncont_dst', at offset 0 (in bits) at offload_common.h:250:1
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_noncont_src', at offset 0 (in bits) at offload_common.h:248:1
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_stack_buf', at offset 0 (in bits) at offload_common.h:242:1
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::is_static', at offset 0 (in bits) at offload_common.h:236:1
-
-                'uint32_t VarDesc::__anonymous_union__::__anonymous_struct__::sink_addr', at offset 0 (in bits) at offload_common.h:244:1
-
-              13 data member insertions:
-                'uint32_t varDescFlags::__anonymous_struct__::alloc_disp', at offset 0 (in bits) at offload_common.h:237:1
-                'uint32_t varDescFlags::__anonymous_struct__::always_copy', at offset 0 (in bits) at offload_common.h:244:1
-                'uint32_t varDescFlags::__anonymous_struct__::always_delete', at offset 0 (in bits) at offload_common.h:246:1
-                'uint32_t varDescFlags::__anonymous_struct__::has_length', at offset 0 (in bits) at offload_common.h:224:1
-                'uint32_t varDescFlags::__anonymous_struct__::is_noncont_dst', at offset 0 (in bits) at offload_common.h:241:1
-                'uint32_t varDescFlags::__anonymous_struct__::is_pointer', at offset 0 (in bits) at offload_common.h:232:1
-                'uint32_t varDescFlags::__anonymous_struct__::is_stack_buf', at offset 0 (in bits) at offload_common.h:226:1
-                'uint32_t varDescFlags::__anonymous_struct__::is_static', at offset 0 (in bits) at offload_common.h:220:1
-                'uint32_t varDescFlags::__anonymous_struct__::is_static_dstn', at offset 0 (in bits) at offload_common.h:222:1
-                'uint32_t varDescFlags::__anonymous_struct__::pin', at offset 0 (in bits) at offload_common.h:248:1
-                'uint32_t varDescFlags::__anonymous_struct__::preallocated', at offset 0 (in bits) at offload_common.h:230:1
-                'uint32_t varDescFlags::__anonymous_struct__::sink_addr', at offset 0 (in bits) at offload_common.h:235:1
-                'uint32_t varDescFlags::__anonymous_struct__::targetptr', at offset 0 (in bits) at offload_common.h:228:1
-              no data member change (1 filtered);
+              6 data member insertions:
+                'uint32_t varDescFlags::__anonymous_struct__::pin', at offset 18 (in bits) at offload_common.h:248:1
+                'uint32_t varDescFlags::__anonymous_struct__::always_delete', at offset 19 (in bits) at offload_common.h:246:1
+                'uint32_t varDescFlags::__anonymous_struct__::always_copy', at offset 20 (in bits) at offload_common.h:244:1
+                'uint32_t varDescFlags::__anonymous_struct__::is_noncont_dst', at offset 21 (in bits) at offload_common.h:241:1
+                'uint32_t varDescFlags::__anonymous_struct__::is_noncont_src', at offset 22 (in bits) at offload_common.h:239:1
+                'uint32_t varDescFlags::__anonymous_struct__::alloc_disp', at offset 23 (in bits) at offload_common.h:237:1
+              no data member changes (8 filtered);
 
            no data member change (1 filtered);
 
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index aa544f91cae687ec35d67ca9cbaf92a142f369c3..ebe2f1f7141ffa2f765ca878fef8b9a7404f7cf5 100644 (file)
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -57,8 +57,8 @@
     </class-decl>
     <type-decl name='double' size-in-bits='64' id='type-id-5'/>
     <class-decl name='s0' size-in-bits='384' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='13' column='1' id='type-id-6'>
-      <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-1'/>
-      <base-class access='public' layout-offset-in-bits='32' is-virtual='yes' type-id='type-id-4'/>
+      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-1'/>
+      <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='type-id-4'/>
       <member-type access='public'>
         <typedef-decl name='integer' type-id='type-id-8' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='type-id-7'/>
       </member-type>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index f4a700ccbab8777c6f3d665fd6e02c46aaac114e..944ea26ccbb644b5c448cfeb73e4c59c3c16f2a8 100644 (file)
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -13103,7 +13103,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0ul, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-1027'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1033'/>
-        <base-class access='private' layout-offset-in-bits='4' type-id='type-id-1034'/>
+        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-1034'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1033' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-1035'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index c2613fe30aff55233a5367ce5fe23d22209bbe45..25ae40351c864fbe0c479c0974cf444842dc0404 100644 (file)
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -10560,7 +10560,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-936'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
-        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-946'/>
+        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-946'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-945' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-947'/>
         </member-type>
@@ -10842,7 +10842,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-965'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
-        <base-class access='private' layout-offset-in-bits='16' type-id='type-id-976'/>
+        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-976'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-975' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-977'/>
         </member-type>
@@ -10932,7 +10932,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-975'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-984'/>
-        <base-class access='private' layout-offset-in-bits='8' type-id='type-id-985'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-985'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-984' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-986'/>
         </member-type>
@@ -11539,7 +11539,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1035'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
-        <base-class access='private' layout-offset-in-bits='8' type-id='type-id-1040'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-1040'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1039' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1041'/>
         </member-type>
@@ -11916,7 +11916,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *, mongo::Status&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1070'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1076'/>
-        <base-class access='private' layout-offset-in-bits='8' type-id='type-id-1077'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-1077'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1076' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1078'/>
         </member-type>
@@ -12335,7 +12335,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1112'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1117'/>
-        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-946'/>
+        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-946'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1118'/>
         </member-type>
@@ -12611,7 +12611,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1133'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1141'/>
-        <base-class access='private' layout-offset-in-bits='16' type-id='type-id-976'/>
+        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-976'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1141' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1142'/>
         </member-type>
@@ -12699,7 +12699,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1141'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1149'/>
-        <base-class access='private' layout-offset-in-bits='8' type-id='type-id-985'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-985'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1149' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1150'/>
         </member-type>
@@ -13110,7 +13110,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1191'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1197'/>
-        <base-class access='private' layout-offset-in-bits='4' type-id='type-id-1198'/>
+        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-1198'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1197' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1199'/>
         </member-type>
@@ -13537,7 +13537,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1236'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1243'/>
-        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-946'/>
+        <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-946'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1243' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1244'/>
         </member-type>
@@ -13633,7 +13633,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1243'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1251'/>
-        <base-class access='private' layout-offset-in-bits='56' type-id='type-id-1252'/>
+        <base-class access='private' layout-offset-in-bits='448' type-id='type-id-1252'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1251' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1253'/>
         </member-type>
@@ -13819,7 +13819,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1260'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1269'/>
-        <base-class access='private' layout-offset-in-bits='40' type-id='type-id-976'/>
+        <base-class access='private' layout-offset-in-bits='320' type-id='type-id-976'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1269' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1270'/>
         </member-type>
@@ -13909,7 +13909,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1269'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1277'/>
-        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-1278'/>
+        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-1278'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1277' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1279'/>
         </member-type>
@@ -14710,7 +14710,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1344'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1353'/>
-        <base-class access='private' layout-offset-in-bits='72' type-id='type-id-1354'/>
+        <base-class access='private' layout-offset-in-bits='576' type-id='type-id-1354'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1353' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1355'/>
         </member-type>
@@ -15453,7 +15453,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1414'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1422'/>
-        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-1354'/>
+        <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-1354'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1422' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1423'/>
         </member-type>
@@ -15534,7 +15534,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-1422'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1430'/>
-        <base-class access='private' layout-offset-in-bits='56' type-id='type-id-1363'/>
+        <base-class access='private' layout-offset-in-bits='448' type-id='type-id-1363'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-1430' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-1431'/>
         </member-type>
@@ -36523,7 +36523,7 @@
     <namespace-decl name='std'>
       <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3657'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3693'/>
-        <base-class access='private' layout-offset-in-bits='8' type-id='type-id-3694'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3694'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-3693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3695'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index a7880a86fa7ad98c208df4b85e925c95e928a8ce..6036e5529a8e9ae4902d1362049a769f56c1db7b 100644 (file)
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -265,16 +265,16 @@
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='dummy3' type-id='type-id-9' visibility='default' filepath='../dbus/dbus-string.h' line='50' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='dummy_bit1' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-string.h' line='51' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='dummy_bit2' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-string.h' line='52' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='dummy_bit3' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-string.h' line='53' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='26'>
         <var-decl name='dummy_bits' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-string.h' line='54' column='1'/>
       </data-member>
     </class-decl>
@@ -309,19 +309,19 @@
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='message' type-id='type-id-3' visibility='default' filepath='../dbus/dbus-errors.h' line='51' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='dummy1' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-errors.h' line='53' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='dummy2' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-errors.h' line='54' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='dummy3' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-errors.h' line='55' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='dummy4' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-errors.h' line='56' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='27'>
         <var-decl name='dummy5' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-errors.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
@@ -426,22 +426,22 @@
       <data-member access='public' layout-offset-in-bits='1536'>
         <var-decl name='allowed_mechs' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='181' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='needed_memory' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='185' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='already_got_mechanisms' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='188' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='already_asked_for_initial_response' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='189' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='buffer_outstanding' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='190' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
+      <data-member access='public' layout-offset-in-bits='27'>
         <var-decl name='unix_fd_possible' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='192' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1600'>
+      <data-member access='public' layout-offset-in-bits='26'>
         <var-decl name='unix_fd_negotiated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-auth.c' line='193' column='1'/>
       </data-member>
     </class-decl>
@@ -862,22 +862,22 @@
       <data-member access='public' layout-offset-in-bits='2016'>
         <var-decl name='io_path_acquired' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='313' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='shareable' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='315' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='exit_on_disconnect' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='317' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='route_peer_messages' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='319' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='disconnected_message_arrived' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='321' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
+      <data-member access='public' layout-offset-in-bits='27'>
         <var-decl name='disconnected_message_processed' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='325' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2048'>
+      <data-member access='public' layout-offset-in-bits='26'>
         <var-decl name='have_connection_lock' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
@@ -911,10 +911,10 @@
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='body' type-id='type-id-5' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='105' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='locked' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='107' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='in_cache' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
@@ -923,7 +923,7 @@
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='size_counter_delta' type-id='type-id-104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='114' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
+      <data-member access='public' layout-offset-in-bits='11'>
         <var-decl name='changed_stamp' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
@@ -952,10 +952,10 @@
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='fields' type-id='type-id-106' visibility='default' filepath='../dbus/dbus-marshal-header.h' line='54' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='padding' type-id='type-id-21' visibility='default' filepath='../dbus/dbus-marshal-header.h' line='58' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
+      <data-member access='public' layout-offset-in-bits='21'>
         <var-decl name='byte_order' type-id='type-id-21' visibility='default' filepath='../dbus/dbus-marshal-header.h' line='59' column='1'/>
       </data-member>
     </class-decl>
@@ -2099,13 +2099,13 @@
       <return type-id='type-id-11'/>
     </function-decl>
     <class-decl name='DBusTypeReader' size-in-bits='448' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='40' column='1' id='type-id-199'>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='byte_order' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='41' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='23'>
         <var-decl name='finished' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='43' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='20'>
         <var-decl name='array_len_offset' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -2203,16 +2203,16 @@
       <return type-id='type-id-11'/>
     </function-decl>
     <class-decl name='DBusTypeWriter' size-in-bits='384' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='65' column='1' id='type-id-220'>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='byte_order' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='66' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='container_type' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='68' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='15'>
         <var-decl name='type_pos_is_expectation' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='70' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='14'>
         <var-decl name='enabled' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-marshal-recursive.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -2516,13 +2516,13 @@
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='corruption_reason' type-id='type-id-197' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='71' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='corrupted' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='73' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='buffer_outstanding' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='75' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='unix_fds_outstanding' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message-private.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
@@ -3296,7 +3296,7 @@
       <data-member access='public' layout-offset-in-bits='416'>
         <var-decl name='max_subtrees' type-id='type-id-9' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-object-tree.c' line='79' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='invoke_as_fallback' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-object-tree.c' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='456'>
@@ -3390,10 +3390,10 @@
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='reply_serial' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='76' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='completed' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='78' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='timeout_added' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='79' column='1'/>
       </data-member>
     </class-decl>
@@ -3569,7 +3569,7 @@
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='notify_data' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-resources.c' line='70' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='notify_pending' type-id='type-id-22' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-resources.c' line='71' column='1'/>
       </data-member>
     </class-decl>
@@ -3677,10 +3677,10 @@
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='auth_mechanisms' type-id='type-id-33' visibility='default' filepath='../dbus/dbus-server-protected.h' line='85' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='disconnected' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-server-protected.h' line='87' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='have_server_lock' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-server-protected.h' line='90' column='1'/>
       </data-member>
     </class-decl>
@@ -4114,7 +4114,7 @@
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='free_data_function' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='50' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='enabled' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='51' column='1'/>
       </data-member>
     </class-decl>
@@ -4495,25 +4495,25 @@
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='free_windows_user_data' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='111' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='disconnected' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='113' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='authenticated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='114' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='send_credentials_pending' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='115' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='receive_credentials_pending' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='116' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='27'>
         <var-decl name='is_server' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='117' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='26'>
         <var-decl name='unused_bytes_recovered' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='118' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
+      <data-member access='public' layout-offset-in-bits='25'>
         <var-decl name='allow_anonymous' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport-protected.h' line='119' column='1'/>
       </data-member>
     </class-decl>
@@ -4825,10 +4825,10 @@
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='free_data_function' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='51' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='enabled' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='52' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='oom_last_time' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='53' column='1'/>
       </data-member>
     </class-decl>
@@ -5656,7 +5656,7 @@
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='block_size' type-id='type-id-9' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-mempool.c' line='101' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='zero_elements' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-mempool.c' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 7a9458532cd86dd74a34d4e3112229520ecfdfd6..e47280d8e72bf0c76272b5e5feb6ccc033f6cfd6 100644 (file)
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -6251,7 +6251,7 @@
     <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-280'/>
     <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-279'/>
     <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-281'>
-      <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-282'/>
+      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-282'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='backend' type-id='type-id-231' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
       </data-member>
@@ -8433,7 +8433,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' language='LANG_C_plus_plus'>
     <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-355'>
-      <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-282'/>
+      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-282'/>
       <member-type access='private'>
         <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-356'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -8678,7 +8678,7 @@
       <return type-id='type-id-152'/>
     </function-decl>
     <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-363'>
-      <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-282'/>
+      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-282'/>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-355'/>
       <data-member access='private' static='yes'>
         <var-decl name='ZERO' type-id='type-id-168' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
@@ -10567,7 +10567,7 @@
     </function-decl>
     <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-226'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-281'/>
-      <base-class access='public' layout-offset-in-bits='16' type-id='type-id-363'/>
+      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-363'/>
       <data-member access='private' layout-offset-in-bits='5248'>
         <var-decl name='backend' type-id='type-id-231' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
       </data-member>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index aadf4aa0026a3910f6d427f149eaccacf7e712e3..815e675c4b96dd327c1fd88e50e38aa8bebfdd7d 100644 (file)
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -11621,7 +11621,7 @@
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='req' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='14' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='type' type-id='type-id-634' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index a710c3d682d625369bb333809b7e6b86d8514936..2d3caa21ceed88821c5790b1aa0777a1c44127e0 100644 (file)
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -26732,7 +26732,7 @@
         <union-decl name='__anonymous_union__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='256' column='1' id='type-id-2197'>
           <member-type access='private'>
             <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='257' column='1' id='type-id-2198'>
-              <data-member access='public' layout-offset-in-bits='0'>
+              <data-member access='public' layout-offset-in-bits='4'>
                 <var-decl name='dst' type-id='type-id-420' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='258' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -26752,10 +26752,10 @@
         <union-decl name='__anonymous_union__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='265' column='1' id='type-id-2199'>
           <member-type access='private'>
             <class-decl name='__anonymous_struct__' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='266' column='1' id='type-id-2200'>
-              <data-member access='public' layout-offset-in-bits='0'>
+              <data-member access='public' layout-offset-in-bits='7'>
                 <var-decl name='in' type-id='type-id-420' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='267' column='1'/>
               </data-member>
-              <data-member access='public' layout-offset-in-bits='0'>
+              <data-member access='public' layout-offset-in-bits='6'>
                 <var-decl name='out' type-id='type-id-420' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='268' column='1'/>
               </data-member>
             </class-decl>
@@ -26828,46 +26828,46 @@
     <union-decl name='varDescFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='217' column='1' id='type-id-2203'>
       <member-type access='private'>
         <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='218' column='1' id='type-id-2204'>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='31'>
             <var-decl name='is_static' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='220' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='30'>
             <var-decl name='is_static_dstn' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='222' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='29'>
             <var-decl name='has_length' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='224' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='28'>
             <var-decl name='is_stack_buf' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='226' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='27'>
             <var-decl name='targetptr' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='228' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='26'>
             <var-decl name='preallocated' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='230' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='25'>
             <var-decl name='is_pointer' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='232' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='24'>
             <var-decl name='sink_addr' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='235' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='23'>
             <var-decl name='alloc_disp' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='237' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='22'>
             <var-decl name='is_noncont_src' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='239' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='21'>
             <var-decl name='is_noncont_dst' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='241' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='20'>
             <var-decl name='always_copy' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='244' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='19'>
             <var-decl name='always_delete' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='246' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='18'>
             <var-decl name='pin' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='248' column='1'/>
           </data-member>
         </class-decl>
@@ -27018,10 +27018,10 @@
     <union-decl name='OffloadFlags' size-in-bits='32' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='160' column='1' id='type-id-2161'>
       <member-type access='private'>
         <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='162' column='1' id='type-id-2217'>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='31'>
             <var-decl name='fortran_traceback' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='163' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='0'>
+          <data-member access='public' layout-offset-in-bits='30'>
             <var-decl name='omp_async' type-id='type-id-411' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_common.h' line='164' column='1'/>
           </data-member>
         </class-decl>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index c778f695acc9a843af09b77c6570b91d0a25977c..01530f8508cc3acb7d078af6c41df9f6f5f77b58 100644 (file)
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -829,10 +829,10 @@
       </data-member>
     </union-decl>
     <class-decl name='hb_options_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='914' column='1' id='type-id-72'>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='915' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='uniscribe_bug_compatible' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='916' column='1'/>
       </data-member>
     </class-decl>
@@ -20690,10 +20690,10 @@
           <data-member access='public' layout-offset-in-bits='224'>
             <var-decl name='_1_mask' type-id='type-id-97' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='51' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='256'>
+          <data-member access='public' layout-offset-in-bits='31'>
             <var-decl name='needs_fallback' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='52' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='256'>
+          <data-member access='public' layout-offset-in-bits='30'>
             <var-decl name='auto_zwj' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='53' column='1'/>
           </data-member>
           <member-function access='public' static='yes'>
@@ -20710,7 +20710,7 @@
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='index' type-id='type-id-63' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
           </data-member>
-          <data-member access='public' layout-offset-in-bits='16'>
+          <data-member access='public' layout-offset-in-bits='15'>
             <var-decl name='auto_zwj' type-id='type-id-63' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='61' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
@@ -22104,13 +22104,13 @@
       <data-member access='public' layout-offset-in-bits='8704'>
         <var-decl name='kern_mask' type-id='type-id-97' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='44' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8736'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='has_frac' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='45' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8736'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='has_kern' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='46' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='8736'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='has_mark' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='47' column='1'/>
       </data-member>
       <member-function access='public'>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index cbca315984c053f4c14a8a88d0fa496091bf386a..3c0bc33115fdf38a404afbef05fe845fa07c0be0 100644 (file)
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -5179,16 +5179,16 @@
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='objects' type-id='type-id-92' visibility='default' filepath='src/span.h' line='50' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
+        <data-member access='public' layout-offset-in-bits='16'>
           <var-decl name='refcount' type-id='type-id-114' visibility='default' filepath='src/span.h' line='51' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
+        <data-member access='public' layout-offset-in-bits='8'>
           <var-decl name='sizeclass' type-id='type-id-114' visibility='default' filepath='src/span.h' line='52' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
+        <data-member access='public' layout-offset-in-bits='6'>
           <var-decl name='location' type-id='type-id-114' visibility='default' filepath='src/span.h' line='53' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
+        <data-member access='public' layout-offset-in-bits='5'>
           <var-decl name='sample' type-id='type-id-114' visibility='default' filepath='src/span.h' line='54' column='1'/>
         </data-member>
       </class-decl>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index 66ed9baf16f50bda489789388828c4746b1730df..39e15465e9dc554d683f33dcc929212cfa1f4598 100644 (file)
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -780,13 +780,13 @@
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='extra_arg' type-id='type-id-2' visibility='default' filepath='../.././gcc/../include/obstack.h' line='178' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='use_extra_arg' type-id='type-id-22' visibility='default' filepath='../.././gcc/../include/obstack.h' line='179' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='maybe_empty_object' type-id='type-id-22' visibility='default' filepath='../.././gcc/../include/obstack.h' line='180' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='alloc_failed' type-id='type-id-22' visibility='default' filepath='../.././gcc/../include/obstack.h' line='184' column='1'/>
       </data-member>
     </class-decl>
@@ -1130,7 +1130,7 @@
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='start_location' type-id='type-id-89' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='205' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='reason' type-id='type-id-114' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='208' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -1150,7 +1150,7 @@
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='sysp' type-id='type-id-116' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='84' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='column_bits' type-id='type-id-22' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='87' column='1'/>
       </data-member>
     </class-decl>
@@ -3897,16 +3897,16 @@
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ident' type-id='type-id-202' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='677' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='is_directive' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='678' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='directive_index' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='679' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='136'>
         <var-decl name='rid_code' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='682' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <data-member access='public' layout-offset-in-bits='10'>
         <var-decl name='type' type-id='type-id-203' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='683' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
@@ -3975,22 +3975,22 @@
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='paramc' type-id='type-id-29' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='60' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
+      <data-member access='public' layout-offset-in-bits='15'>
         <var-decl name='fun_like' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='63' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
+      <data-member access='public' layout-offset-in-bits='14'>
         <var-decl name='variadic' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='66' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
+      <data-member access='public' layout-offset-in-bits='13'>
         <var-decl name='syshdr' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='69' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
+      <data-member access='public' layout-offset-in-bits='12'>
         <var-decl name='used' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='72' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
+      <data-member access='public' layout-offset-in-bits='11'>
         <var-decl name='traditional' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='75' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
+      <data-member access='public' layout-offset-in-bits='10'>
         <var-decl name='extra_tokens' type-id='type-id-22' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
@@ -4020,7 +4020,7 @@
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='src_loc' type-id='type-id-89' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='224' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='type' type-id='type-id-220' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
@@ -4620,13 +4620,13 @@
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='need_line' type-id='type-id-50' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
+      <data-member access='public' layout-offset-in-bits='23'>
         <var-decl name='warned_cplusplus_comments' type-id='type-id-22' visibility='default' filepath='../.././libcpp/internal.h' line='332' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
+      <data-member access='public' layout-offset-in-bits='22'>
         <var-decl name='from_stage3' type-id='type-id-22' visibility='default' filepath='../.././libcpp/internal.h' line='337' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
+      <data-member access='public' layout-offset-in-bits='21'>
         <var-decl name='return_at_eof' type-id='type-id-22' visibility='default' filepath='../.././libcpp/internal.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='784'>
@@ -5277,13 +5277,13 @@
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='line' type-id='type-id-89' visibility='default' filepath='../.././libcpp/internal.h' line='367' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
+      <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='syshdr' type-id='type-id-22' visibility='default' filepath='../.././libcpp/internal.h' line='369' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
+      <data-member access='public' layout-offset-in-bits='30'>
         <var-decl name='used' type-id='type-id-22' visibility='default' filepath='../.././libcpp/internal.h' line='371' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
+      <data-member access='public' layout-offset-in-bits='29'>
         <var-decl name='is_undef' type-id='type-id-22' visibility='default' filepath='../.././libcpp/internal.h' line='374' column='1'/>
       </data-member>
     </class-decl>
@@ -9981,21 +9981,21 @@
       </data-member>
     </union-decl>
     <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-498'>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='25'>
         <var-decl name='__w_termsig' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='73' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='__w_coredump' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='74' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='__w_retcode' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='75' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-499'>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='__w_stopval' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='88' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
+      <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='__w_stopsig' type-id='type-id-22' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='89' column='1'/>
       </data-member>
     </class-decl>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index a37b94c937343b8fbb24134c1cfb35b8afc07041..cd813a69af3bbf8cd82dbf7f17d5906bb9043756 100644 (file)
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -12578,7 +12578,7 @@
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0ul, std::_Mem_fn&lt;void (std::thread::*)()&gt;, std::reference_wrapper&lt;std::thread&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-627'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-628'/>
-        <base-class access='public' layout-offset-in-bits='8' type-id='type-id-629'/>
+        <base-class access='public' layout-offset-in-bits='64' type-id='type-id-629'/>
         <member-type access='public'>
           <typedef-decl name='_Inherited' type-id='type-id-628' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-630'/>
         </member-type>
@@ -33024,13 +33024,13 @@
         <data-member access='private' layout-offset-in-bits='576'>
           <var-decl name='_M_free_fun' type-id='type-id-828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='119' column='1'/>
         </data-member>
-        <data-member access='private' layout-offset-in-bits='640'>
+        <data-member access='private' layout-offset-in-bits='7'>
           <var-decl name='_M_dynamic' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='121' column='1'/>
         </data-member>
-        <data-member access='private' layout-offset-in-bits='640'>
+        <data-member access='private' layout-offset-in-bits='6'>
           <var-decl name='_M_frozen' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='122' column='1'/>
         </data-member>
-        <data-member access='private' layout-offset-in-bits='640'>
+        <data-member access='private' layout-offset-in-bits='5'>
           <var-decl name='_M_constant' type-id='type-id-34' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='123' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
@@ -46086,11 +46086,11 @@
       </class-decl>
       <class-decl name='_Rope_RopeRep&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='583' column='1' id='type-id-1918'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1927'/>
-        <base-class access='public' layout-offset-in-bits='8' type-id='type-id-1928'/>
+        <base-class access='public' layout-offset-in-bits='64' type-id='type-id-1928'/>
         <member-type access='public'>
           <typedef-decl name='allocator_type' type-id='type-id-1930' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='606' column='1' id='type-id-1929'/>
         </member-type>
-        <data-member access='public' layout-offset-in-bits='448'>
+        <data-member access='public' layout-offset-in-bits='24'>
           <var-decl name='_M_tag' type-id='type-id-1910' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='590' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='456'>
@@ -46484,11 +46484,11 @@
       </class-decl>
       <class-decl name='_Rope_RopeRep&lt;wchar_t, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='583' column='1' id='type-id-1972'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1980'/>
-        <base-class access='public' layout-offset-in-bits='8' type-id='type-id-1928'/>
+        <base-class access='public' layout-offset-in-bits='64' type-id='type-id-1928'/>
         <member-type access='public'>
           <typedef-decl name='allocator_type' type-id='type-id-1982' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='606' column='1' id='type-id-1981'/>
         </member-type>
-        <data-member access='public' layout-offset-in-bits='448'>
+        <data-member access='public' layout-offset-in-bits='24'>
           <var-decl name='_M_tag' type-id='type-id-1910' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='590' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='456'>
@@ -48680,7 +48680,7 @@
       </class-decl>
       <class-decl name='basic_iostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-2072'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-151'/>
-        <base-class access='public' layout-offset-in-bits='16' type-id='type-id-1357'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1357'/>
         <member-function access='private'>
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2073' is-artificial='yes'/>
@@ -48767,7 +48767,7 @@
       </class-decl>
       <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-1648'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-141'/>
-        <base-class access='public' layout-offset-in-bits='16' type-id='type-id-1351'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1351'/>
         <member-function access='private'>
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1649' is-artificial='yes'/>
@@ -49604,7 +49604,7 @@
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::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-82'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::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-84'/>
       <class-decl name='basic_istream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='56' column='1' id='type-id-141'>
-        <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-14'/>
+        <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-14'/>
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='655' column='1' id='type-id-142'>
             <member-type access='private'>
@@ -50478,7 +50478,7 @@
       </class-decl>
       <typedef-decl name='wstreampos' type-id='type-id-1633' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='232' column='1' id='type-id-2123'/>
       <class-decl name='basic_istream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2240' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='56' column='1' id='type-id-151'>
-        <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-45'/>
+        <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-45'/>
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='655' column='1' id='type-id-152'>
             <member-type access='private'>
@@ -57096,7 +57096,7 @@
         <return type-id='type-id-1495'/>
       </function-decl>
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1351'>
-        <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-14'/>
+        <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-14'/>
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-2305'>
             <data-member access='private' layout-offset-in-bits='0'>
@@ -57554,7 +57554,7 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <class-decl name='basic_ostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1357'>
-        <base-class access='public' layout-offset-in-bits='24' is-virtual='yes' type-id='type-id-45'/>
+        <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-45'/>
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-2318'>
             <data-member access='private' layout-offset-in-bits='0'>
Domain: System / Toolchain;