* block.c (block_function): Renamed to ...

	(block_linkage_function): ... this.  All callers changed.
	* block.h (block_function): Renamed to ...
	(block_linkage_function): ... this.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c43fb6ca2663547c379dd6ea405c8aec71f6eb2..dcae25afa5ae2e2e78b14f6b902fff7e704ba4aa 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * block.c (block_function): Renamed to ...
+       (block_linkage_function): ... this.  All callers changed.
+       * block.h (block_function): Renamed to ...
+       (block_linkage_function): ... this.
+
 2008-07-15  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * frame.c (frame_unwind_id): Renamed to ...

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index cb85617fac94ccdd447a9d5f81c8115d5ce885ba..0eecd90aadaf35655e812d3ff342a747841329fe 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4625,7 +4625,7 @@ remove_irrelevant_renamings (struct ada_symbol_info *syms,
   if (current_block == NULL)
     return nsyms;
 
-  current_function = block_function (current_block);
+  current_function = block_linkage_function (current_block);
   if (current_function == NULL)
     return nsyms;
 
@@ -6721,7 +6721,7 @@ ada_find_renaming_symbol (const char *name, struct block *block)
 static struct symbol *
 find_old_style_renaming_symbol (const char *name, struct block *block)
 {
-  const struct symbol *function_sym = block_function (block);
+  const struct symbol *function_sym = block_linkage_function (block);
   char *rename;
 
   if (function_sym != NULL)

diff --git a/gdb/block.c b/gdb/block.c
index d2f1fd7013be6d89f7d2ac0865d892be0c6eecda..fd96a52360265b46f7382c7e3af73d5a6bbc23f8 100644 (file)
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -53,10 +53,12 @@ contained_in (const struct block *a, const struct block *b)
 
 
 /* Return the symbol for the function which contains a specified
-   lexical block, described by a struct block BL.  */
+   lexical block, described by a struct block BL.  The return value
+   will not be an inlined function; the containing function will be
+   returned instead.  */
 
 struct symbol *
-block_function (const struct block *bl)
+block_linkage_function (const struct block *bl)
 {
   while (BLOCK_FUNCTION (bl) == 0 && BLOCK_SUPERBLOCK (bl) != 0)
     bl = BLOCK_SUPERBLOCK (bl);

diff --git a/gdb/block.h b/gdb/block.h
index db0644c39c67775a5e979a90a3a8b0d1a602d18e..1e049852894f1ac1676f08927ca3d0f7c94c3fb6 100644 (file)
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -132,7 +132,7 @@ struct blockvector
 
 enum { GLOBAL_BLOCK = 0, STATIC_BLOCK = 1, FIRST_LOCAL_BLOCK = 2 };
 
-extern struct symbol *block_function (const struct block *);
+extern struct symbol *block_linkage_function (const struct block *);
 
 extern int contained_in (const struct block *, const struct block *);
 

diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index a1a453541a8fb2e08dbe625c9633575734f0c840..289e20c216d9c25fecab9a3e9443064f2214b1ed 100644 (file)
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -77,7 +77,7 @@ get_pc_function_start (CORE_ADDR pc)
   bl = block_for_pc (pc);
   if (bl)
     {
-      struct symbol *symbol = block_function (bl);
+      struct symbol *symbol = block_linkage_function (bl);
 
       if (symbol)
        {
@@ -106,7 +106,7 @@ get_frame_function (struct frame_info *frame)
   struct block *bl = get_frame_block (frame, 0);
   if (bl == 0)
     return 0;
-  return block_function (bl);
+  return block_linkage_function (bl);
 }
 \f
 
@@ -119,7 +119,7 @@ find_pc_sect_function (CORE_ADDR pc, struct bfd_section *section)
   struct block *b = block_for_pc_sect (pc, section);
   if (b == 0)
     return 0;
-  return block_function (b);
+  return block_linkage_function (b);
 }
 
 /* Return the function containing pc value PC.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 55cd0d86a8234bf9e1734b8a0ed477e6233c4766..463da5786ff7100c33f9928860245bf16be6b4b0 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2651,7 +2651,8 @@ watchpoint_check (void *p)
       /* If we've gotten confused in the unwinder, we might have
         returned a frame that can't describe this variable.  */
       if (within_current_scope
-         && block_function (b->exp_valid_block) != get_frame_function (fr))
+         && (block_linkage_function (b->exp_valid_block)
+             != get_frame_function (fr)))
        within_current_scope = 0;
 
       /* in_function_epilogue_p() returns a non-zero value if we're still
@@ -5700,7 +5701,7 @@ resolve_sal_pc (struct symtab_and_line *sal)
       bv = blockvector_for_pc_sect (sal->pc, 0, &b, sal->symtab);
       if (bv != NULL)
        {
-         sym = block_function (b);
+         sym = block_linkage_function (b);
          if (sym != NULL)
            {
              fixup_symbol_section (sym, sal->symtab->objfile);