diff options
author | Kostya Serebryany <kcc@google.com> | 2017-02-07 23:13:10 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@google.com> | 2017-02-07 23:13:10 +0000 |
commit | 95db1de9d8da0b4caddb3ad5c35959118864f58b (patch) | |
tree | fd1417912f2bd52b7fa7afe311fb2af52c26571b | |
parent | 38bdbd9419e160decfafa51ca975aba187fdde00 (diff) |
[asan] replace std::random_shuffle with std::shuffle in tests since std::random_shuffle is being deprecated in C++17; NFC
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@294370 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/sanitizer_common/tests/sanitizer_allocator_test.cc | 4 | ||||
-rw-r--r-- | lib/sanitizer_common/tests/sanitizer_bitvector_test.cc | 4 | ||||
-rw-r--r-- | test/asan/TestCases/Linux/release_to_os_test.cc | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/lib/sanitizer_common/tests/sanitizer_allocator_test.cc index 8df5efda6..e14517fca 100644 --- a/lib/sanitizer_common/tests/sanitizer_allocator_test.cc +++ b/lib/sanitizer_common/tests/sanitizer_allocator_test.cc @@ -23,6 +23,7 @@ #include <stdlib.h> #include <algorithm> #include <vector> +#include <random> #include <set> using namespace __sanitizer; @@ -539,6 +540,7 @@ void TestCombinedAllocator() { Allocator; Allocator *a = new Allocator; a->Init(/* may_return_null */ true, kReleaseToOSIntervalNever); + std::mt19937 r; AllocatorCache cache; memset(&cache, 0, sizeof(cache)); @@ -570,7 +572,7 @@ void TestCombinedAllocator() { allocated.push_back(x); } - random_shuffle(allocated.begin(), allocated.end()); + std::shuffle(allocated.begin(), allocated.end(), r); for (uptr i = 0; i < kNumAllocs; i++) { void *x = allocated[i]; diff --git a/lib/sanitizer_common/tests/sanitizer_bitvector_test.cc b/lib/sanitizer_common/tests/sanitizer_bitvector_test.cc index 706b4c589..dec5459b2 100644 --- a/lib/sanitizer_common/tests/sanitizer_bitvector_test.cc +++ b/lib/sanitizer_common/tests/sanitizer_bitvector_test.cc @@ -19,6 +19,7 @@ #include <algorithm> #include <vector> +#include <random> #include <set> using namespace __sanitizer; @@ -75,6 +76,7 @@ void Print(const set<uptr> &s) { template <class BV> void TestBitVector(uptr expected_size) { + std::mt19937 r; BV bv, bv1, t_bv; EXPECT_EQ(expected_size, BV::kSize); bv.clear(); @@ -112,7 +114,7 @@ void TestBitVector(uptr expected_size) { for (uptr it = 0; it < 30; it++) { // iota for (size_t j = 0; j < bits.size(); j++) bits[j] = j; - random_shuffle(bits.begin(), bits.end()); + std::shuffle(bits.begin(), bits.end(), r); set<uptr> s, s1, t_s; bv.clear(); bv1.clear(); diff --git a/test/asan/TestCases/Linux/release_to_os_test.cc b/test/asan/TestCases/Linux/release_to_os_test.cc index 26402167d..c85bcbb7f 100644 --- a/test/asan/TestCases/Linux/release_to_os_test.cc +++ b/test/asan/TestCases/Linux/release_to_os_test.cc @@ -11,6 +11,7 @@ #include <algorithm> #include <stdint.h> #include <assert.h> +#include <random> #include <sanitizer/asan_interface.h> @@ -19,9 +20,10 @@ void MallocReleaseStress() { const size_t kAllocSize = 100; const size_t kNumIter = 100; uintptr_t *chunks[kNumChunks] = {0}; + std::mt19937 r; for (size_t iter = 0; iter < kNumIter; iter++) { - std::random_shuffle(chunks, chunks + kNumChunks); + std::shuffle(chunks, chunks + kNumChunks, r); size_t to_replace = rand() % kNumChunks; for (size_t i = 0; i < kNumChunks; i++) { if (chunks[i]) |