From a1c9dd9b54764ed0e268451b9f20a7c5962f98d0 Mon Sep 17 00:00:00 2001 From: Dominique d'Humieres Date: Mon, 30 May 2016 11:26:09 +0200 Subject: [PATCH] backport: re PR sanitizer/68042 (c-c++-common/asan/(memcmp-1.c|sanity-check-pure-c-1.c) failures on x86_64-apple-darwin14 after r229111) 2016-05-30 Dominique d'Humieres Backport from trunk. 2015-10-23 Maxim Ostapenko PR sanitizer/68042 * c-c++-common/asan/sanity-check-pure-c-1.c: Adjust test to pass on Darwin. From-SVN: r236873 --- gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd9d41eb19d8..a236e1c3cb8b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2016-05-30 Dominique d'Humieres + + Backport from trunk. + 2015-10-23 Maxim Ostapenko + + PR sanitizer/68042 + * c-c++-common/asan/sanity-check-pure-c-1.c: Adjust test + to pass on Darwin. + 2016-05-26 Jerry DeLisle Backport from trunk. diff --git a/gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c b/gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c index 78d15e1aad3b..219fcf8ac321 100644 --- a/gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c +++ b/gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c @@ -10,7 +10,7 @@ int main() { } /* { dg-output "heap-use-after-free.*(\n|\r\n|\r)" } */ -/* { dg-output " #0 \[^\n\r]*(in _*(interceptor_|)free|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ +/* { dg-output " #0 \[^\n\r]*(in _*(interceptor_|wrap_)free|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #1 \[^\n\r]*(in _*main (\[^\n\r]*sanity-check-pure-c-1.c:8|\[^\n\r]*:0)|\[(\]).*(\n|\r\n|\r)" } */ -/* { dg-output " #0 \[^\n\r]*(in _*(interceptor_|)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ +/* { dg-output " #0 \[^\n\r]*(in _*(interceptor_|wrap_)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */ /* { dg-output " #1 \[^\n\r]*(in _*main (\[^\n\r]*sanity-check-pure-c-1.c:7|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */