[PATCH 1/7] [gdb] Use block::function_block

[Tom de Vries <tdevries@suse.de>]

Use block::function_block to simplify get_frame_function.
---
 gdb/blockframe.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index ce28d99c7e4..8e99da11d22 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -120,10 +120,9 @@ get_frame_function (const frame_info_ptr &frame)
   if (bl == NULL)
     return NULL;
 
-  while (bl->function () == NULL && bl->superblock () != NULL)
-    bl = bl->superblock ();
+  bl = bl->function_block ();
 
-  return bl->function ();
+  return bl == nullptr ? nullptr : bl->function ();
 }
 \f
 
-- 
2.51.0