533da48302
+2020-01-01 Jakub Jelinek <jakub@redhat.com> + + Update copyright years. + +2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de> + + * make-relative-prefix.c (split_directories): + Return early on empty 'name' + +2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de> + + * cp-demangle.c (d_print_init): Remove const from 4th param. + (cplus_demangle_fill_name): Initialize d->d_counting. + (cplus_demangle_fill_extended_operator): Likewise. + (cplus_demangle_fill_ctor): Likewise. + (cplus_demangle_fill_dtor): Likewise. + (d_make_empty): Likewise. + (d_count_templates_scopes): Remobe const from 3rd param, + Return on dc->d_counting > 1, + Increment dc->d_counting. + * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting. + (cplus_demangle_fill_builtin_type): Likewise. + (cplus_demangle_fill_operator): Likewise. + +2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * cplus-dem.c (cplus_demangle): Use rust_demangle directly. + (rust_demangle): Remove. + * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash. + (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble. + (parse_legacy_escape): Rename to decode_legacy_escape. + (rust_is_mangled): Remove. + (struct rust_demangler): Add. + (peek): Add. + (next): Add. + (struct rust_mangled_ident): Add. + (parse_ident): Add. + (rust_demangle_sym): Remove. + (print_str): Add. + (PRINT): Add. + (print_ident): Add. + (rust_demangle_callback): Add. + (struct str_buf): Add. + (str_buf_reserve): Add. + (str_buf_append): Add. + (str_buf_demangle_callback): Add. + (rust_demangle): Add. + * rust-demangle.h: Remove. + +2019-11-15 Miguel Saldivar <saldivarcher@gmail.com> + + * testsuite/demangle-expected: Fix test. + +2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com> + + * cp-demangle.c (d_expr_primary): Handle + nullptr demangling. + * testsuite/demangle-expected: Added test. + +2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com> + + * cp-demangle.c (d_number): Avoid signed int overflow. + +2019-10-28 Miguel Saldivar <saldivarcher@gmail.com> + + * cp-demangle.c (d_print_mod): Add a space before printing `complex` + and `imaginary`, as opposed to after. + * testsuite/demangle-expected: Adjust test. + +2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * rust-demangle.c (looks_like_rust): Remove. + (rust_is_mangled): Don't check escapes. + (is_prefixed_hash): Allow 0-9a-f permutations. + (rust_demangle_sym): Don't bail on unknown escapes. + * testsuite/rust-demangle-expected: Update 'main::$99$' test. + +2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * rust-demangle.c (unescape): Remove. + (parse_lower_hex_nibble): New function. + (parse_legacy_escape): New function. + (is_prefixed_hash): Use parse_lower_hex_nibble. + (looks_like_rust): Use parse_legacy_escape. + (rust_demangle_sym): Use parse_legacy_escape. + * testsuite/rust-demangle-expected: Add 'llv$u6d$' test. + +2019-08-27 Martin Liska <mliska@suse.cz> + + PR lto/91478 + * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections): + First find a WEAK HIDDEN symbol in symbol table that will be + preserved. Later, use the symbol name for all removed symbols. + +2019-08-12 Martin Liska <mliska@suse.cz> + + * Makefile.in: Add filedescriptor.c. + * filedescriptor.c: New file. + * lrealpath.c (is_valid_fd): Remove. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 0be45b4ae8..fe738d0db4 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the libiberty library. # Originally written by K. Richard Pixley <rich@cygnus.com>. # -# Copyright (C) 1990-2019 Free Software Foundation, Inc. +# Copyright (C) 1990-2020 Free Software Foundation, Inc. # # This file is part of the libiberty library. # Libiberty is free software; you can redistribute it and/or @@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ calloc.c choose-temp.c clock.c concat.c cp-demangle.c \ cp-demint.c cplus-dem.c crc32.c \ d-demangle.c dwarfnames.c dyn-string.c \ - fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \ + fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \ fnmatch.c fopen_unlocked.c \ getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \ gettimeofday.c \ @@ -171,6 +171,7 @@ REQUIRED_OFILES = \ ./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \ ./dwarfnames.$(objext) ./dyn-string.$(objext) \ ./fdmatch.$(objext) ./fibheap.$(objext) \ + ./filedescriptor.$(objext) \ ./filename_cmp.$(objext) ./floatformat.$(objext) \ ./fnmatch.$(objext) ./fopen_unlocked.$(objext) \ ./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \ @@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir else true; fi $(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION) +./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h + if [ x"$(PICFLAG)" != x ]; then \ + $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \ + else true; fi + if [ x"$(NOASANFLAG)" != x ]; then \ + $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \ + else true; fi + $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION) + + ./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/safe-ctype.h diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c index d44dc415ed..a739f4304f 100644 --- a/libiberty/_doprnt.c +++ b/libiberty/_doprnt.c @@ -1,5 +1,5 @@ /* Provide a version of _doprnt in terms of fprintf. - Copyright (C) 1998-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2020 Free Software Foundation, Inc. Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98 This program is free software; you can redistribute it and/or modify it diff --git a/libiberty/argv.c b/libiberty/argv.c index 6444896f99..8c9794db6a 100644 --- a/libiberty/argv.c +++ b/libiberty/argv.c @@ -1,5 +1,5 @@ /* Create and destroy argument vectors (argv's) - Copyright (C) 1992-2019 Free Software Foundation, Inc. + Copyright (C) 1992-2020 Free Software Foundation, Inc. Written by Fred Fish @ Cygnus Support This file is part of the libiberty library. diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c index 5718682f69..6e38e2234d 100644 --- a/libiberty/asprintf.c +++ b/libiberty/asprintf.c @@ -1,6 +1,6 @@ /* Like sprintf but provides a pointer to malloc'd storage, which must be freed by the caller. - Copyright (C) 1997-2019 Free Software Foundation, Inc. + Copyright (C) 1997-2020 Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of the libiberty library. diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c index 72c1b710bd..49a2faaa51 100644 --- a/libiberty/choose-temp.c +++ b/libiberty/choose-temp.c @@ -1,5 +1,5 @@ /* Utility to pick a temporary filename prefix. - Copyright (C) 1996-2019 Free Software Foundation, Inc. + Copyright (C) 1996-2020 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or diff --git a/libiberty/clock.c b/libiberty/clock.c index a3730714bd..0de74657d0 100644 --- a/libiberty/clock.c +++ b/libiberty/clock.c @@ -1,5 +1,5 @@ /* ANSI-compatible clock function. - Copyright (C) 1994-2019 Free Software Foundation, Inc. + Copyright (C) 1994-2020 Free Software Foundation, Inc. This file is part of the libiberty library. This library is free software; you can redistribute it and/or modify it under the diff --git
241 lines
7.0 KiB
C
241 lines
7.0 KiB
C
/* Demangler component interface functions.
|
|
Copyright (C) 2004-2020 Free Software Foundation, Inc.
|
|
Written by Ian Lance Taylor <ian@wasabisystems.com>.
|
|
|
|
This file is part of the libiberty library, which is part of GCC.
|
|
|
|
This file is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
compiled version of this file into combinations with other programs,
|
|
and to distribute those combinations without any restriction coming
|
|
from the use of this file. (The General Public License restrictions
|
|
do apply in other respects; for example, they cover modification of
|
|
the file, and distribution when not linked into a combined
|
|
executable.)
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
/* This file implements a few interface functions which are provided
|
|
for use with struct demangle_component trees. These functions are
|
|
declared in demangle.h. These functions are closely tied to the
|
|
demangler code in cp-demangle.c, and other interface functions can
|
|
be found in that file. We put these functions in a separate file
|
|
because they are not needed by the demangler, and so we avoid
|
|
having them pulled in by programs which only need the
|
|
demangler. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
#ifdef HAVE_STRING_H
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "ansidecl.h"
|
|
#include "libiberty.h"
|
|
#include "demangle.h"
|
|
#include "cp-demangle.h"
|
|
|
|
/* Fill in most component types. */
|
|
|
|
int
|
|
cplus_demangle_fill_component (struct demangle_component *p,
|
|
enum demangle_component_type type,
|
|
struct demangle_component *left,
|
|
struct demangle_component *right)
|
|
{
|
|
if (p == NULL)
|
|
return 0;
|
|
switch (type)
|
|
{
|
|
case DEMANGLE_COMPONENT_QUAL_NAME:
|
|
case DEMANGLE_COMPONENT_LOCAL_NAME:
|
|
case DEMANGLE_COMPONENT_TYPED_NAME:
|
|
case DEMANGLE_COMPONENT_TEMPLATE:
|
|
case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE:
|
|
case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
|
|
case DEMANGLE_COMPONENT_FUNCTION_TYPE:
|
|
case DEMANGLE_COMPONENT_ARRAY_TYPE:
|
|
case DEMANGLE_COMPONENT_PTRMEM_TYPE:
|
|
case DEMANGLE_COMPONENT_ARGLIST:
|
|
case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
|
|
case DEMANGLE_COMPONENT_UNARY:
|
|
case DEMANGLE_COMPONENT_BINARY:
|
|
case DEMANGLE_COMPONENT_BINARY_ARGS:
|
|
case DEMANGLE_COMPONENT_TRINARY:
|
|
case DEMANGLE_COMPONENT_TRINARY_ARG1:
|
|
case DEMANGLE_COMPONENT_TRINARY_ARG2:
|
|
case DEMANGLE_COMPONENT_LITERAL:
|
|
case DEMANGLE_COMPONENT_LITERAL_NEG:
|
|
break;
|
|
|
|
/* These component types only have one subtree. */
|
|
case DEMANGLE_COMPONENT_VTABLE:
|
|
case DEMANGLE_COMPONENT_VTT:
|
|
case DEMANGLE_COMPONENT_TYPEINFO:
|
|
case DEMANGLE_COMPONENT_TYPEINFO_NAME:
|
|
case DEMANGLE_COMPONENT_TYPEINFO_FN:
|
|
case DEMANGLE_COMPONENT_THUNK:
|
|
case DEMANGLE_COMPONENT_VIRTUAL_THUNK:
|
|
case DEMANGLE_COMPONENT_COVARIANT_THUNK:
|
|
case DEMANGLE_COMPONENT_JAVA_CLASS:
|
|
case DEMANGLE_COMPONENT_GUARD:
|
|
case DEMANGLE_COMPONENT_REFTEMP:
|
|
case DEMANGLE_COMPONENT_RESTRICT:
|
|
case DEMANGLE_COMPONENT_VOLATILE:
|
|
case DEMANGLE_COMPONENT_CONST:
|
|
case DEMANGLE_COMPONENT_RESTRICT_THIS:
|
|
case DEMANGLE_COMPONENT_VOLATILE_THIS:
|
|
case DEMANGLE_COMPONENT_CONST_THIS:
|
|
case DEMANGLE_COMPONENT_POINTER:
|
|
case DEMANGLE_COMPONENT_REFERENCE:
|
|
case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
|
|
case DEMANGLE_COMPONENT_COMPLEX:
|
|
case DEMANGLE_COMPONENT_IMAGINARY:
|
|
case DEMANGLE_COMPONENT_VENDOR_TYPE:
|
|
case DEMANGLE_COMPONENT_CAST:
|
|
case DEMANGLE_COMPONENT_CONVERSION:
|
|
if (right != NULL)
|
|
return 0;
|
|
break;
|
|
|
|
default:
|
|
/* Other types do not use subtrees. */
|
|
return 0;
|
|
}
|
|
|
|
p->type = type;
|
|
p->u.s_binary.left = left;
|
|
p->u.s_binary.right = right;
|
|
p->d_printing = 0;
|
|
p->d_counting = 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE. */
|
|
|
|
int
|
|
cplus_demangle_fill_builtin_type (struct demangle_component *p,
|
|
const char *type_name)
|
|
{
|
|
int len;
|
|
unsigned int i;
|
|
|
|
if (p == NULL || type_name == NULL)
|
|
return 0;
|
|
len = strlen (type_name);
|
|
for (i = 0; i < D_BUILTIN_TYPE_COUNT; ++i)
|
|
{
|
|
if (len == cplus_demangle_builtin_types[i].len
|
|
&& strcmp (type_name, cplus_demangle_builtin_types[i].name) == 0)
|
|
{
|
|
p->type = DEMANGLE_COMPONENT_BUILTIN_TYPE;
|
|
p->u.s_builtin.type = &cplus_demangle_builtin_types[i];
|
|
p->d_printing = 0;
|
|
p->d_counting = 0;
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Fill in a DEMANGLE_COMPONENT_OPERATOR. */
|
|
|
|
int
|
|
cplus_demangle_fill_operator (struct demangle_component *p,
|
|
const char *opname, int args)
|
|
{
|
|
int len;
|
|
unsigned int i;
|
|
|
|
if (p == NULL || opname == NULL)
|
|
return 0;
|
|
len = strlen (opname);
|
|
for (i = 0; cplus_demangle_operators[i].name != NULL; ++i)
|
|
{
|
|
if (len == cplus_demangle_operators[i].len
|
|
&& args == cplus_demangle_operators[i].args
|
|
&& strcmp (opname, cplus_demangle_operators[i].name) == 0)
|
|
{
|
|
p->type = DEMANGLE_COMPONENT_OPERATOR;
|
|
p->u.s_operator.op = &cplus_demangle_operators[i];
|
|
p->d_printing = 0;
|
|
p->d_counting = 0;
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Translate a mangled name into components. */
|
|
|
|
struct demangle_component *
|
|
cplus_demangle_v3_components (const char *mangled, int options, void **mem)
|
|
{
|
|
size_t len;
|
|
int type;
|
|
struct d_info di;
|
|
struct demangle_component *dc;
|
|
|
|
len = strlen (mangled);
|
|
|
|
if (mangled[0] == '_' && mangled[1] == 'Z')
|
|
type = 0;
|
|
else
|
|
{
|
|
if ((options & DMGL_TYPES) == 0)
|
|
return NULL;
|
|
type = 1;
|
|
}
|
|
|
|
cplus_demangle_init_info (mangled, options, len, &di);
|
|
|
|
di.comps = ((struct demangle_component *)
|
|
malloc (di.num_comps * sizeof (struct demangle_component)));
|
|
di.subs = ((struct demangle_component **)
|
|
malloc (di.num_subs * sizeof (struct demangle_component *)));
|
|
if (di.comps == NULL || di.subs == NULL)
|
|
{
|
|
free (di.comps);
|
|
free (di.subs);
|
|
return NULL;
|
|
}
|
|
|
|
if (! type)
|
|
dc = cplus_demangle_mangled_name (&di, 1);
|
|
else
|
|
dc = cplus_demangle_type (&di);
|
|
|
|
/* If DMGL_PARAMS is set, then if we didn't consume the entire
|
|
mangled string, then we didn't successfully demangle it. */
|
|
if ((options & DMGL_PARAMS) != 0 && d_peek_char (&di) != '\0')
|
|
dc = NULL;
|
|
|
|
free (di.subs);
|
|
|
|
if (dc != NULL)
|
|
*mem = di.comps;
|
|
else
|
|
free (di.comps);
|
|
|
|
return dc;
|
|
}
|