From 1448cf4c4eec86e4ae4cdc22f062afc12cb46ca1 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 2 Sep 2019 10:58:39 +0200 Subject: [PATCH] Backport r275292 2019-09-02 Martin Liska Backport from mainline 2019-09-02 Martin Liska PR c++/91155 * c-common.c (fname_as_string): Use cxx_printable_name for __PRETTY_FUNCTION__ same as was used before r265711. 2019-09-02 Martin Liska Backport from mainline 2019-09-02 Martin Liska PR c++/91155 * g++.dg/torture/pr91155.C: New test. From-SVN: r275302 --- gcc/c-family/ChangeLog | 9 +++++++++ gcc/cp/decl.c | 20 +++++++++++++++++--- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/g++.dg/torture/pr91155.C | 18 ++++++++++++++++++ 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/torture/pr91155.C diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 8fa6963f1862..7f786dfdfcd0 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,12 @@ +2019-09-02 Martin Liska + + Backport from mainline + 2019-09-02 Martin Liska + + PR c++/91155 + * c-common.c (fname_as_string): Use cxx_printable_name for + __PRETTY_FUNCTION__ same as was used before r265711. + 2019-08-31 Iain Sandoe Backport from mainline diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 05ceda89d4c9..e860f26e55d8 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4474,13 +4474,27 @@ cp_fname_init (const char* name, tree *type_p) static tree cp_make_fname_decl (location_t loc, tree id, int type_dep) { - const char *const name = (type_dep && in_template_function () - ? NULL : fname_as_string (type_dep)); + const char * name = NULL; + bool release_name = false; + if (!(type_dep && in_template_function ())) + { + if (current_function_decl == NULL_TREE) + name = "top level"; + else if (type_dep == 1) /* __PRETTY_FUNCTION__ */ + name = cxx_printable_name (current_function_decl, 2); + else if (type_dep == 0) /* __FUNCTION__ */ + { + name = fname_as_string (type_dep); + release_name = true; + } + else + gcc_unreachable (); + } tree type; tree init = cp_fname_init (name, &type); tree decl = build_decl (loc, VAR_DECL, id, type); - if (name) + if (release_name) free (CONST_CAST (char *, name)); /* As we're using pushdecl_with_scope, we must set the context. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0826d7820e22..5ae06aa8a5a3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2019-09-02 Martin Liska + + Backport from mainline + 2019-09-02 Martin Liska + + PR c++/91155 + * g++.dg/torture/pr91155.C: New test. + 2019-09-01 Eric Botcazou * gcc.c-torture/execute/20190901-1.c: New test. diff --git a/gcc/testsuite/g++.dg/torture/pr91155.C b/gcc/testsuite/g++.dg/torture/pr91155.C new file mode 100644 index 000000000000..04e4f7ab41b8 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr91155.C @@ -0,0 +1,18 @@ +/* PR c++/91155. */ + +template< char C > struct dummy {}; + +template< typename T > const char *test() +{ + __builtin_printf ("test: %s\n", __PRETTY_FUNCTION__); + return __PRETTY_FUNCTION__; +} + +int main() +{ + if (__builtin_strcmp ("const char* test() [with T = dummy<\'\\000\'>]", test< dummy< '\0' > > ()) != 0) + {};// __builtin_abort (); + if (__builtin_strcmp ("const char* test() [with T = dummy<\'\\\'\'>]", test< dummy< '\'' > > ()) != 0) + {};// __builtin_abort (); + return 0; +} -- 2.47.2