diff options
| author | Per Bothner <per@bothner.com> | 2004-06-30 11:18:01 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-06-30 11:18:01 -0700 |
| commit | 6773e15fa5ac64bf67b19088e149f4d3cda2cf9a (patch) | |
| tree | f55d68b85e9f94ddf4bbe5761ff0a2f4ee16bbc9 /gcc/cfglayout.c | |
| parent | a281759fdf4cc20f179d37ef875f7c233ab68f46 (diff) | |
| download | gcc-6773e15fa5ac64bf67b19088e149f4d3cda2cf9a.zip gcc-6773e15fa5ac64bf67b19088e149f4d3cda2cf9a.tar.gz gcc-6773e15fa5ac64bf67b19088e149f4d3cda2cf9a.tar.bz2 | |
Conditionally compile support for --enable-mapped_location.
* cfgexpand.c: Handle USE_MAPPED_LOCATION case for function_end_locus.
* cfglayout.c (insn_locators_initialize): Const cleanup. New macros.
* cfgrtl.c (delete_insn): Use new NOTE_DELETED_LABEL_NAME macro.
* print-rtl.c (print_rtx): Likewise.
* emit-rtl.c: Don't clear NOTE_SOURCE_FILE if USE_MAPPED_LOCATION.
* combine.c: Use new SET_INSN_DELETED macro.
* flow.c: Likewise.
* haifa-sched.c: Likewise.
* ifcvt.c: Likewise.
* recog.c: Likewise.
* reload1.c: Likewise.
* diagnostic.c: Use expand_location macro.
* pretty-print.c (pp_base_format_text): Likewise.
* profile.c: Likewise.
* dwarf2out.c: Likewise. Also use expand_location, DECL_IS_BUILTIN.
* dwarf2out.c (dwarf2out_decl: Use BUILTINS_LOCATION.
* emit-rtl.c (emit_line_note): Simplify if USE_MAPPED_LOCATION.
(force_next_line_note, insn_emit): Handle USE_MAPPED_LOCATION case.
* final.c (final): Likewise.
* haifa-sched.c: Likewise.
* integrate.c: Likewise.
* jump.c: Likewise.
* rtl-error.c: Likewise.
* stmt.c (check_seenlabel): Likewise.
* tree-pretty-print.c: Likewise.
From-SVN: r83921
Diffstat (limited to 'gcc/cfglayout.c')
| -rw-r--r-- | gcc/cfglayout.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c index e887015..be890d9 100644 --- a/gcc/cfglayout.c +++ b/gcc/cfglayout.c @@ -254,7 +254,7 @@ insn_locators_initialize (void) rtx insn, next; int loc = 0; int line_number = 0, last_line_number = 0; - char *file_name = NULL, *last_file_name = NULL; + const char *file_name = NULL, *last_file_name = NULL; prologue_locator = epilogue_locator = 0; @@ -293,7 +293,7 @@ insn_locators_initialize (void) { loc++; VARRAY_PUSH_INT (file_locators_locs, loc); - VARRAY_PUSH_CHAR_PTR (file_locators_files, file_name); + VARRAY_PUSH_CHAR_PTR (file_locators_files, (char *) file_name); last_file_name = file_name; } } @@ -324,8 +324,10 @@ insn_locators_initialize (void) default: if (NOTE_LINE_NUMBER (insn) > 0) { - line_number = NOTE_LINE_NUMBER (insn); - file_name = (char *)NOTE_SOURCE_FILE (insn); + expanded_location xloc; + NOTE_EXPANDED_LOCATION (xloc, insn); + line_number = xloc.line; + file_name = xloc.file; } break; } |