Revert "[libFuzzer] Use custom allocators for STL containers in libFuzzer"

This reverts commit 3539efc2f2218dba2bcbd645d0fe276f2b5cf588.

llvm-svn: 311831

1 files changed, 2 insertions, 15 deletions

diff --git a/compiler-rt/lib/fuzzer/FuzzerDefs.h b/compiler-rt/lib/fuzzer/FuzzerDefs.h
index 5e5d3afa2f2..bbb44514aab 100644
--- a/compiler-rt/lib/fuzzer/FuzzerDefs.h
+++ b/compiler-rt/lib/fuzzer/FuzzerDefs.h
@@ -18,8 +18,6 @@
 #include <cstring>
 #include <string>
 #include <vector>
-#include <set>
-#include <memory>
 
 // Platform detection.
 #ifdef __linux__
@@ -104,19 +102,8 @@ struct ExternalFunctions;
 // Global interface to functions that may or may not be available.
 extern ExternalFunctions *EF;
 
-// We are using a custom allocator to give a different symbol name to STL
-// containers in order to avoid ODR violations.
-template<typename T>
-class fuzzer_allocator: public std::allocator<T> {};
-
-template<typename T>
-using vector = std::vector<T, fuzzer_allocator<T>>;
-
-template<typename T>
-using set = std::set<T, std::less<T>, fuzzer_allocator<T>>;
-
-typedef fuzzer::vector<uint8_t> Unit;
-typedef fuzzer::vector<Unit> UnitVector;
+typedef std::vector<uint8_t> Unit;
+typedef std::vector<Unit> UnitVector;
 typedef int (*UserCallback)(const uint8_t *Data, size_t Size);
 
 int FuzzerDriver(int *argc, char ***argv, UserCallback Callback);