diff options
| author | George Karpenkov <ekarpenkov@apple.com> | 2017-08-26 17:17:37 +0000 |
|---|---|---|
| committer | George Karpenkov <ekarpenkov@apple.com> | 2017-08-26 17:17:37 +0000 |
| commit | 740573d1259e500ea7f323d213d476784c305372 (patch) | |
| tree | e61e170796894865237d24a8a1f98cfa249892a8 /lib/fuzzer/FuzzerMerge.h | |
| parent | 27fb0f25514625a8adb42338015e635bd6ef0626 (diff) | |
| download | compiler-rt-740573d1259e500ea7f323d213d476784c305372.tar.gz | |
[libFuzzer] Use custom allocators for STL containers in libFuzzer
Avoids ODR violations causing spurious ASAN container overflow warnings.
Differential Revision: https://reviews.llvm.org/D37086
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311830 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/FuzzerMerge.h')
| -rw-r--r-- | lib/fuzzer/FuzzerMerge.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fuzzer/FuzzerMerge.h b/lib/fuzzer/FuzzerMerge.h index dd4c37b6e..dd0ad8db1 100644 --- a/lib/fuzzer/FuzzerMerge.h +++ b/lib/fuzzer/FuzzerMerge.h @@ -52,11 +52,11 @@ namespace fuzzer { struct MergeFileInfo { std::string Name; size_t Size = 0; - std::vector<uint32_t> Features; + fuzzer::vector<uint32_t> Features; }; struct Merger { - std::vector<MergeFileInfo> Files; + fuzzer::vector<MergeFileInfo> Files; size_t NumFilesInFirstCorpus = 0; size_t FirstNotProcessedFile = 0; std::string LastFailure; @@ -67,8 +67,8 @@ struct Merger { void PrintSummary(std::ostream &OS); std::set<uint32_t> ParseSummary(std::istream &IS); size_t Merge(const std::set<uint32_t> &InitialFeatures, - std::vector<std::string> *NewFiles); - size_t Merge(std::vector<std::string> *NewFiles) { + fuzzer::vector<std::string> *NewFiles); + size_t Merge(fuzzer::vector<std::string> *NewFiles) { return Merge(std::set<uint32_t>{}, NewFiles); } size_t ApproximateMemoryConsumption() const; |