gimplify.c (flag_instrument_functions_exclude_p): Include namespace/class information...

	* gimplify.c (flag_instrument_functions_exclude_p): Include
	namespace/class information in the printable name.
	* opts.c (add_comma_separated_to_vector): Add NUL terminator
	to tokens entered into the vector.

From-SVN: r273766

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 694340e3bad711ed6791ccb54e46cf2a4af65ab1..c6ab1278d549731f3bcda76f44734d7c9b094517 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-07-24  Oliver Browne  <oliverbrowne62@gmail.com>
+
+       * gimplify.c (flag_instrument_functions_exclude_p): Include
+       namespace/class information in the printable name.
+       * opts.c (add_comma_separated_to_vector): Add NUL terminator
+       to tokens entered into the vector.
+
 2019-07-24  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree-nested.c (build_simple_mem_ref_notrap): New function.

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 723897f566c4645ab882b53956c1e8c61cf4bb5c..a40c7ce6663f76cebb6cda3fab7a486d6cd3b42d 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -14354,7 +14354,7 @@ flag_instrument_functions_exclude_p (tree fndecl)
       int i;
       char *s;
 
-      name = lang_hooks.decl_printable_name (fndecl, 0);
+      name = lang_hooks.decl_printable_name (fndecl, 1);
       FOR_EACH_VEC_ELT (*v, i, s)
        if (strstr (name, s) != NULL)
          return true;

diff --git a/gcc/opts.c b/gcc/opts.c
index 46a19a278871178bce85e1f601a5f695d9e6b28f..076d0007c7e3b9bb91bd3261dae58f109cd14dcb 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -262,6 +262,8 @@ add_comma_separated_to_vector (void **pvec, const char *arg)
       else
        *w++ = *r++;
     }
+
+  *w = '\0';
   if (*token_start != '\0')
     v->safe_push (token_start);