Skip to content

Commit 0327869

Browse files
committed
Fix size check in dwarf2_evaluate_loc_desc_full
This Rust bug report: rust-lang/rust#41970 noted an error from gdb. What is happening here (for me, the original report had a different error) is that a pieced DWARF expression is not writing to every byte in the resulting value. GDB errors in this case. However, it seems to me that it is always valid to write fewer bytes; the issue comes from writing too many -- that is, the test is reversed. The test was also checking the sub-object, but this also seems incorrect, as it's expected for the expression to write the entirety of the enclosing object. So, this patch reverses the test and applies it to the outer type, not the subobject type. Regtested on the buildbot. gdb/ChangeLog 2017-07-09 Tom Tromey <[email protected]> * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): Reverse size check and apply to outer type. gdb/testsuite/ChangeLog 2017-07-09 Tom Tromey <[email protected]> * gdb.dwarf2/shortpiece.exp: New file.
1 parent f4db828 commit 0327869

File tree

4 files changed

+112
-1
lines changed

4 files changed

+112
-1
lines changed

gdb/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2017-07-09 Tom Tromey <[email protected]>
2+
3+
* dwarf2loc.c (dwarf2_evaluate_loc_desc_full): Reverse size
4+
check and apply to outer type.
5+
16
2017-07-07 John Baldwin <[email protected]>
27

38
* fbsd-tdep.c (LWPINFO_OFFSET, LWPINFO_PL_FLAGS)

gdb/dwarf2loc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2398,7 +2398,9 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
23982398

23992399
for (i = 0; i < ctx.num_pieces; ++i)
24002400
bit_size += ctx.pieces[i].size;
2401-
if (8 * (subobj_byte_offset + TYPE_LENGTH (subobj_type)) > bit_size)
2401+
/* Complain if the expression is larger than the size of the
2402+
outer type. */
2403+
if (bit_size > 8 * TYPE_LENGTH (type))
24022404
invalid_synthetic_pointer ();
24032405

24042406
c = allocate_piece_closure (per_cu, ctx.num_pieces, ctx.pieces,

gdb/testsuite/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2017-07-09 Tom Tromey <[email protected]>
2+
3+
* gdb.dwarf2/shortpiece.exp: New file.
4+
15
2017-07-06 David Blaikie <[email protected]>
26

37
* gdb.dwarf2/fission-multi-cu.S: Test containing multiple CUs in a DWO,
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# Copyright 2017 Free Software Foundation, Inc.
2+
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; either version 3 of the License, or
6+
# (at your option) any later version.
7+
#
8+
# This program is distributed in the hope that it will be useful,
9+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
# GNU General Public License for more details.
12+
#
13+
# You should have received a copy of the GNU General Public License
14+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15+
16+
load_lib dwarf.exp
17+
18+
# This test can only be run on targets which support DWARF-2 and use gas.
19+
if {![dwarf2_support]} {
20+
return 0
21+
}
22+
23+
standard_testfile main.c shortpiece-dw.S
24+
25+
# Make some DWARF for the test.
26+
set asm_file [standard_output_file $srcfile2]
27+
Dwarf::assemble $asm_file {
28+
global pair
29+
30+
cu { addr_size 4 } {
31+
compile_unit {} {
32+
declare_labels int_label ushort_label struct_label
33+
34+
int_label: DW_TAG_base_type {
35+
{DW_AT_byte_size 4 DW_FORM_udata}
36+
{DW_AT_encoding @DW_ATE_unsigned}
37+
{DW_AT_name "myint"}
38+
}
39+
ushort_label: DW_TAG_base_type {
40+
{DW_AT_byte_size 2 DW_FORM_udata}
41+
{DW_AT_encoding @DW_ATE_unsigned}
42+
{DW_AT_name "myushort"}
43+
}
44+
45+
struct_label: DW_TAG_structure_type {
46+
{DW_AT_name "S"}
47+
{DW_AT_byte_size 8 DW_FORM_udata}
48+
} {
49+
DW_TAG_member {
50+
{DW_AT_name "a"}
51+
{DW_AT_type :${int_label}}
52+
{DW_AT_data_member_location 0 DW_FORM_udata}
53+
}
54+
55+
DW_TAG_member {
56+
{DW_AT_name "b"}
57+
{DW_AT_type :${ushort_label}}
58+
{DW_AT_data_member_location 4 DW_FORM_udata}
59+
}
60+
}
61+
62+
DW_TAG_variable {
63+
{DW_AT_name "s1"}
64+
{DW_AT_type :${struct_label}}
65+
{DW_AT_external 1 DW_FORM_flag}
66+
{DW_AT_location {
67+
DW_OP_constu 1
68+
DW_OP_stack_value
69+
DW_OP_piece 4
70+
DW_OP_constu 0
71+
DW_OP_stack_value
72+
DW_OP_piece 2
73+
} SPECIAL_expr}
74+
}
75+
76+
DW_TAG_variable {
77+
{DW_AT_name "s2"}
78+
{DW_AT_type :${struct_label}}
79+
{DW_AT_external 1 DW_FORM_flag}
80+
{DW_AT_location {
81+
DW_OP_constu 1
82+
DW_OP_stack_value
83+
DW_OP_piece 4
84+
DW_OP_constu 0
85+
DW_OP_stack_value
86+
DW_OP_piece 8
87+
} SPECIAL_expr}
88+
}
89+
}
90+
}
91+
}
92+
93+
if { [prepare_for_testing "failed to prepare" ${testfile} \
94+
[list $srcfile $asm_file] {nodebug}] } {
95+
return -1
96+
}
97+
98+
gdb_test "p s1" " = {a = 1, b = 0}"
99+
gdb_test "p s2" \
100+
"access outside bounds of object referenced via synthetic pointer"

0 commit comments

Comments
 (0)