From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 6E19A38582B9; Tue, 30 Jan 2024 08:59:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E19A38582B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1706605149; bh=njhaVrcnosoLBlVpBuJl0b+VMt6dgTsGtInqUoJDzLs=; h=From:To:Subject:Date:From; b=QTc/5c2B6/3Yb2nCBcGLFlbOHmcVELe9TcRBC9kQAAyIVXjI202TIpPxlpy2wJPFG AMP5CerfspH9ByYCBDM9yEisAzJrK679iEADqkVUHR8XCjnXvpYw5MdGlEI2xEXPag piAj4KESNkhbw0vJZjfnIIoZjPhO3PmSiEe+pCA0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-8516] except: Fix __builtin_eh_return_data_regno (-42) expansion [PR101195] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 47b81161c98cf2ff5495d4aa6386cc3c87f9d27b X-Git-Newrev: 26c9b95b9f712ff1f813351b5d45371620085221 Message-Id: <20240130085909.6E19A38582B9@sourceware.org> Date: Tue, 30 Jan 2024 08:59:09 +0000 (GMT) List-Id: https://gcc.gnu.org/g:26c9b95b9f712ff1f813351b5d45371620085221 commit r14-8516-g26c9b95b9f712ff1f813351b5d45371620085221 Author: Jakub Jelinek Date: Tue Jan 30 09:57:21 2024 +0100 except: Fix __builtin_eh_return_data_regno (-42) expansion [PR101195] The expansion of this builtin emits an error if the argument is not INTEGER_CST, otherwise uses tree_to_uhwi on the argument (which is declared int) and then uses EH_RETURN_DATA_REGNO macro which on most targets returns INVALID_REGNUM for all values but some small number (2 or 4); if it returns INVALID_REGNUM, we silently expand to -1. Now, I think the error for non-INTEGER_CST makes sense to catch when people unintentionally don't call it with a constant (but, users shouldn't really use this builtin anyway, it is for the unwinder only). Initially I thought about emitting an error for the negative values as well on which tree_to_uhwi otherwise ICEs, but given that the function will silently expand to -1 for INT_MAX - 1 or INT_MAX - 3 other values, I think treating the negatives the same silently is fine too. 2024-01-30 Jakub Jelinek PR middle-end/101195 * except.cc (expand_builtin_eh_return_data_regno): If which doesn't fit into unsigned HOST_WIDE_INT, return constm1_rtx. * gcc.dg/pr101195.c: New test. Diff: --- gcc/except.cc | 3 +++ gcc/testsuite/gcc.dg/pr101195.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/gcc/except.cc b/gcc/except.cc index 9277a9a80c3d..2080fcc22e62 100644 --- a/gcc/except.cc +++ b/gcc/except.cc @@ -2167,6 +2167,9 @@ expand_builtin_eh_return_data_regno (tree exp) return constm1_rtx; } + if (!tree_fits_uhwi_p (which)) + return constm1_rtx; + iwhich = tree_to_uhwi (which); iwhich = EH_RETURN_DATA_REGNO (iwhich); if (iwhich == INVALID_REGNUM) diff --git a/gcc/testsuite/gcc.dg/pr101195.c b/gcc/testsuite/gcc.dg/pr101195.c new file mode 100644 index 000000000000..7b219f80711f --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr101195.c @@ -0,0 +1,8 @@ +/* PR middle-end/101195 */ +/* { dg-do compile } */ + +int +foo (void) +{ + return __builtin_eh_return_data_regno (-42); +}