gimplify.c (flag_instrument_functions_exclude_p): Include namespace/class information in the printable name.

	* 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

3 files changed, 10 insertions, 1 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 694340e..c6ab127 100644
--- 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 723897f..a40c7ce 100644
--- 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 46a19a2..076d000 100644
--- 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);