diff options
| -rw-r--r-- | gcc/c-common.c | 8 | ||||
| -rw-r--r-- | gcc/c-decl.c | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/gcc/c-common.c b/gcc/c-common.c index 0c8118e..a00d384 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -27,7 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #undef NULL #define NULL 0 -/* Make bindings for __NAME__ and __PRINTABLE_NAME__. */ +/* Make bindings for __FUNCTION__ and __PRETTY_FUNCTION__. */ void declare_function_name () @@ -50,11 +50,10 @@ declare_function_name () } push_obstacks_nochange (); - decl = build_decl (VAR_DECL, get_identifier ("__NAME__"), + decl = build_decl (VAR_DECL, get_identifier ("__FUNCTION__"), char_array_type_node); TREE_STATIC (decl) = 1; TREE_READONLY (decl) = 1; - TREE_NO_UNUSED_WARNING (decl) = 1; DECL_IGNORED_P (decl) = 1; init = build_string (strlen (name) + 1, name); TREE_TYPE (init) = char_array_type_node; @@ -62,11 +61,10 @@ declare_function_name () finish_decl (pushdecl (decl), init, NULL_TREE); push_obstacks_nochange (); - decl = build_decl (VAR_DECL, get_identifier ("__PRINTABLE_NAME__"), + decl = build_decl (VAR_DECL, get_identifier ("__PRETTY_FUNCTION__"), char_array_type_node); TREE_STATIC (decl) = 1; TREE_READONLY (decl) = 1; - TREE_NO_UNUSED_WARNING (decl) = 1; DECL_IGNORED_P (decl) = 1; init = build_string (strlen (printable_name) + 1, printable_name); TREE_TYPE (init) = char_array_type_node; diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 5f90817..267267b 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1789,10 +1789,7 @@ pushdecl (x) /* No shadow warnings for internally generated vars. */ && !DECL_IGNORED_P (x) /* No shadow warnings for vars made for inlining. */ - && ! DECL_FROM_INLINE (x) - /* No shadow warnings for user-invisible decls. */ - && ! (TREE_CODE (x) == VAR_DECL - && DECL_IGNORED_P (x) && TREE_READONLY (x))) + && ! DECL_FROM_INLINE (x)) { char *warnstring = 0; @@ -2599,7 +2596,7 @@ init_decl_processing () builtin_function ("__builtin_getman", double_ftype_double, BUILT_IN_GETMAN, 0); #endif - /* Create the global bindings of __NAME__ and __PRINTABLE_NAME__. */ + /* Create the global bindings for __FUNCTION__ and __PRETTY_FUNCTION__. */ declare_function_name (); start_identifier_warnings (); @@ -5456,7 +5453,7 @@ store_parm_decls () if (c_function_varargs) mark_varargs (); - /* Declare __NAME__ and __PRINTABLE_NAME__ for this function. */ + /* Declare __FUNCTION__ and __PRETTY_FUNCTION__ for this function. */ declare_function_name (); |