diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-06-20 14:30:08 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-06-21 13:46:50 +0100 |
| commit | 54159c6c6fe529a55ef3d15a3c8418362d5a43fb (patch) | |
| tree | 2ec461de8ec15383134f4c6e209f4b8a33854277 /compiler/common_compiler_test.h | |
| parent | 44217b253bf4e5990de7051129ecda34f94d7f25 (diff) | |
Use HashSet<std::string> instead of unordered_set<>.
Change the default parameters for HashSet<std::string> to
allow passing StringPiece as a key, avoiding an unnecessary
allocation. Use the HashSet<std::string> instead of
std::unordered_set<std::string>. Rename HashSet<> functions
that mirror std::unordered_multiset<> to lower-case.
Fix CompilerDriver::LoadImageClasses() to avoid using
invalidated iterator.
Test: m test-art-host-gtest
Test: testrunner.py --host
Change-Id: I7f8b82ee0b07befc5a0ee1c420b08a2068ad931e
Diffstat (limited to 'compiler/common_compiler_test.h')
| -rw-r--r-- | compiler/common_compiler_test.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 39c8bd817b..46b59a35be 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -18,9 +18,9 @@ #define ART_COMPILER_COMMON_COMPILER_TEST_H_ #include <list> -#include <unordered_set> #include <vector> +#include "base/hash_set.h" #include "common_runtime_test.h" #include "compiler.h" #include "oat_file.h" @@ -63,9 +63,8 @@ class CommonCompilerTest : public CommonRuntimeTest { InstructionSet GetInstructionSet() const; - // Get the set of image classes given to the compiler-driver in SetUp. Note: the compiler - // driver assumes ownership of the set, so the test should properly release the set. - virtual std::unordered_set<std::string>* GetImageClasses(); + // Get the set of image classes given to the compiler-driver in SetUp. + virtual std::unique_ptr<HashSet<std::string>> GetImageClasses(); virtual ProfileCompilationInfo* GetProfileCompilationInfo(); |