diff options
| -rw-r--r-- | compiler-rt/lib/asan/tests/asan_test.cc | 13 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/tests/asan_test_utils.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/compiler-rt/lib/asan/tests/asan_test.cc b/compiler-rt/lib/asan/tests/asan_test.cc index 9ab4cb0d8a4..4db80339804 100644 --- a/compiler-rt/lib/asan/tests/asan_test.cc +++ b/compiler-rt/lib/asan/tests/asan_test.cc @@ -452,12 +452,14 @@ NOINLINE void SizedStackTest() { for (size_t i = 0; i < kSize; i++) A[i] = i; EXPECT_DEATH(A[-1] = 0, ""); - EXPECT_DEATH(A[-20] = 0, ""); - EXPECT_DEATH(A[-31] = 0, ""); + EXPECT_DEATH(A[-5] = 0, ""); + if (kSize > 16) + EXPECT_DEATH(A[-31] = 0, ""); EXPECT_DEATH(A[kSize] = 0, ""); EXPECT_DEATH(A[kSize + 1] = 0, ""); - EXPECT_DEATH(A[kSize + 10] = 0, ""); - EXPECT_DEATH(A[kSize + 31] = 0, ""); + EXPECT_DEATH(A[kSize + 5] = 0, ""); + if (kSize > 16) + EXPECT_DEATH(A[kSize + 31] = 0, ""); } TEST(AddressSanitizer, SimpleStackTest) { @@ -669,7 +671,8 @@ TEST(AddressSanitizer, ThreadStackReuseTest) { PTHREAD_JOIN(t, 0); } -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i686__) || defined(__x86_64__) +#include <emmintrin.h> TEST(AddressSanitizer, Store128Test) { char *a = Ident((char*)malloc(Ident(12))); char *p = a; diff --git a/compiler-rt/lib/asan/tests/asan_test_utils.h b/compiler-rt/lib/asan/tests/asan_test_utils.h index 403773180c2..b6bf6b82066 100644 --- a/compiler-rt/lib/asan/tests/asan_test_utils.h +++ b/compiler-rt/lib/asan/tests/asan_test_utils.h @@ -41,10 +41,6 @@ #include <unistd.h> #endif -#if defined(__i386__) || defined(__x86_64__) -#include <emmintrin.h> -#endif - #ifndef __APPLE__ #include <malloc.h> #endif |
