From f76b422479df586a93a0a2eaac748b59923d6e97 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 29 Jun 2017 14:00:44 +0000 Subject: [PATCH] builtins.c (fold_builtin_FUNCTION): Use lang_hooks.decl_printable_name. gcc/ * builtins.c (fold_builtin_FUNCTION): Use lang_hooks.decl_printable_name. gcc/cp/ * g++.dg/cpp1y/builtin_FUNCTION.C: New. From-SVN: r249784 --- gcc/ChangeLog | 5 +++ gcc/builtins.c | 9 ++-- gcc/testsuite/ChangeLog | 4 ++ gcc/testsuite/g++.dg/cpp1y/builtin_FUNCTION.C | 42 +++++++++++++++++++ 4 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/builtin_FUNCTION.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c11b478777a..f230dad271a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-06-29 Nathan Sidwell + + * builtins.c (fold_builtin_FUNCTION): Use + lang_hooks.decl_printable_name. + 2017-06-29 Peter Bergner PR middle-end/81194 diff --git a/gcc/builtins.c b/gcc/builtins.c index 7e829ef1408..034ec2e4cb0 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -8739,13 +8739,12 @@ fold_builtin_FILE (location_t loc) static inline tree fold_builtin_FUNCTION () { + const char *name = ""; + if (current_function_decl) - { - const char *name = IDENTIFIER_POINTER (DECL_NAME (current_function_decl)); - return build_string_literal (strlen (name) + 1, name); - } + name = lang_hooks.decl_printable_name (current_function_decl, 0); - return build_string_literal (1, ""); + return build_string_literal (strlen (name) + 1, name); } /* Fold a call to __builtin_LINE to an integer constant. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2f0b29ba700..70651d5f3ab 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2017-06-29 Nathan Sidwell + + * g++.dg/cpp1y/builtin_FUNCTION.C: New. + 2017-06-29 Peter Bergner PR middle-end/81194 diff --git a/gcc/testsuite/g++.dg/cpp1y/builtin_FUNCTION.C b/gcc/testsuite/g++.dg/cpp1y/builtin_FUNCTION.C new file mode 100644 index 00000000000..680ba633611 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/builtin_FUNCTION.C @@ -0,0 +1,42 @@ +// { dg-do run } + +#include + +const char *ct, *dt, *cv; + +struct KLASS +{ + KLASS () ; + ~KLASS (); + operator int (); +}; + +KLASS::KLASS() +{ + ct = __builtin_FUNCTION (); +} + +KLASS::~KLASS () +{ + dt = __builtin_FUNCTION (); +} + +KLASS::operator int () +{ + cv = __builtin_FUNCTION (); + return 0; +} + +int main () +{ + int q = int (KLASS ()); + + if (strcmp (ct, "KLASS")) + return 1; + if (strcmp (dt, "~KLASS")) + return 2; + if (strcmp (cv, "operator int")) + return 3; + + return 0; +} -- 2.30.2