Re: [RFA/dwarf2] Small problem scanning line table for included files

[Joel Brobecker <brobecker@gnat.com>]

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

Hello Jim,

> I think you are right. Looking for DW_LNS_set_file was a mistake, since
> it is not fullproof as you demonstrated above. I looked at the dwarf3
> (draft7) reference again, and setting that flag everytime we need to
> record a line seems to be the perfect place to do (it's a bit
> complicated to explain my resoning, I was concerned mostly because
> I was a bit fuzzy on certain details which were cleared by rereding
> the dwarf3 reference document).
> 
> I shall give this a try, and report back.

This worked beautifully, as expected. Here is a new patch, much simpler.

2004-07-30  Joel Brobecker  <brobecker@gnat.com>

        * dwarf2read.c (dwarf_decode_lines): Do not consider the current
        file as included until we record the first line in the linetable.

Tested on x86-linux with a GCC-3.4 based compiler, fixes the following
two regressions:

        sep.exp: list using location inside included file
        sep.exp: breakpoint inside included file

I also verified that this test still passes with GCC 3.2.
OK to commit?

Thanks,
-- 
Joel

[-- Attachment #2: dwarf2read.c.diff --]
[-- Type: text/plain, Size: 1643 bytes --]

Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.157
diff -u -p -r1.157 dwarf2read.c
--- dwarf2read.c	30 Jul 2004 12:22:27 -0000	1.157
+++ dwarf2read.c	30 Jul 2004 21:12:10 -0000
@@ -5977,6 +5977,7 @@ dwarf_decode_lines (struct line_header *
 	      address += (adj_opcode / lh->line_range)
 		* lh->minimum_instruction_length;
 	      line += lh->line_base + (adj_opcode % lh->line_range);
+              lh->file_names[file - 1].included_p = 1;
               if (!decode_for_pst_p)
                 {
 	          /* append row to matrix using current values */
@@ -5996,6 +5997,7 @@ dwarf_decode_lines (struct line_header *
 		{
 		case DW_LNE_end_sequence:
 		  end_sequence = 1;
+                  lh->file_names[file - 1].included_p = 1;
                   if (!decode_for_pst_p)
 		    record_line (current_subfile, 0, address);
 		  break;
@@ -6030,6 +6032,7 @@ dwarf_decode_lines (struct line_header *
 		}
 	      break;
 	    case DW_LNS_copy:
+              lh->file_names[file - 1].included_p = 1;
               if (!decode_for_pst_p)
 	        record_line (current_subfile, line, 
 	                     check_cu_functions (address, cu));
@@ -6054,7 +6057,6 @@ dwarf_decode_lines (struct line_header *
                 file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
                 line_ptr += bytes_read;
                 fe = &lh->file_names[file - 1];
-                fe->included_p = 1;
                 if (fe->dir_index)
                   dir = lh->include_dirs[fe->dir_index - 1];
                 else