From 1bbae6518fedd77c6e956bada60f429587ecd6c3 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 13 Feb 2018 13:03:22 +0000 Subject: [PATCH] re PR sanitizer/84340 (g++.dg/asan/use-after-scope-types-1.C (and others) fails after r257585) gcc: 2018-02-13 Paolo Bonzini PR sanitizer/84340 * internal-fn.def (ASAN_CHECK, ASAN_MARK): Revert changes to fnspec. gcc/testsuite: 2018-02-13 Paolo Bonzini PR sanitizer/84307 * gcc.dg/asan/pr84307.c: Remove test. From-SVN: r257625 --- gcc/ChangeLog | 5 +++++ gcc/internal-fn.def | 4 ++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/asan/pr84307.c | 21 --------------------- 4 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 gcc/testsuite/gcc.dg/asan/pr84307.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ac13faf58d6..6c1e5e38d63 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-02-13 Paolo Bonzini + + PR sanitizer/84340 + * internal-fn.def (ASAN_CHECK, ASAN_MARK): Revert changes to fnspec. + 2018-02-13 Martin Jambor PR c++/83990 diff --git a/gcc/internal-fn.def b/gcc/internal-fn.def index deacc1e6707..5970d0e472c 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, "..W.") +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_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 613a3277e10..d8400f81159 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-13 Paolo Bonzini + + PR sanitizer/84340 + * gcc.dg/asan/pr84307.c: Remove test. + 2018-02-13 Sebastian Perta * gcc.target/rl78/test_auto_vector.c: New test. diff --git a/gcc/testsuite/gcc.dg/asan/pr84307.c b/gcc/testsuite/gcc.dg/asan/pr84307.c deleted file mode 100644 index 6e1a1979c47..00000000000 --- a/gcc/testsuite/gcc.dg/asan/pr84307.c +++ /dev/null @@ -1,21 +0,0 @@ -/* 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); -} -- 2.30.2