2 files changed, 5 insertions, 6 deletions
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 414a310..02c35ac 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -569,10 +569,9 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw)
 	  for (compunit_symtab *cust : objfile->compunits ())
 	    {
 	      const struct blockvector *bv;
-	      const struct block *block;
 
 	      bv = cust->blockvector ();
-	      block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+	      const struct block *block = bv->static_block ();
 
 	      if (block != nullptr)
 		{
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c
index 0a6ee01..7ed6271 100644
--- a/gdb/python/py-symtab.c
+++ b/gdb/python/py-symtab.c
@@ -176,13 +176,13 @@ static PyObject *
 stpy_global_block (PyObject *self, PyObject *args)
 {
   struct symtab *symtab = NULL;
-  const struct block *block = NULL;
   const struct blockvector *blockvector;
 
   STPY_REQUIRE_VALID (self, symtab);
 
   blockvector = symtab->compunit ()->blockvector ();
-  block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
+  const struct block *block = blockvector->global_block ();
+
   return block_to_block_object (block, symtab->compunit ()->objfile ());
 }
 
@@ -192,13 +192,13 @@ static PyObject *
 stpy_static_block (PyObject *self, PyObject *args)
 {
   struct symtab *symtab = NULL;
-  const struct block *block = NULL;
   const struct blockvector *blockvector;
 
   STPY_REQUIRE_VALID (self, symtab);
 
   blockvector = symtab->compunit ()->blockvector ();
-  block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK);
+  const struct block *block = blockvector->static_block ();
+
   return block_to_block_object (block, symtab->compunit ()->objfile ());
 }