From: Richard Biener <rguenther@suse.de>
To: gcc-patches@gcc.gnu.org
Cc: Jakub Jelinek <jakub@redhat.com>
Subject: [PATCH] tree-optimization/109170 - bogus use-after-free with __builtin_expect
Date: Thu, 27 Apr 2023 12:10:40 +0000 (UTC) [thread overview]
Message-ID: <20230427121040._6H9H4awHnnzvCwe7dL7feFwcqinshnkPxSZUj4VsZQ@z> (raw)
The following generalizes the range-op for __builtin_expect
by using the fnspec machinery.
We've defered this to stage1 - bootstrapped and tested on
x86_64-unknown-linux-gnu.
OK?
Thanks,
Richard.
PR tree-optimization/109170
* gimple-range-op.cc (gimple_range_op_handler::maybe_builtin_call):
Handle __builtin_expect and similar via cfn_pass_through_arg1
and inspecting the calls fnspec.
* builtins.cc (builtin_fnspec): Handle BUILT_IN_EXPECT
and BUILT_IN_EXPECT_WITH_PROBABILITY.
---
gcc/builtins.cc | 2 ++
gcc/gimple-range-op.cc | 19 +++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 878596c240a..bd07873a80e 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -11718,6 +11718,8 @@ builtin_fnspec (tree callee)
case BUILT_IN_RETURN_ADDRESS:
return ".c";
case BUILT_IN_ASSUME_ALIGNED:
+ case BUILT_IN_EXPECT:
+ case BUILT_IN_EXPECT_WITH_PROBABILITY:
return "1cX ";
/* But posix_memalign stores a pointer into the memory pointed to
by its first argument. */
diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc
index f7409e35a99..04e27d6aa05 100644
--- a/gcc/gimple-range-op.cc
+++ b/gcc/gimple-range-op.cc
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "range.h"
#include "value-query.h"
#include "gimple-range.h"
+#include "attr-fnspec.h"
// Given stmt S, fill VEC, up to VEC_SIZE elements, with relevant ssa-names
// on the statement. For efficiency, it is an error to not pass in enough
@@ -984,14 +985,16 @@ gimple_range_op_handler::maybe_builtin_call ()
m_int = &op_cfn_parity;
break;
- case CFN_BUILT_IN_EXPECT:
- case CFN_BUILT_IN_EXPECT_WITH_PROBABILITY:
- m_valid = true;
- m_op1 = gimple_call_arg (call, 0);
- m_int = &op_cfn_pass_through_arg1;
- break;
-
default:
- break;
+ {
+ unsigned arg;
+ if (gimple_call_fnspec (call).returns_arg (&arg) && arg == 0)
+ {
+ m_valid = true;
+ m_op1 = gimple_call_arg (call, 0);
+ m_int = &op_cfn_pass_through_arg1;
+ }
+ break;
+ }
}
}
--
2.35.3
next reply other threads:[~2023-04-27 12:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 12:10 Richard Biener [this message]
[not found] <34641.123042708104200740@us-mta-611.us.mimecast.lan>
2023-04-27 12:11 ` Jakub Jelinek
-- strict thread matches above, loose matches on Subject: below --
2023-03-17 12:18 Richard Biener
2023-03-17 12:43 ` Jakub Jelinek
2023-03-17 12:53 ` Richard Biener
2023-03-17 12:59 ` Jakub Jelinek
2023-03-17 13:55 ` Richard Biener
2023-03-17 14:03 ` Jakub Jelinek
2023-03-17 14:18 ` Richard Biener
2023-03-17 14:52 ` Jakub Jelinek
2023-03-20 8:21 ` Richard Biener
2023-03-20 12:12 ` Richard Biener
2023-03-20 13:22 ` Jakub Jelinek
2023-03-21 8:21 ` Richard Biener
2023-03-21 8:23 ` Jakub Jelinek
2023-03-17 13:59 ` Andrew MacLeod
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230427121040._6H9H4awHnnzvCwe7dL7feFwcqinshnkPxSZUj4VsZQ@z \
--to=rguenther@suse.de \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).