diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-08-22 14:23:08 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-08-22 14:23:08 +0000 |
| commit | cff08b2b91cf10f7168730e19ad6c292acb846fc (patch) | |
| tree | 4557489d4528f43e8ee060ac3c8a601d4fa45394 | |
| parent | f65c531e03bfdb257e8e5319b4e4e8e5bb08c597 (diff) | |
| download | gcc-cff08b2b91cf10f7168730e19ad6c292acb846fc.zip gcc-cff08b2b91cf10f7168730e19ad6c292acb846fc.tar.gz gcc-cff08b2b91cf10f7168730e19ad6c292acb846fc.tar.bz2 | |
dwarf2out.c: Use rtx_insn
gcc/
* dwarf2out.c (last_var_location_insn): Strengthen this variable
from rtx to rtx_insn *.
(cached_next_real_insn): Likewise.
(dwarf2out_end_epilogue): Replace use of NULL_RTX with NULL when
working with insns.
(dwarf2out_var_location): Strengthen locals "next_real",
"next_note", "expected_next_loc_note", "last_start", "insn" from
rtx to rtx_insn *.
From-SVN: r214320
| -rw-r--r-- | gcc/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 22 |
2 files changed, 22 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1494d32..95419f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,16 @@ 2014-08-22 David Malcolm <dmalcolm@redhat.com> + * dwarf2out.c (last_var_location_insn): Strengthen this variable + from rtx to rtx_insn *. + (cached_next_real_insn): Likewise. + (dwarf2out_end_epilogue): Replace use of NULL_RTX with NULL when + working with insns. + (dwarf2out_var_location): Strengthen locals "next_real", + "next_note", "expected_next_loc_note", "last_start", "insn" from + rtx to rtx_insn *. + +2014-08-22 David Malcolm <dmalcolm@redhat.com> + * dwarf2cfi.c (add_cfis_to_fde): Strengthen locals "insn", "next" from rtx to rtx_insn *. (create_pseudo_cfg): Likewise for local "insn". diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 7428c95..f76fc3f 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -100,8 +100,8 @@ along with GCC; see the file COPYING3. If not see #include "gdb/gdb-index.h" static void dwarf2out_source_line (unsigned int, const char *, int, bool); -static rtx last_var_location_insn; -static rtx cached_next_real_insn; +static rtx_insn *last_var_location_insn; +static rtx_insn *cached_next_real_insn; #ifdef VMS_DEBUGGING_INFO int vms_file_stats_name (const char *, long long *, long *, char *, int *); @@ -1138,8 +1138,8 @@ dwarf2out_end_epilogue (unsigned int line ATTRIBUTE_UNUSED, dw_fde_ref fde; char label[MAX_ARTIFICIAL_LABEL_BYTES]; - last_var_location_insn = NULL_RTX; - cached_next_real_insn = NULL_RTX; + last_var_location_insn = NULL; + cached_next_real_insn = NULL; if (dwarf2out_do_cfi_asm ()) fprintf (asm_out_file, "\t.cfi_endproc\n"); @@ -21289,11 +21289,11 @@ dwarf2out_var_location (rtx_insn *loc_note) { char loclabel[MAX_ARTIFICIAL_LABEL_BYTES + 2]; struct var_loc_node *newloc; - rtx next_real, next_note; + rtx_insn *next_real, *next_note; static const char *last_label; static const char *last_postcall_label; static bool last_in_cold_section_p; - static rtx expected_next_loc_note; + static rtx_insn *expected_next_loc_note; tree decl; bool var_loc_p; @@ -21320,7 +21320,7 @@ dwarf2out_var_location (rtx_insn *loc_note) if (next_real) { if (expected_next_loc_note != loc_note) - next_real = NULL_RTX; + next_real = NULL; } next_note = NEXT_INSN (loc_note); @@ -21329,7 +21329,7 @@ dwarf2out_var_location (rtx_insn *loc_note) || ! NOTE_P (next_note) || (NOTE_KIND (next_note) != NOTE_INSN_VAR_LOCATION && NOTE_KIND (next_note) != NOTE_INSN_CALL_ARG_LOCATION)) - next_note = NULL_RTX; + next_note = NULL; if (! next_real) next_real = next_real_insn (loc_note); @@ -21340,7 +21340,7 @@ dwarf2out_var_location (rtx_insn *loc_note) cached_next_real_insn = next_real; } else - cached_next_real_insn = NULL_RTX; + cached_next_real_insn = NULL; /* If there are no instructions which would be affected by this note, don't do anything. */ @@ -21393,8 +21393,8 @@ dwarf2out_var_location (rtx_insn *loc_note) && in_first_function_p && maybe_at_text_label_p) { - static rtx last_start; - rtx insn; + static rtx_insn *last_start; + rtx_insn *insn; for (insn = loc_note; insn; insn = previous_insn (insn)) if (insn == last_start) break; |