diff options
| author | Tom Tromey <tom@tromey.com> | 2023-01-19 17:20:09 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2023-02-19 12:51:05 -0700 |
| commit | 780040961370cb7a9849b83553f03bf7d2f0f9df (patch) | |
| tree | b6f01f996c68daa6c0d2f6f5c55c760d2d1a880b /gdb/compile | |
| parent | 392c1cbd745a575c5894ea33876f255b66a14d89 (diff) | |
| download | gdb-780040961370cb7a9849b83553f03bf7d2f0f9df.zip gdb-780040961370cb7a9849b83553f03bf7d2f0f9df.tar.gz gdb-780040961370cb7a9849b83553f03bf7d2f0f9df.tar.bz2 | |
Don't allow NULL as an argument to block_static_block
block_static_block has special behavior when the block is NULL.
Remove this and patch up the callers instead.
Diffstat (limited to 'gdb/compile')
| -rw-r--r-- | gdb/compile/compile-c-symbols.c | 8 | ||||
| -rw-r--r-- | gdb/compile/compile-cplus-symbols.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index 6faff0e..7af0bff 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -212,7 +212,6 @@ static void convert_symbol_sym (compile_c_instance *context, const char *identifier, struct block_symbol sym, domain_enum domain) { - const struct block *static_block; int is_local_symbol; /* If we found a symbol and it is not in the static or global @@ -227,7 +226,9 @@ convert_symbol_sym (compile_c_instance *context, const char *identifier, } */ - static_block = block_static_block (sym.block); + const struct block *static_block = nullptr; + if (sym.block != nullptr) + static_block = block_static_block (sym.block); /* STATIC_BLOCK is NULL if FOUND_BLOCK is the global block. */ is_local_symbol = (sym.block != static_block && static_block != NULL); if (is_local_symbol) @@ -613,6 +614,9 @@ generate_c_for_variable_locations (compile_instance *compiler, const struct block *block, CORE_ADDR pc) { + if (block == nullptr) + return {}; + const struct block *static_block = block_static_block (block); /* If we're already in the static or global block, there is nothing diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c index 039aee3..c183d08 100644 --- a/gdb/compile/compile-cplus-symbols.c +++ b/gdb/compile/compile-cplus-symbols.c @@ -239,7 +239,9 @@ convert_symbol_sym (compile_cplus_instance *instance, } */ - const struct block *static_block = block_static_block (sym.block); + const struct block *static_block = nullptr; + if (sym.block != nullptr) + static_block = block_static_block (sym.block); /* STATIC_BLOCK is NULL if FOUND_BLOCK is the global block. */ bool is_local_symbol = (sym.block != static_block && static_block != nullptr); if (is_local_symbol) |