gdb/block: add assert in block_iterator::compunit_symtab

Verify that the compunit is only accessed when the iterator is in the
mode where that field makes sense.

We could also set compunit_symtab_ even in "single block" mode, it
wouldn't hurt, but it would not be useful either.

Change-Id: I237db16bb485148f9e906b2e7238159e9f0a8585
Approved-By: Tom Tromey <tom@tromey.com>
Approved-By: Andrew Burgess <aburgess@redhat.com>
Tested-By: Guinevere Larsen <guinevere@redhat.com>

diff --git a/gdb/block.c b/gdb/block.c
index 5aa58545393bb2c649b161ee4d7dcd7bdee27757..730e4580a5b714f322c28f909b4c9cfad735369e 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -442,6 +442,10 @@ initialize_block_iterator (const struct block *block,
 compunit_symtab *
 block_iterator::compunit_symtab () const
 {
+  /* The compunit field is only used when iterating over global or static
+     blocks.  */
+  gdb_assert (this->which != FIRST_LOCAL_BLOCK);
+
   if (this->idx == -1)
     return this->compunit_symtab_;