[PATCH] Fix slowness in demangler

	* 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.

	* demangle.h (struct demangle_component): Add member
	d_counting.

From-SVN: r278359

diff --git a/include/ChangeLog b/include/ChangeLog
index 5e18fa3d5a6191b6c936ad220658eaf1d1e3c984..6364ab4de6109180036e16045c1fb3c2f019b1cb 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,4 +1,9 @@
-2019-10-22  Eduard-Mihai Burtescu  <eddyb@lyken.rs>
+2019-11-16  Tim Ruehsen  <tim.ruehsen@gmx.de>
+
+       * demangle.h (struct demangle_component): Add member
+       d_counting.
+
+2019-11-16  Eduard-Mihai Burtescu  <eddyb@lyken.rs>
 
        * demangle.h (rust_demangle_callback): Add.
 

diff --git a/include/demangle.h b/include/demangle.h
index ce7235d13f38719a5795d6bd5c454e33abab8863..66f3a9fd7d8d963c9765f9ea122240bd70f38e64 100644 (file)
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -468,6 +468,7 @@ struct demangle_component
      Initialize to zero.  Private to d_print_comp.
      All other fields are final after initialization.  */
   int d_printing;
+  int d_counting;
 
   union
   {

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index db5cf3dd323347ea2bfa6243afc7a41926f53ffa..a766bd8af69bea294a68b1d38f83dc0a339893d1 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,4 +1,19 @@
-2019-10-22  Eduard-Mihai Burtescu  <eddyb@lyken.rs>
+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.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 963217c37bd66b9c3f2b9e281f7999c1e741b428..d7fee643d0bde51f32ec9bed7a713d70d7c99211 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -517,7 +517,7 @@ d_growable_string_callback_adapter (const char *, size_t, void *);
 
 static void
 d_print_init (struct d_print_info *, demangle_callbackref, void *,
-             const struct demangle_component *);
+             struct demangle_component *);
 
 static inline void d_print_error (struct d_print_info *);
 
@@ -864,6 +864,7 @@ cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
   if (p == NULL || s == NULL || len <= 0)
     return 0;
   p->d_printing = 0;
+  p->d_counting = 0;
   p->type = DEMANGLE_COMPONENT_NAME;
   p->u.s_name.s = s;
   p->u.s_name.len = len;
@@ -880,6 +881,7 @@ cplus_demangle_fill_extended_operator (struct demangle_component *p, int args,
   if (p == NULL || args < 0 || name == NULL)
     return 0;
   p->d_printing = 0;
+  p->d_counting = 0;
   p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR;
   p->u.s_extended_operator.args = args;
   p->u.s_extended_operator.name = name;
@@ -900,6 +902,7 @@ cplus_demangle_fill_ctor (struct demangle_component *p,
       || (int) kind > gnu_v3_object_ctor_group)
     return 0;
   p->d_printing = 0;
+  p->d_counting = 0;
   p->type = DEMANGLE_COMPONENT_CTOR;
   p->u.s_ctor.kind = kind;
   p->u.s_ctor.name = name;
@@ -920,6 +923,7 @@ cplus_demangle_fill_dtor (struct demangle_component *p,
       || (int) kind > gnu_v3_object_dtor_group)
     return 0;
   p->d_printing = 0;
+  p->d_counting = 0;
   p->type = DEMANGLE_COMPONENT_DTOR;
   p->u.s_dtor.kind = kind;
   p->u.s_dtor.name = name;
@@ -937,6 +941,7 @@ d_make_empty (struct d_info *di)
     return NULL;
   p = &di->comps[di->next_comp];
   p->d_printing = 0;
+  p->d_counting = 0;
   ++di->next_comp;
   return p;
 }
@@ -4079,11 +4084,13 @@ d_growable_string_callback_adapter (const char *s, size_t l, void *opaque)
 
 static void
 d_count_templates_scopes (struct d_print_info *dpi,
-                         const struct demangle_component *dc)
+                         struct demangle_component *dc)
 {
-  if (dc == NULL)
+  if (dc == NULL || dc->d_counting > 1 || dpi->recursion > MAX_RECURSION_COUNT)
     return;
 
+  ++ dc->d_counting;
+
   switch (dc->type)
     {
     case DEMANGLE_COMPONENT_NAME:
@@ -4213,7 +4220,7 @@ d_count_templates_scopes (struct d_print_info *dpi,
 
 static void
 d_print_init (struct d_print_info *dpi, demangle_callbackref callback,
-             void *opaque, const struct demangle_component *dc)
+             void *opaque, struct demangle_component *dc)
 {
   dpi->len = 0;
   dpi->last_char = '\0';

diff --git a/libiberty/cp-demint.c b/libiberty/cp-demint.c
index 950e4dc5522af08d65131ee8a766c0317ff7c770..16bf1f8ce6d5222c094f912191ce0f75ddb8138b 100644 (file)
--- a/libiberty/cp-demint.c
+++ b/libiberty/cp-demint.c
@@ -125,6 +125,7 @@ cplus_demangle_fill_component (struct demangle_component *p,
   p->u.s_binary.left = left;
   p->u.s_binary.right = right;
   p->d_printing = 0;
+  p->d_counting = 0;
 
   return 1;
 }
@@ -149,6 +150,7 @@ cplus_demangle_fill_builtin_type (struct demangle_component *p,
          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;
        }
     }
@@ -176,6 +178,7 @@ cplus_demangle_fill_operator (struct demangle_component *p,
          p->type = DEMANGLE_COMPONENT_OPERATOR;
          p->u.s_operator.op = &cplus_demangle_operators[i];
          p->d_printing = 0;
+         p->d_counting = 0;
          return 1;
        }
     }