aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2018-02-12 12:47:56 +0000
committerPaolo Bonzini <bonzini@gcc.gnu.org>2018-02-12 12:47:56 +0000
commit74a5138a61291275fc5a509f33f427b3fa51bef4 (patch)
tree06e085b43fd9a54e80a41a3d89bec124030bc8cb
parent4ec4afa8c10837d17eb431a08fb0c16bdac3d3cf (diff)
downloadgcc-74a5138a61291275fc5a509f33f427b3fa51bef4.zip
gcc-74a5138a61291275fc5a509f33f427b3fa51bef4.tar.gz
gcc-74a5138a61291275fc5a509f33f427b3fa51bef4.tar.bz2
re PR sanitizer/84307 (asan blocks dead-store elimination)
gcc: 2018-02-12 Paolo Bonzini <bonzini@gnu.org> PR sanitizer/84307 * internal-fn.def (ASAN_CHECK): Fix fnspec to account for return value. (ASAN_MARK): Fix fnspec to account for return value, change pointer argument from 'R' to 'W' so that the pointed-to datum is clobbered. gcc/testsuite: 2018-02-12 Paolo Bonzini <bonzini@gnu.org> PR sanitizer/84307 * gcc.dg/asan/pr84307.c: New test. From-SVN: r257585
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/internal-fn.def4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/asan/pr84307.c21
4 files changed, 35 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6faa322..192712f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-02-12 Paolo Bonzini <bonzini@gnu.org>
+
+ PR sanitizer/84307
+ * internal-fn.def (ASAN_CHECK): Fix fnspec to account for return value.
+ (ASAN_MARK): Fix fnspec to account for return value, change pointer
+ argument from 'R' to 'W' so that the pointed-to datum is clobbered.
+
2018-02-08 Jan Hubicka <hubicka@ucw.cz>
PR middle-end/83665
diff --git a/gcc/internal-fn.def b/gcc/internal-fn.def
index 5970d0e..deacc1e 100644
--- a/gcc/internal-fn.def
+++ b/gcc/internal-fn.def
@@ -255,8 +255,8 @@ DEF_INTERNAL_FN (UBSAN_PTR, ECF_LEAF | ECF_NOTHROW, ".R.")
DEF_INTERNAL_FN (UBSAN_OBJECT_SIZE, ECF_LEAF | ECF_NOTHROW, NULL)
DEF_INTERNAL_FN (ABNORMAL_DISPATCHER, ECF_NORETURN, NULL)
DEF_INTERNAL_FN (BUILTIN_EXPECT, ECF_CONST | ECF_LEAF | ECF_NOTHROW, NULL)
-DEF_INTERNAL_FN (ASAN_CHECK, ECF_TM_PURE | ECF_LEAF | ECF_NOTHROW, ".R...")
-DEF_INTERNAL_FN (ASAN_MARK, ECF_LEAF | ECF_NOTHROW, ".R..")
+DEF_INTERNAL_FN (ASAN_CHECK, ECF_TM_PURE | ECF_LEAF | ECF_NOTHROW, "..R..")
+DEF_INTERNAL_FN (ASAN_MARK, ECF_LEAF | ECF_NOTHROW, "..W.")
DEF_INTERNAL_FN (ASAN_POISON, ECF_LEAF | ECF_NOTHROW | ECF_NOVOPS, NULL)
DEF_INTERNAL_FN (ASAN_POISON_USE, ECF_LEAF | ECF_NOTHROW | ECF_NOVOPS, NULL)
DEF_INTERNAL_FN (ADD_OVERFLOW, ECF_CONST | ECF_LEAF | ECF_NOTHROW, NULL)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 677fed9..539ff3e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-12 Paolo Bonzini <bonzini@gnu.org>
+
+ PR sanitizer/84307
+ * gcc.dg/asan/pr84307.c: New test.
+
2018-02-12 Nathan Sidwell <nathan@acm.org>
* g++.dg/parse/pr84263.C: New.
diff --git a/gcc/testsuite/gcc.dg/asan/pr84307.c b/gcc/testsuite/gcc.dg/asan/pr84307.c
new file mode 100644
index 0000000..6e1a197
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/asan/pr84307.c
@@ -0,0 +1,21 @@
+/* PR middle-end/83185 */
+/* { dg-do link } */
+/* { dg-options "-O1" } */
+
+struct f {
+ void (*func)(void);
+};
+
+extern void link_error(void);
+extern int printf(const char *f, ...);
+
+static inline struct f *gimme_null(struct f *result)
+{
+ return 0;
+}
+
+int main(int argc, char **argv)
+{
+ struct f *x = gimme_null(&(struct f) { .func = link_error });
+ printf("%p", x);
+}