aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2017-10-11 14:29:13 +0200
committerMartin Liska <marxin@gcc.gnu.org>2017-10-11 12:29:13 +0000
commited89e76a35f8dc067b747a57a143d2d74516afc4 (patch)
tree883f0f74bdf011ca6d2d86c216536c9994361f89 /gcc
parent78188a05d0f423b99edee82bce01fdad35e3c37b (diff)
downloadgcc-ed89e76a35f8dc067b747a57a143d2d74516afc4.zip
gcc-ed89e76a35f8dc067b747a57a143d2d74516afc4.tar.gz
gcc-ed89e76a35f8dc067b747a57a143d2d74516afc4.tar.bz2
Revert last commit.
From-SVN: r253638
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/sanopt.c4
-rw-r--r--gcc/testsuite/ChangeLog7
-rw-r--r--gcc/testsuite/gcc.dg/asan/pr82484.c5
4 files changed, 16 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b02c62..2eecadb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
2017-10-11 Martin Liska <mliska@suse.cz>
+ Revert r253637:
+
+ PR sanitizer/82484
+ * sanopt.c (sanitize_rewrite_addressable_params): Do not handle
+ volatile arguments.
+
+2017-10-11 Martin Liska <mliska@suse.cz>
+
PR sanitizer/82484
* sanopt.c (sanitize_rewrite_addressable_params): Do not handle
volatile arguments.
diff --git a/gcc/sanopt.c b/gcc/sanopt.c
index 019cf9f..997bcfd 100644
--- a/gcc/sanopt.c
+++ b/gcc/sanopt.c
@@ -1140,9 +1140,7 @@ sanitize_rewrite_addressable_params (function *fun)
arg; arg = DECL_CHAIN (arg))
{
tree type = TREE_TYPE (arg);
- if (TREE_ADDRESSABLE (arg)
- && !TREE_ADDRESSABLE (type)
- && !TREE_THIS_VOLATILE (arg)
+ if (TREE_ADDRESSABLE (arg) && !TREE_ADDRESSABLE (type)
&& TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST)
{
TREE_ADDRESSABLE (arg) = 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b6093d0..1f51a72 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
2017-10-11 Martin Liska <mliska@suse.cz>
+ Revert r253637:
+
+ PR sanitizer/82484
+ * gcc.dg/asan/pr82484.c: New test.
+
+2017-10-11 Martin Liska <mliska@suse.cz>
+
PR sanitizer/82484
* gcc.dg/asan/pr82484.c: New test.
diff --git a/gcc/testsuite/gcc.dg/asan/pr82484.c b/gcc/testsuite/gcc.dg/asan/pr82484.c
deleted file mode 100644
index f8051bd..0000000
--- a/gcc/testsuite/gcc.dg/asan/pr82484.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* PR sanitizer/82484 */
-/* { dg-do compile } */
-
-void foo(volatile int *ptr);
-void a (volatile int b) { foo(&b); }