From 9e8b7986458d79cf066088f091428f4bae46c6f4 Mon Sep 17 00:00:00 2001 From: fanfuqiang Date: Sun, 18 Aug 2019 14:17:13 +0800 Subject: [PATCH] update may_be_alias to gcc 9.2 --- src/rap_plugin/hl-cfi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/rap_plugin/hl-cfi.c b/src/rap_plugin/hl-cfi.c index fabbf27..5fad559 100644 --- a/src/rap_plugin/hl-cfi.c +++ b/src/rap_plugin/hl-cfi.c @@ -160,6 +160,8 @@ rap_try_call_ipa_pta (void* gcc_data, void* user_data) static inline bool is_rap_function_may_be_aliased (tree f) { +#if BUILDING_GCC_VERSION < 7000 + return (TREE_CODE (f) != CONST_DECL && !((TREE_STATIC (f) || TREE_PUBLIC (f) || DECL_EXTERNAL (f)) && TREE_READONLY (f) @@ -167,8 +169,20 @@ is_rap_function_may_be_aliased (tree f) && (TREE_PUBLIC (f) || DECL_EXTERNAL (f) || TREE_ADDRESSABLE (f))); -} +#else + + return (TREE_CODE (f) != CONST_DECL + && (TREE_PUBLIC (f) + || DECL_EXTERNAL (f) + || TREE_ADDRESSABLE (f)) + && !((TREE_STATIC (f) || TREE_PUBLIC (f) || DECL_EXTERNAL (f)) + && (TREE_READONLY (f) + || (TREE_CODE (f) == VAR_DECL + && DECL_NONALIASED (f))))); + +#endif +} /* Tools for type database operates */