PATCH: Fix dwarf2 debug

PATCH: Fix dwarf2 debug

[H . J . Lu]

Nick, could you please take a look at this patch for

http://sources.redhat.com/ml/gdb/2002-05/msg00230.html

Thanks.


H.J.
---
2002-05-22  H.J. Lu <hjl@gnu.org>

	* dwarf2dbg.c (dwarf2_emit_insn): Emit only one line symbol
	for one .loc for compiler.

--- gas/dwarf2dbg.c.loc	Tue May 21 22:41:34 2002
+++ gas/dwarf2dbg.c	Wed May 22 08:24:27 2002
@@ -287,12 +287,19 @@ dwarf2_emit_insn (size)
   struct dwarf2_line_info loc;
 
   if (loc_directive_seen)
-    /* Use the last location established by a .loc directive, not
-       the value returned by dwarf2_where().  That calls as_where()
-       which will return either the logical input file name (foo.c)
-       or the physical input file name (foo.s) and not the file name
-       specified in the most recent .loc directive (eg foo.h).  */
-    loc = current;
+    {
+      /* Use the last location established by a .loc directive, not
+	 the value returned by dwarf2_where().  That calls as_where()
+	 which will return either the logical input file name (foo.c)
+	or the physical input file name (foo.s) and not the file name
+	specified in the most recent .loc directive (eg foo.h).  */
+      loc = current;
+
+      /* Unless we generate DWARF2 debugging information for each
+	 assembler line, we only emit one line symbol for one LOC.  */
+      if (debug_type != DEBUG_DWARF2)
+	loc_directive_seen = false;
+    }
   else if (debug_type != DEBUG_DWARF2)
     return;
   else

Re: PATCH: Fix dwarf2 debug

[Nick Clifton]

Hi H.J.

> Nick, could you please take a look at this patch for
> 
> http://sources.redhat.com/ml/gdb/2002-05/msg00230.html

Looks good to me - please apply it.

Note - I could not reproduce the bug reported by Michael, but I assume
that is because there is something wrong with how I was running the
tests.

Cheers
        Nick

Re: PATCH: Fix dwarf2 debug

[H . J . Lu]

On Wed, May 22, 2002 at 05:06:15PM +0100, Nick Clifton wrote:
> Hi H.J.
> 
> > Nick, could you please take a look at this patch for
> > 
> > http://sources.redhat.com/ml/gdb/2002-05/msg00230.html
> 
> Looks good to me - please apply it.

Done.

> 
> Note - I could not reproduce the bug reported by Michael, but I assume
> that is because there is something wrong with how I was running the
> tests.

I used gcc 3.1 to reproduce it. It should work now.


H.J.

Re: PATCH: Fix dwarf2 debug

[Michael Elizabeth Chastain]

This patch works for me, with no regressions found.

  target   = native
  host     = i686-pc-linux-gnu%rh-7.2
  gdb      = 5.2, gdb_5_2-branch, HEAD
  gcc      = 2.95.3, 2.96-rh, 3.0.4, 3.1, gcc-3_1-branch, HEAD
  binutils = HEAD
  glibc    = vendor
  goption  = -gdwarf2, -gstabs+

I'm closing my gdb PR on the bug.

Thanks for the quick bug fix.

Michael C

Re: PATCH: Fix dwarf2 debug

[Michael Elizabeth Chastain]

I'll fire up the ol' testbed and give it a spin.  Thanks!

Michael C