From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 125940 invoked by alias); 22 Jul 2019 03:26:20 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 125895 invoked by uid 10256); 22 Jul 2019 03:26:20 -0000 Date: Mon, 22 Jul 2019 03:26:00 -0000 Message-ID: <20190722032620.125893.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Christian Biesinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Use block_enum instead of int for better typesafety X-Act-Checkin: binutils-gdb X-Git-Author: Christian Biesinger X-Git-Refname: refs/heads/master X-Git-Oldrev: c8cdc1e08312a238a9138b55ae080ceeab14845c X-Git-Newrev: c32e6a04f42b8e4a1392ee4b87d040c06b917ef5 X-SW-Source: 2019-07/txt/msg00161.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c32e6a04f42b8e4a1392ee4b87d040c06b917ef5 commit c32e6a04f42b8e4a1392ee4b87d040c06b917ef5 Author: Christian Biesinger Date: Thu Jul 11 13:35:13 2019 -0500 Use block_enum instead of int for better typesafety gdb/ChangeLog: 2019-07-21 Christian Biesinger * symtab.c (lookup_symbol_in_objfile_symtabs): Change int to block_enum. (lookup_symbol_in_objfile): Change int to block_enum and add a gdb_assert to make sure block_index is GLOBAL_BLOCK or STATIC_BLOCK. Diff: --- gdb/symtab.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 719e5b2..ce1cdcf 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -92,7 +92,8 @@ struct block_symbol lookup_local_symbol (const char *name, enum language language); static struct block_symbol - lookup_symbol_in_objfile (struct objfile *objfile, int block_index, + lookup_symbol_in_objfile (struct objfile *objfile, + enum block_enum block_index, const char *name, const domain_enum domain); /* Type of the data stored on the program space. */ @@ -2244,8 +2245,9 @@ lookup_global_symbol_from_objfile (struct objfile *main_objfile, static symbols. */ static struct block_symbol -lookup_symbol_in_objfile_symtabs (struct objfile *objfile, int block_index, - const char *name, const domain_enum domain) +lookup_symbol_in_objfile_symtabs (struct objfile *objfile, + enum block_enum block_index, const char *name, + const domain_enum domain) { gdb_assert (block_index == GLOBAL_BLOCK || block_index == STATIC_BLOCK); @@ -2516,11 +2518,13 @@ lookup_symbol_in_static_block (const char *name, BLOCK_INDEX is one of GLOBAL_BLOCK or STATIC_BLOCK. */ static struct block_symbol -lookup_symbol_in_objfile (struct objfile *objfile, int block_index, +lookup_symbol_in_objfile (struct objfile *objfile, enum block_enum block_index, const char *name, const domain_enum domain) { struct block_symbol result; + gdb_assert (block_index == GLOBAL_BLOCK || block_index == STATIC_BLOCK); + if (symbol_lookup_debug) { fprintf_unfiltered (gdb_stdlog,