diff --git a/gdb/block.c b/gdb/block.c index 8f15cdf23f8..1698ee51e7b 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -397,9 +397,7 @@ allocate_block (struct obstack *obstack) struct block * allocate_global_block (struct obstack *obstack) { - struct global_block *bl = new (obstack) struct global_block; - - return &bl->block; + return new (obstack) struct global_block; } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index 9a60140581d..3d71e7daab1 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -314,12 +314,8 @@ struct block : public allocate_on_obstack /* The global block is singled out so that we can provide a back-link to the compunit symtab. */ -struct global_block : public allocate_on_obstack +struct global_block : public block { - /* The block. */ - - struct block block; - /* This holds a pointer to the compunit symtab holding this block. */ struct compunit_symtab *compunit_symtab = nullptr;