From efab3e3a7326ad503532955ccd31f953851e388a Mon Sep 17 00:00:00 2001 From: Oliver Browne Date: Wed, 24 Jul 2019 18:08:51 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 7 +++++++ gcc/gimplify.c | 2 +- gcc/opts.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 694340e3bad..c6ab1278d54 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-07-24 Oliver Browne + + * 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 * tree-nested.c (build_simple_mem_ref_notrap): New function. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 723897f566c..a40c7ce6663 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 46a19a27887..076d0007c7e 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); -- 2.30.2