[PATCH 1/3] Fix http://sourceware.org/bugzilla/show_bug.cgi?id=14550

Sanjoy Das
2012-09-18T04:30:26Z

---
gdb/ChangeLog | 7 +++++++
gdb/jit.c | 14 ++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ab15c4..a1c55e5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com>
+
+ PR gdb/14550
+
+ * jit.c (finalize_symtab): Ensure that only the global block has a
+ NULL superblock.
+
2012-09-17 Mike Wrighton <wrighton@codesourcery.com>

* MAINTAINERS (Write After Approval): Add "Mike Wrighton".
diff --git a/gdb/jit.c b/gdb/jit.c
index 9e8f295..2f9d426 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -724,8 +724,18 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
gdb_block_iter = gdb_block_iter->next)
{
if (gdb_block_iter->parent != NULL)
- BLOCK_SUPERBLOCK (gdb_block_iter->real_block) =
- gdb_block_iter->parent->real_block;
+ {
+ /* If the plugin specifically mentioned a parent block, we
+ use that */
+ BLOCK_SUPERBLOCK (gdb_block_iter->real_block) =
+ gdb_block_iter->parent->real_block;
+ }
+ else
+ {
+ /* and if not, we set a default parent block. */
+ BLOCK_SUPERBLOCK (gdb_block_iter->real_block) =
+ BLOCKVECTOR_BLOCK (symtab->blockvector, STATIC_BLOCK);
+ }
}

/* Free memory. */
--
1.7.10.4