diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-02-18 22:16:21 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-02-18 22:16:21 +0100 |
| commit | 70aacc9798fda3e38b42e04a57385f129c718837 (patch) | |
| tree | 494f909e469c2dc01c15445f1a3347d71f0e90f4 /gcc | |
| parent | b19fd0fd71f4ffb3f01d9b4a6333b38744e13c64 (diff) | |
| download | gcc-70aacc9798fda3e38b42e04a57385f129c718837.zip gcc-70aacc9798fda3e38b42e04a57385f129c718837.tar.gz gcc-70aacc9798fda3e38b42e04a57385f129c718837.tar.bz2 | |
re PR sanitizer/60142 ([asan] -fsanitize=address breaks debugging - stepping into functions no longer possible)
PR sanitizer/60142
* final.c (SEEN_BB): Remove.
(SEEN_NOTE, SEEN_EMITTED): Renumber.
(final_scan_insn): Don't force_source_line on second
NOTE_INSN_BASIC_BLOCK.
From-SVN: r207853
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/final.c | 17 |
2 files changed, 11 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 663144a..d8c3d04 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-02-18 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/60142 + * final.c (SEEN_BB): Remove. + (SEEN_NOTE, SEEN_EMITTED): Renumber. + (final_scan_insn): Don't force_source_line on second + NOTE_INSN_BASIC_BLOCK. + 2014-02-18 Uros Bizjak <ubizjak@gmail.com> PR target/60205 diff --git a/gcc/final.c b/gcc/final.c index 240ca67..83abee2 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -112,9 +112,8 @@ along with GCC; see the file COPYING3. If not see #endif /* Bitflags used by final_scan_insn. */ -#define SEEN_BB 1 -#define SEEN_NOTE 2 -#define SEEN_EMITTED 4 +#define SEEN_NOTE 1 +#define SEEN_EMITTED 2 /* Last insn processed by final_scan_insn. */ static rtx debug_insn; @@ -2128,9 +2127,7 @@ call_from_call_insn (rtx insn) SEEN is used to track the end of the prologue, for emitting debug information. We force the emission of a line note after - both NOTE_INSN_PROLOGUE_END and NOTE_INSN_FUNCTION_BEG, or - at the beginning of the second basic block, whichever comes - first. */ + both NOTE_INSN_PROLOGUE_END and NOTE_INSN_FUNCTION_BEG. */ rtx final_scan_insn (rtx insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED, @@ -2189,14 +2186,6 @@ final_scan_insn (rtx insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED, if (targetm.asm_out.unwind_emit) targetm.asm_out.unwind_emit (asm_out_file, insn); - if ((*seen & (SEEN_EMITTED | SEEN_BB)) == SEEN_BB) - { - *seen |= SEEN_EMITTED; - force_source_line = true; - } - else - *seen |= SEEN_BB; - discriminator = NOTE_BASIC_BLOCK (insn)->discriminator; break; |