asan.h (asan_intercepted_p): Handle BUILT_IN_STRCSPN, BUILT_IN_STRPBRK, BUILT_IN_STRS...

gcc/

	* asan.h (asan_intercepted_p): Handle BUILT_IN_STRCSPN,
	BUILT_IN_STRPBRK, BUILT_IN_STRSPN and BUILT_IN_STRSTR.

gcc/testsuite/

	* c-c++-common/asan/default_options.h: New file.
	* c-c++-common/asan/strcasestr-1.c: New test.
	* c-c++-common/asan/strcasestr-2.c: Likewise.
	* c-c++-common/asan/strcspn-1.c: Likewise.
	* c-c++-common/asan/strcspn-2.c: Likewise.
	* c-c++-common/asan/strpbrk-1.c: Likewise.
	* c-c++-common/asan/strpbrk-2.c: Likewise.
	* c-c++-common/asan/strspn-1.c: Likewise.
	* c-c++-common/asan/strspn-2.c: Likewise.
	* c-c++-common/asan/strstr-1.c: Likewise.
	* c-c++-common/asan/strstr-2.c: Likewise.
	* c-c++-common/asan/halt_on_error_suppress_equal_pcs-1.c: Likewise.

From-SVN: r241984

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab2dd5e209f6a5452384693dd08a2defcec72b9a..e175a60bb3878e5bc423b26d3cab22c56a1ddff3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-09  Maxim Ostapenko  <m.ostapenko@samsung.com>
+
+       * asan.h (asan_intercepted_p): Handle BUILT_IN_STRCSPN,
+       BUILT_IN_STRPBRK, BUILT_IN_STRSPN and BUILT_IN_STRSTR.
+
 2016-11-09  Maxim Ostapenko  <m.ostapenko@samsung.com>
 
        * asan.h (ASAN_STACK_MAGIC_PARTIAL): Remove.

diff --git a/gcc/asan.h b/gcc/asan.h
index f63a108dc87eb0919f6dd4ca87e46358fdc3bf67..9cf5904618b09d2076f26122cbfa24f803bb9e29 100644 (file)
--- a/gcc/asan.h
+++ b/gcc/asan.h
@@ -120,6 +120,10 @@ asan_intercepted_p (enum built_in_function fcode)
         || fcode == BUILT_IN_STRNCASECMP
         || fcode == BUILT_IN_STRNCAT
         || fcode == BUILT_IN_STRNCMP
+        || fcode == BUILT_IN_STRCSPN
+        || fcode == BUILT_IN_STRPBRK
+        || fcode == BUILT_IN_STRSPN
+        || fcode == BUILT_IN_STRSTR
         || fcode == BUILT_IN_STRNCPY;
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ec91ad60e2c49699496c1349bb7c1139f5c36ea5..d2621864f344b1e781823cc9d635b466f370c093 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2016-11-09  Maxim Ostapenko  <m.ostapenko@samsung.com>
+
+       * c-c++-common/asan/default_options.h: New file.
+       * c-c++-common/asan/strcasestr-1.c: New test.
+       * c-c++-common/asan/strcasestr-2.c: Likewise.
+       * c-c++-common/asan/strcspn-1.c: Likewise.
+       * c-c++-common/asan/strcspn-2.c: Likewise.
+       * c-c++-common/asan/strpbrk-1.c: Likewise.
+       * c-c++-common/asan/strpbrk-2.c: Likewise.
+       * c-c++-common/asan/strspn-1.c: Likewise.
+       * c-c++-common/asan/strspn-2.c: Likewise.
+       * c-c++-common/asan/strstr-1.c: Likewise.
+       * c-c++-common/asan/strstr-2.c: Likewise.
+       * c-c++-common/asan/halt_on_error_suppress_equal_pcs-1.c: Likewise.
+
 2016-11-09  Maxim Ostapenko  <m.ostapenko@samsung.com>
 
        * c-c++-common/asan/null-deref-1.c: Adjust testcase.