http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60142
Jakub Jelinek <jakub at gcc dot gnu.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |drow at gcc dot gnu.org,
| |rth at gcc dot gnu.org
--- Comment #7 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Ah, so it seems the emitting of forced line note at the end of second basic
block comes from:
http://gcc.gnu.org/ml/gcc-patches/2004-01/msg01589.html
If it is really just Daniel's paranoia that is the reason for it, perhaps we
can just force the line note change after both prologue notes, like:
--- gcc/final.c.jj 2014-01-03 11:40:35.000000000 +0100
+++ gcc/final.c 2014-02-18 14:50:36.675445581 +0100
@@ -112,9 +112,8 @@ along with GCC; see the file COPYING3.
#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, i
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;
I can bootstrap/regtest this, Jan, could you check this out with GDB testsuite?
