Fix a new warning on Cygwin

[binutils-gdb.git] / gdb / jit.c

diff --git a/gdb/jit.c b/gdb/jit.c
index 1283d2edc5001dbab69962697504d7fff7a105e3..b4a070bb8796d85e4ba6d914898b37963a49f5f7 100644 (file)
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -562,10 +562,10 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
 
   /* At the end of this function, (begin, end) will contain the PC range this
      entire blockvector spans.  */
-  BLOCKVECTOR_MAP (bv) = NULL;
+  bv->set_map (nullptr);
   begin = stab->blocks.front ().begin;
   end = stab->blocks.front ().end;
-  BLOCKVECTOR_NBLOCKS (bv) = actual_nblocks;
+  bv->set_num_blocks (actual_nblocks);
 
   /* First run over all the gdb_block objects, creating a real block
      object for each.  Simultaneously, keep setting the real_block
@@ -580,8 +580,8 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
                                           TARGET_CHAR_BIT,
                                           "void");
 
-      BLOCK_MULTIDICT (new_block)
-       = mdict_create_linear (&objfile->objfile_obstack, NULL);
+      new_block->set_multidict
+       (mdict_create_linear (&objfile->objfile_obstack, NULL));
       /* The address range.  */
       new_block->set_start (gdb_block_iter.begin);
       new_block->set_end (gdb_block_iter.end);
@@ -598,7 +598,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
 
       new_block->set_function (block_name);
 
-      BLOCKVECTOR_BLOCK (bv, block_idx) = new_block;
+      bv->set_block (block_idx, new_block);
       if (begin > new_block->start ())
        begin = new_block->start ();
       if (end < new_block->end ())
@@ -618,15 +618,15 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
       new_block = (i == GLOBAL_BLOCK
                   ? allocate_global_block (&objfile->objfile_obstack)
                   : allocate_block (&objfile->objfile_obstack));
-      BLOCK_MULTIDICT (new_block)
-       = mdict_create_linear (&objfile->objfile_obstack, NULL);
+      new_block->set_multidict
+       (mdict_create_linear (&objfile->objfile_obstack, NULL));
       new_block->set_superblock (block_iter);
       block_iter = new_block;
 
       new_block->set_start (begin);
       new_block->set_end (end);
 
-      BLOCKVECTOR_BLOCK (bv, i) = new_block;
+      bv->set_block (i, new_block);
 
       if (i == GLOBAL_BLOCK)
        set_block_compunit_symtab (new_block, cust);
@@ -647,8 +647,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
       else
        {
          /* And if not, we set a default parent block.  */
-         gdb_block_iter.real_block->set_superblock
-           (BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK));
+         gdb_block_iter.real_block->set_superblock (bv->static_block ());
        }
     }
 }