* block.c (contained_in): Return zero for nested functions.

* blockframe.c (block_innermost_frame): Delete unreferenced local
        variable.
This commit is contained in:
Joel Brobecker 2009-09-09 17:23:55 +00:00
parent 52c745b5d3
commit 49e794ac62
3 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2009-09-08 Joel Brobecker <brobecker@adacore.com>
* block.c (contained_in): Return zero for nested functions.
* blockframe.c (block_innermost_frame): Delete unreferenced local
variable.
2009-09-08 Doug Evans <dje@google.com>
* target.c (initialize_targets): Fix thinko in stack_cache_enabled_p.

View File

@ -52,6 +52,10 @@ contained_in (const struct block *a, const struct block *b)
{
if (a == b)
return 1;
/* If A is a function block, then A cannot be contained in B,
except if A was inlined. */
if (BLOCK_FUNCTION (a) != NULL && !block_inlined_p (a))
return 0;
a = BLOCK_SUPERBLOCK (a);
}
while (a != NULL);

View File

@ -363,7 +363,6 @@ block_innermost_frame (struct block *block)
struct frame_info *frame;
CORE_ADDR start;
CORE_ADDR end;
CORE_ADDR calling_pc;
if (block == NULL)
return NULL;