diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/var-tracking.c | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f69622d..65f917a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-11-06 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> + + PR debug/45939 + * var-tracking.c (emit_note_insn_var_location): Make sure that + call related var location notes come before the normal ones. + 2010-11-05 H.J. Lu <hongjiu.lu@intel.com> PR target/46326 diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index 0dc8b15..b9c6908 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -7339,7 +7339,17 @@ emit_note_insn_var_location (void **varp, void *data) NOTE_DURING_CALL_P (note) = true; } else - note = emit_note_before (NOTE_INSN_VAR_LOCATION, insn); + { + /* Make sure that the call related notes come first. */ + while (NEXT_INSN (insn) + && NOTE_P (insn) + && NOTE_DURING_CALL_P (insn)) + insn = NEXT_INSN (insn); + if (NOTE_P (insn) && NOTE_DURING_CALL_P (insn)) + note = emit_note_after (NOTE_INSN_VAR_LOCATION, insn); + else + note = emit_note_before (NOTE_INSN_VAR_LOCATION, insn); + } NOTE_VAR_LOCATION (note) = note_vl; clear: |