@@ -65,18 +65,10 @@ is_named_call_p (tree fndecl, const char *funcname)
gcc_assert (fndecl);
gcc_assert (funcname);
- /* Exclude functions not at the file scope, or not `extern',
- since they are not the magic functions we would otherwise
- think they are. */
- if (!((DECL_CONTEXT (fndecl) == NULL_TREE
- || TREE_CODE (DECL_CONTEXT (fndecl)) == TRANSLATION_UNIT_DECL)
- && TREE_PUBLIC (fndecl)))
+ if (!maybe_special_function_p (fndecl))
return false;
tree identifier = DECL_NAME (fndecl);
- if (identifier == NULL)
- return false;
-
const char *name = IDENTIFIER_POINTER (identifier);
const char *tname = name;
@@ -59,6 +59,8 @@ bool
function_set::contains_decl_p (tree fndecl) const
{
gcc_assert (fndecl && DECL_P (fndecl));
+ if (!maybe_special_function_p (fndecl))
+ return false;
return contains_name_p (IDENTIFIER_POINTER (DECL_NAME (fndecl)));
}
@@ -572,22 +572,18 @@ emit_call_1 (rtx funexp, tree fntree ATTRIBUTE_UNUSED, tree fndecl ATTRIBUTE_UNU
anti_adjust_stack (gen_int_mode (n_popped, Pmode));
}
-/* Determine if the function identified by FNDECL is one with
- special properties we wish to know about. Modify FLAGS accordingly.
-
- For example, if the function might return more than one time (setjmp), then
- set ECF_RETURNS_TWICE.
+/* Determine if the function identified by FNDECL is one that
+ makes sense to match by name, for those places where we detect
+ "magic" functions by name.
- Set ECF_MAY_BE_ALLOCA for any memory allocation function that might allocate
- space from the stack such as alloca. */
+ Return true if FNDECL has a name and is an extern fndecl at file scope.
+ FNDECL must be a non-NULL decl. */
-static int
-special_function_p (const_tree fndecl, int flags)
+bool
+maybe_special_function_p (const_tree fndecl)
{
tree name_decl = DECL_NAME (fndecl);
-
- if (fndecl && name_decl
- && IDENTIFIER_LENGTH (name_decl) <= 11
+ if (name_decl
/* Exclude functions not at the file scope, or not `extern',
since they are not the magic functions we would otherwise
think they are.
@@ -598,6 +594,26 @@ special_function_p (const_tree fndecl, int flags)
&& (DECL_CONTEXT (fndecl) == NULL_TREE
|| TREE_CODE (DECL_CONTEXT (fndecl)) == TRANSLATION_UNIT_DECL)
&& TREE_PUBLIC (fndecl))
+ return true;
+ return false;
+}
+
+/* Determine if the function identified by FNDECL is one with
+ special properties we wish to know about. Modify FLAGS accordingly.
+
+ For example, if the function might return more than one time (setjmp), then
+ set ECF_RETURNS_TWICE.
+
+ Set ECF_MAY_BE_ALLOCA for any memory allocation function that might allocate
+ space from the stack such as alloca. */
+
+static int
+special_function_p (const_tree fndecl, int flags)
+{
+ tree name_decl = DECL_NAME (fndecl);
+
+ if (maybe_special_function_p (fndecl)
+ && IDENTIFIER_LENGTH (name_decl) <= 11)
{
const char *name = IDENTIFIER_POINTER (name_decl);
const char *tname = name;
@@ -5611,6 +5611,8 @@ builtin_decl_declared_p (enum built_in_function fncode)
&& builtin_info[uns_fncode].declared_p);
}
+extern bool maybe_special_function_p (const_tree fndecl);
+
/* Return true if T (assumed to be a DECL) is a global variable.
A variable is considered global if its storage is not automatic. */