* dwarf2read.c (dwarf2_per_objfile_free): Clear

	dwarf2_per_objfile.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 065484de417e74957160dcb4437034126a7a96fd..3a8389806df051037dc72b3a8a0710b3b33f068d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-17  Tom Tromey  <tromey@redhat.com>
+
+       * dwarf2read.c (dwarf2_per_objfile_free): Clear
+       dwarf2_per_objfile.
+
 2013-07-16  Doug Evans  <dje@google.com>
 
        * nto-tdep.c (nto_relocate_section_addresses): Update,

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 62e42ca19fe704aa70e023d0238b5f63fbbaafc4..94727a734a8ce336dd02ce6e3fe9b5ebe06aa6c7 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -20546,6 +20546,10 @@ dwarf2_per_objfile_free (struct objfile *objfile, void *d)
   struct dwarf2_per_objfile *data = d;
   int ix;
 
+  /* Make sure we don't accidentally use dwarf2_per_objfile while
+     cleaning up.  */
+  dwarf2_per_objfile = NULL;
+
   for (ix = 0; ix < data->n_comp_units; ++ix)
    VEC_free (dwarf2_per_cu_ptr, data->all_comp_units[ix]->imported_symtabs);