2003-05-07 Jeff Johnston <jjohnstn@redhat.com>

        * dwarf2read.c (dwarf_decode_lines): Only use output of
        check_cu_functions() when calling record_line().  Do not update
        the current address.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7a4253fc276e1fd92fd1b84cc1ee03c54885e834..3ecbb3b69af88281f87d8bab79ddd1724cdd894c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-07  Jeff Johnston  <jjohnstn@redhat.com>
+ 
+       * dwarf2read.c (dwarf_decode_lines): Only use output of 
+       check_cu_functions() when calling record_line().  Do not update 
+       the current address.
+
 2003-05-07  Andrew Cagney  <cagney@redhat.com>
 
        * fork-child.c (startup_inferior): Delete #ifdef STARTUP_INFERIOR

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 32a9f44b566152f20d1830ecc8cd5dc56c9724aa..476078b028458f24e0baeadfab985787f93973b8 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -4878,8 +4878,8 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
                * lh->minimum_instruction_length;
              line += lh->line_base + (adj_opcode % lh->line_range);
              /* append row to matrix using current values */
-             address = check_cu_functions (address);
-             record_line (current_subfile, line, address);
+             record_line (current_subfile, line, 
+                          check_cu_functions (address));
              basic_block = 1;
            }
          else switch (op_code)
@@ -4925,8 +4925,8 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
                }
              break;
            case DW_LNS_copy:
-             address = check_cu_functions (address);
-             record_line (current_subfile, line, address);
+             record_line (current_subfile, line, 
+                          check_cu_functions (address));
              basic_block = 0;
              break;
            case DW_LNS_advance_pc: