write_pieced_value: Fix copy/paste error in size calculation

In write_pieced_value, the number of bytes containing a portion of the
bit-field in a given piece is calculated with the wrong starting offset;
thus the result may be off by one.  This bug was probably introduced when
copying this logic from read_pieced_value.  Fix it.

gdb/ChangeLog:

	* dwarf2loc.c (write_pieced_value): Fix copy/paste error in the
	calculation of this_size.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b2267630dd6fcf47c05feb9047cda5e57602d44..0845c61be94c75618117d2c61ffa599b1720b4ee 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+       * dwarf2loc.c (write_pieced_value): Fix copy/paste error in the
+       calculation of this_size.
+
 2017-06-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
        * dwarf2loc.c (read_pieced_value): Respect parent value's offset

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 6ce2993d0a778a5e06ab6462810dd5477374b194..1122c8a249317bef23dfc155c3d01291cf7c8f58 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -1983,7 +1983,7 @@ write_pieced_value (struct value *to, struct value *from)
       if (this_size_bits > type_len - offset)
        this_size_bits = type_len - offset;
 
-      this_size = (this_size_bits + source_offset_bits % 8 + 7) / 8;
+      this_size = (this_size_bits + dest_offset_bits % 8 + 7) / 8;
       source_offset = source_offset_bits / 8;
       dest_offset = dest_offset_bits / 8;
       if (dest_offset_bits % 8 == 0 && source_offset_bits % 8 == 0)