diff options
| author | Tom Tromey <tom@tromey.com> | 2023-01-20 07:14:46 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2023-02-19 12:51:06 -0700 |
| commit | 56c0cd6158851c2f870374a9c2114810dabac70b (patch) | |
| tree | 4977329763603af326aade6a2bf92f16beaf8ff8 /gdb | |
| parent | 44bb9f9e7a7adc13f0b944ed76ddc459d5bb21f7 (diff) | |
| download | gdb-56c0cd6158851c2f870374a9c2114810dabac70b.zip gdb-56c0cd6158851c2f870374a9c2114810dabac70b.tar.gz gdb-56c0cd6158851c2f870374a9c2114810dabac70b.tar.bz2 | |
Have global_block inherit from block
This changes global_block to inherit from block, which is what was
always intended.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/block.c | 4 | ||||
| -rw-r--r-- | gdb/block.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gdb/block.c b/gdb/block.c index 8f15cdf..1698ee5 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 9a60140..3d71e7d 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -314,12 +314,8 @@ private: /* 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; |