* var-tracking.c (emit_note_insn_var_location): For one part

	notes with offset 0, don't add EXPR_LIST around the location.
	* dwarf2out.c (loc_descriptor, dw_loc_list_1,
	add_location_or_const_value_attribute): Adjust for that change.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157763 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6fa2dc3..4afbe76 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2010-03-26  Jakub Jelinek  <jakub@redhat.com>
 
+       * var-tracking.c (emit_note_insn_var_location): For one part
+       notes with offset 0, don't add EXPR_LIST around the location.
+       * dwarf2out.c (loc_descriptor, dw_loc_list_1,
+       add_location_or_const_value_attribute): Adjust for that change.
+
        PR debug/43540
        * dwarf2out.c (reg_save): For DW_CFA_expression put regnum
        into first operand and location into second.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 49779e7..8125e2e 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -16305,7 +16305,7 @@ add_location_or_const_value_attribute (dw_die_ref die, tree decl,
       struct var_loc_node *node;
 
       node = loc_list->first;
-      rtl = NOTE_VAR_LOCATION_LOC (node->loc);
+      rtl = NOTE_VAR_LOCATION_LOC (node->var_loc_note);
       if (GET_CODE (rtl) == EXPR_LIST)
        rtl = XEXP (rtl, 0);
       if ((CONSTANT_P (rtl) || GET_CODE (rtl) == CONST_STRING)