summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-21 21:56:17 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-21 21:56:17 +0000
commit2717798938e785eaa2840b5091382e44100f4e3e (patch)
tree82c7a9d5f317f7c5e6d32d9b88545ea063f57e09
parent3150a5e95c99a4a437368fb66c007fd5a7828d43 (diff)
parentc923accd060f9bad940ddf789359708b4f2b1653 (diff)
downloadgwp_asan-2717798938e785eaa2840b5091382e44100f4e3e.tar.gz
Snap for 10843824 from c923accd060f9bad940ddf789359708b4f2b1653 to 24Q1-release
Change-Id: I10c503bb3a6d47d332e550afc6486b70e2b053a2
-rw-r--r--gwp_asan/guarded_pool_allocator.h9
-rw-r--r--gwp_asan/tests/harness.cpp2
2 files changed, 11 insertions, 0 deletions
diff --git a/gwp_asan/guarded_pool_allocator.h b/gwp_asan/guarded_pool_allocator.h
index de07b67..a02a353 100644
--- a/gwp_asan/guarded_pool_allocator.h
+++ b/gwp_asan/guarded_pool_allocator.h
@@ -20,6 +20,15 @@
#include <stddef.h>
#include <stdint.h>
// IWYU pragma: no_include <__stddef_max_align_t.h>
+// IWYU pragma: no_include <__stddef_null.h>
+// IWYU pragma: no_include <__stddef_nullptr_t.h>
+// IWYU pragma: no_include <__stddef_offsetof.h>
+// IWYU pragma: no_include <__stddef_ptrdiff_t.h>
+// IWYU pragma: no_include <__stddef_rsize_t.h>
+// IWYU pragma: no_include <__stddef_size_t.h>
+// IWYU pragma: no_include <__stddef_unreachable.h>
+// IWYU pragma: no_include <__stddef_wchar_t.h>
+// IWYU pragma: no_include <__stddef_wint_t.h>
namespace gwp_asan {
// This class is the primary implementation of the allocator portion of GWP-
diff --git a/gwp_asan/tests/harness.cpp b/gwp_asan/tests/harness.cpp
index 4633d3e..7ed408b 100644
--- a/gwp_asan/tests/harness.cpp
+++ b/gwp_asan/tests/harness.cpp
@@ -55,7 +55,9 @@ INSTANTIATE_TEST_SUITE_P(RecoverableAndNonRecoverableTests,
#else
INSTANTIATE_TEST_SUITE_P(RecoverableTests, BacktraceGuardedPoolAllocator,
/* Recoverable */ testing::Values(true));
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BacktraceGuardedPoolAllocator);
INSTANTIATE_TEST_SUITE_P(RecoverableAndNonRecoverableTests,
BacktraceGuardedPoolAllocatorDeathTest,
/* Recoverable */ testing::Bool());
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BacktraceGuardedPoolAllocatorDeathTest);
#endif