From 2d90f3ed9c63926cb6f150aa0dcad4d16a4c16c7 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 12 Jul 2021 10:26:25 +0200 Subject: [PATCH] middle-end/101423 - internal calls do not trap This adjusts gimple_could_trap_p to not consider internal function calls to trap compared to indirect calls or calls to weak functions. 2021-07-12 Richard Biener PR middle-end/101423 * gimple.c (gimple_could_trap_p_1): Internal function calls do not trap. * tree-eh.c (tree_could_trap_p): Likewise. (cherry picked from commit 123d0a597beb6d9865f808bf15b0d67f2a8fd5b2) --- gcc/gimple.c | 4 +++- gcc/tree-eh.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/gimple.c b/gcc/gimple.c index 87864f3d0dd4..c6f7c2d49002 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -2149,8 +2149,10 @@ gimple_could_trap_p_1 (gimple *s, bool include_mem, bool include_stores) return gimple_asm_volatile_p (as_a (s)); case GIMPLE_CALL: + if (gimple_call_internal_p (s)) + return false; t = gimple_call_fndecl (s); - /* Assume that calls to weak functions may trap. */ + /* Assume that indirect and calls to weak functions may trap. */ if (!t || !DECL_P (t) || DECL_WEAK (t)) return true; return false; diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index a68778b98094..08c973254840 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -2723,8 +2723,11 @@ tree_could_trap_p (tree expr) return TREE_THIS_VOLATILE (expr); case CALL_EXPR: + /* Internal function calls do not trap. */ + if (CALL_EXPR_FN (expr) == NULL_TREE) + return false; t = get_callee_fndecl (expr); - /* Assume that calls to weak functions may trap. */ + /* Assume that indirect and calls to weak functions may trap. */ if (!t || !DECL_P (t)) return true; if (DECL_WEAK (t)) -- 2.47.2