2003-08-25 Daniel Jacobowitz <drow@mvista.com>

	PR java/1322
	* dwarf2-frame.c (dwarf2_frame_find_fde): Check whether any FDEs are
	available before calling SECT_OFF_TEXT.
	* PROBLEMS: Remove description of java/1322.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e9b5758a0d37844079c724477447c6d062c56727..ee463ec924c18f0fa5c591430ca780046eb4dceb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,13 @@
 2003-09-11  Daniel Jacobowitz  <drow@mvista.com>
 
        Merge from mainline:
+       2003-08-25  Daniel Jacobowitz  <drow@mvista.com>
+
+       PR java/1322
+       * dwarf2-frame.c (dwarf2_frame_find_fde): Check whether any FDEs are
+       available before calling SECT_OFF_TEXT.
+       * PROBLEMS: Remove description of java/1322.
+
        2003-07-13  Mark Kettenis  <kettenis@gnu.org>
 
        * objfiles.h (struct objfile): Add memebers `data' and `num_data'.

diff --git a/gdb/PROBLEMS b/gdb/PROBLEMS
index 77deedc057ee5c20c82e1e25fa52a6801ca58e62..74806333035fa78bb3794f6a8ad24c4ce3ba651d 100644 (file)
--- a/gdb/PROBLEMS
+++ b/gdb/PROBLEMS
@@ -19,17 +19,3 @@ gcc 3.x generates these multiple object code functions in order to
 implement virtual base classes.  gcc 2.x generated just one object code
 function with a hidden parameter, but gcc 3.x conforms to a multi-vendor
 ABI for C++ which requires multiple object code functions.
-
-gdb/1322: "internal-error: sect_index_text not initialized" after printing a java type
-
-When gdb debugs a Java program which uses shared libraries, it can
-generate this internal error.
-
-If you get this error when debugging Java, you can try working around
-the problem by relinking your program with no shared libraries at all
-(even the standard C library).  With the GNU linker, use the "-static"
-argument to do this.
-
-You can also try this patch for gdb:
-
-  http://sources.redhat.com/ml/gdb-prs/2003-q3/msg00190.html

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index dfde061731f5c0189b01f62e70582da95853fb8d..0cfa039fa360c768fb9d64cdf54da98a4d793dd3 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -1130,9 +1130,13 @@ dwarf2_frame_find_fde (CORE_ADDR *pc)
       struct dwarf2_fde *fde;
       CORE_ADDR offset;
 
-      offset = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
-      
       fde = objfile_data (objfile, dwarf2_frame_data);
+      if (fde == NULL)
+       continue;
+
+      gdb_assert (objfile->section_offsets);
+      offset = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+
       while (fde)
        {
          if (*pc >= fde->initial_location + offset