ubsan: xgate: left shift of negative value

[deliverable/binutils-gdb.git] / gdb / psymtab.c

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 7074a32956aada55e3c8a24c5f146bb3c43505e3..7caf1c6029a993fc693daf1a625ba31bc75fbd62 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1,6 +1,6 @@
 /* Partial symbol tables.
 
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -316,8 +316,7 @@ find_pc_sect_psymtab (struct objfile *objfile, CORE_ADDR pc,
   if (objfile->partial_symtabs->psymtabs != NULL
       && objfile->partial_symtabs->psymtabs_addrmap != NULL)
     {
-      CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,
-                                    SECT_OFF_TEXT (objfile));
+      CORE_ADDR baseaddr = objfile->section_offsets[SECT_OFF_TEXT (objfile)];
 
       struct partial_symtab *pst
        = ((struct partial_symtab *)
@@ -531,7 +530,7 @@ static bool
 psymbol_name_matches (partial_symbol *psym,
                      const lookup_name_info &lookup_name)
 {
-  const language_defn *lang = language_def (psym->ginfo.language);
+  const language_defn *lang = language_def (psym->ginfo.language ());
   symbol_name_matcher_ftype *name_match
     = get_symbol_name_matcher (lang, lookup_name);
   return name_match (psym->ginfo.search_name (), lookup_name, NULL);
@@ -581,7 +580,7 @@ match_partial_symbol (struct objfile *objfile,
          center = bottom + (top - bottom) / 2;
          gdb_assert (center < top);
 
-         enum language lang = (*center)->ginfo.language;
+         enum language lang = (*center)->ginfo.language ();
          const char *lang_ln
            = name.language_lookup_name (lang).c_str ();
 
@@ -596,7 +595,7 @@ match_partial_symbol (struct objfile *objfile,
       while (top <= real_top
             && psymbol_name_matches (*top, name))
        {
-         if (symbol_matches_domain ((*top)->ginfo.language,
+         if (symbol_matches_domain ((*top)->ginfo.language (),
                                     (*top)->domain, domain))
            return *top;
          top++;
@@ -610,7 +609,7 @@ match_partial_symbol (struct objfile *objfile,
     {
       for (psym = start; psym < start + length; psym++)
        {
-         if (symbol_matches_domain ((*psym)->ginfo.language,
+         if (symbol_matches_domain ((*psym)->ginfo.language (),
                                     (*psym)->domain, domain)
              && psymbol_name_matches (*psym, name))
            return *psym;
@@ -719,7 +718,7 @@ lookup_partial_symbol (struct objfile *objfile,
       while (top <= real_top && symbol_matches_search_name (&(*top)->ginfo,
                                                            lookup_name))
        {
-         if (symbol_matches_domain ((*top)->ginfo.language,
+         if (symbol_matches_domain ((*top)->ginfo.language (),
                                     (*top)->domain, domain))
            return *top;
          top++;
@@ -733,7 +732,7 @@ lookup_partial_symbol (struct objfile *objfile,
     {
       for (psym = start; psym < start + length; psym++)
        {
-         if (symbol_matches_domain ((*psym)->ginfo.language,
+         if (symbol_matches_domain ((*psym)->ginfo.language (),
                                     (*psym)->domain, domain)
              && symbol_matches_search_name (&(*psym)->ginfo, lookup_name))
            return *psym;
@@ -835,7 +834,7 @@ print_partial_symbols (struct gdbarch *gdbarch, struct objfile *objfile,
   while (count-- > 0)
     {
       QUIT;
-      fprintf_filtered (outfile, "    `%s'", (*p)->ginfo.name);
+      fprintf_filtered (outfile, "    `%s'", (*p)->ginfo.linkage_name ());
       if ((*p)->ginfo.demangled_name () != NULL)
        {
          fprintf_filtered (outfile, "  `%s'",
@@ -1526,18 +1525,17 @@ psymbol_hash (const void *addr, int length)
 {
   unsigned long h = 0;
   struct partial_symbol *psymbol = (struct partial_symbol *) addr;
-  unsigned int lang = psymbol->ginfo.language;
+  unsigned int lang = psymbol->ginfo.language ();
   unsigned int domain = psymbol->domain;
   unsigned int theclass = psymbol->aclass;
 
-  h = hash_continue (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h);
-  h = hash_continue (&lang, sizeof (unsigned int), h);
-  h = hash_continue (&domain, sizeof (unsigned int), h);
-  h = hash_continue (&theclass, sizeof (unsigned int), h);
-  /* Note that psymbol names are interned via symbol_set_names, so
+  h = fast_hash (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h);
+  h = fast_hash (&lang, sizeof (unsigned int), h);
+  h = fast_hash (&domain, sizeof (unsigned int), h);
+  h = fast_hash (&theclass, sizeof (unsigned int), h);
+  /* Note that psymbol names are interned via compute_and_set_names, so
      there's no need to hash the contents of the name here.  */
-  h = hash_continue (&psymbol->ginfo.name,
-                    sizeof (psymbol->ginfo.name), h);
+  h = fast_hash (&psymbol->ginfo.m_name, sizeof (psymbol->ginfo.m_name), h);
 
   return h;
 }
@@ -1554,13 +1552,13 @@ psymbol_compare (const void *addr1, const void *addr2, int length)
 
   return (memcmp (&sym1->ginfo.value, &sym2->ginfo.value,
                   sizeof (sym1->ginfo.value)) == 0
-         && sym1->ginfo.language == sym2->ginfo.language
+         && sym1->ginfo.language () == sym2->ginfo.language ()
           && sym1->domain == sym2->domain
           && sym1->aclass == sym2->aclass
          /* Note that psymbol names are interned via
-            symbol_set_names, so there's no need to compare the
+            compute_and_set_names, so there's no need to compare the
             contents of the name here.  */
-          && sym1->ginfo.name == sym2->ginfo.name);
+          && sym1->ginfo.linkage_name () == sym2->ginfo.linkage_name ());
 }
 
 /* Helper function, initialises partial symbol structure and stashes
@@ -1585,10 +1583,8 @@ add_psymbol_to_bcache (gdb::string_view name, bool copy_name,
   psymbol.ginfo.section = section;
   psymbol.domain = domain;
   psymbol.aclass = theclass;
-  symbol_set_language (&psymbol.ginfo, language,
-                      objfile->partial_symtabs->obstack ());
-  symbol_set_names (&psymbol.ginfo, name, copy_name,
-                   objfile->per_bfd);
+  psymbol.ginfo.set_language (language, objfile->partial_symtabs->obstack ());
+  psymbol.ginfo.compute_and_set_names (name, copy_name, objfile->per_bfd);
 
   /* Stash the partial symbol away in the cache.  */
   return ((struct partial_symbol *)
@@ -2112,7 +2108,7 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
            if (!sym)
              {
                printf_filtered ("Static symbol `");
-               puts_filtered ((*psym)->ginfo.name);
+               puts_filtered ((*psym)->ginfo.linkage_name ());
                printf_filtered ("' only found in ");
                puts_filtered (ps->filename);
                printf_filtered (" psymtab\n");
@@ -2130,7 +2126,7 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
            if (!sym)
              {
                printf_filtered ("Global symbol `");
-               puts_filtered ((*psym)->ginfo.name);
+               puts_filtered ((*psym)->ginfo.linkage_name ());
                printf_filtered ("' only found in ");
                puts_filtered (ps->filename);
                printf_filtered (" psymtab\n");