diff options
| author | 2017-11-01 14:35:42 +0000 | |
|---|---|---|
| committer | 2017-11-02 10:11:02 +0000 | |
| commit | 33bff25bcd7a02d35c54f63740eadb1a4833fc92 (patch) | |
| tree | 553db4f60878acf2a0fa7036a739d406df9a29b7 /compiler/debug/dwarf/dwarf_test.h | |
| parent | 321b3ca9a36d769283c64d4bdee0798db80af524 (diff) | |
ART: Make InstructionSet an enum class and add kLast.
Adding InstructionSet::kLast shall make it easier to encode
the InstructionSet in fewer bits using BitField<>. However,
introducing `kLast` into the `art` namespace is not a good
idea, so we change the InstructionSet to an enum class.
This also uncovered a case of InstructionSet::kNone being
erroneously used instead of vixl32::Condition::None(), so
it's good to remove `kNone` from the `art` namespace.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I6fa6168dfba4ed6da86d021a69c80224f09997a6
Diffstat (limited to 'compiler/debug/dwarf/dwarf_test.h')
| -rw-r--r-- | compiler/debug/dwarf/dwarf_test.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/debug/dwarf/dwarf_test.h b/compiler/debug/dwarf/dwarf_test.h index b30ff143d3..5405759c1f 100644 --- a/compiler/debug/dwarf/dwarf_test.h +++ b/compiler/debug/dwarf/dwarf_test.h @@ -60,7 +60,8 @@ class DwarfTest : public CommonRuntimeTest { template<typename ElfTypes> std::vector<std::string> Objdump(const char* args) { // Write simple elf file with just the DWARF sections. - InstructionSet isa = (sizeof(typename ElfTypes::Addr) == 8) ? kX86_64 : kX86; + InstructionSet isa = + (sizeof(typename ElfTypes::Addr) == 8) ? InstructionSet::kX86_64 : InstructionSet::kX86; ScratchFile file; linker::FileOutputStream output_stream(file.GetFile()); linker::ElfBuilder<ElfTypes> builder(isa, nullptr, &output_stream); |