diff options
| author | George Karpenkov <ekarpenkov@apple.com> | 2017-08-27 23:20:09 +0000 |
|---|---|---|
| committer | George Karpenkov <ekarpenkov@apple.com> | 2017-08-27 23:20:09 +0000 |
| commit | bebcbfb46dc7c89d32eb11254123211f87087dca (patch) | |
| tree | ac7ca788e2445caf8b5ff0a60eab3f220a126975 /compiler-rt/lib/fuzzer/FuzzerInternal.h | |
| parent | 41395022a32a29d8bab5af989a59af4cb83b1191 (diff) | |
| download | bcm5719-llvm-bebcbfb46dc7c89d32eb11254123211f87087dca.tar.gz bcm5719-llvm-bebcbfb46dc7c89d32eb11254123211f87087dca.zip | |
[libFuzzer] Use custom allocators for STL containers in libFuzzer.
Avoids ODR violations causing spurious ASAN warnings.
Differential Revision: https://reviews.llvm.org/D37086
llvm-svn: 311866
Diffstat (limited to 'compiler-rt/lib/fuzzer/FuzzerInternal.h')
| -rw-r--r-- | compiler-rt/lib/fuzzer/FuzzerInternal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler-rt/lib/fuzzer/FuzzerInternal.h b/compiler-rt/lib/fuzzer/FuzzerInternal.h index 1d68c01908f..567c6e6a2de 100644 --- a/compiler-rt/lib/fuzzer/FuzzerInternal.h +++ b/compiler-rt/lib/fuzzer/FuzzerInternal.h @@ -69,9 +69,9 @@ public: InputInfo *II = nullptr); // Merge Corpora[1:] into Corpora[0]. - void Merge(const std::vector<std::string> &Corpora); - void CrashResistantMerge(const std::vector<std::string> &Args, - const std::vector<std::string> &Corpora, + void Merge(const Vector<std::string> &Corpora); + void CrashResistantMerge(const Vector<std::string> &Args, + const Vector<std::string> &Corpora, const char *CoverageSummaryInputPathOrNull, const char *CoverageSummaryOutputPathOrNull); void CrashResistantMergeInternalStep(const std::string &ControlFilePath); @@ -139,7 +139,7 @@ private: size_t MaxMutationLen = 0; size_t TmpMaxMutationLen = 0; - std::vector<uint32_t> UniqFeatureSetTmp; + Vector<uint32_t> UniqFeatureSetTmp; // Need to know our own thread. static thread_local bool IsMyThread; |
