diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2015-02-09 22:23:58 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-02-09 22:23:58 +0100 |
| commit | d51151b2f4284ee26ceca0944a34b7763335eee4 (patch) | |
| tree | 1ca21e0d206ad1ed93a5fbce4c51308411f4589d /gcc | |
| parent | c3e38a03df5f6074fd83d06c2c8d7393b0446026 (diff) | |
| download | gcc-d51151b2f4284ee26ceca0944a34b7763335eee4.zip gcc-d51151b2f4284ee26ceca0944a34b7763335eee4.tar.gz gcc-d51151b2f4284ee26ceca0944a34b7763335eee4.tar.bz2 | |
re PR sanitizer/64981 (-fsanitize=address cant expand __builtin_ia32_rdtsc)
PR sanitizer/64981
* builtins.c (expand_builtin): Call targetm.expand_builtin
for BUILT_IN_MD builtins regardless of asan_intercepted_p.
* gcc.dg/asan/pr64981.c: New test.
From-SVN: r220551
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/builtins.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/asan/pr64981.c | 12 |
4 files changed, 26 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2791de6..328c37d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-02-09 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/64981 + * builtins.c (expand_builtin): Call targetm.expand_builtin + for BUILT_IN_MD builtins regardless of asan_intercepted_p. + 2015-02-08 Jan Hubicka <hubicka@ucw.cz> PR ipa/61548 diff --git a/gcc/builtins.c b/gcc/builtins.c index 3ddaddc..8f3c0bc 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -5960,6 +5960,9 @@ expand_builtin (tree exp, rtx target, rtx subtarget, machine_mode mode, machine_mode target_mode = TYPE_MODE (TREE_TYPE (exp)); int flags; + if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD) + return targetm.expand_builtin (exp, target, subtarget, mode, ignore); + /* When ASan is enabled, we don't want to expand some memory/string builtins and rely on libsanitizer's hooks. This allows us to avoid redundant checks and be sure, that possible overflow will be detected @@ -5968,9 +5971,6 @@ expand_builtin (tree exp, rtx target, rtx subtarget, machine_mode mode, if ((flag_sanitize & SANITIZE_ADDRESS) && asan_intercepted_p (fcode)) return expand_call (exp, target, ignore); - if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_MD) - return targetm.expand_builtin (exp, target, subtarget, mode, ignore); - /* When not optimizing, generate calls to library functions for a certain set of builtins. */ if (!optimize diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3d14e60..67f1e8e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-02-09 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/64981 + * gcc.dg/asan/pr64981.c: New test. + 2015-02-09 Marek Polacek <polacek@redhat.com> PR c/64856 diff --git a/gcc/testsuite/gcc.dg/asan/pr64981.c b/gcc/testsuite/gcc.dg/asan/pr64981.c new file mode 100644 index 0000000..85e3479 --- /dev/null +++ b/gcc/testsuite/gcc.dg/asan/pr64981.c @@ -0,0 +1,12 @@ +/* PR sanitizer/64981 */ +/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-options "-fsanitize=address -march=x86-64" } */ + +int +main () +{ + __builtin_ia32_rdtsc (); + return 0; +} + +/* { dg-final { scan-assembler-not "__builtin_ia32_rdtsc" } } */ |