diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-11-02 12:48:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-02 12:48:46 +0000 |
| commit | b1ee0f6adc59e7ffe9d967b3d2d473aac3ec44f7 (patch) | |
| tree | 4709dfe2f99871909a16ad7ac2bc6c9e068aec95 /compiler/optimizing/codegen_test_utils.h | |
| parent | d4bda4f0b39bf5a727243de909e2e02c9282bf66 (diff) | |
| parent | 2043646a60b17ca1215f5c9639e5cac33ff533ca (diff) | |
Merge "ART: Make InstructionSet an enum class and add kLast." am: af52bcb753 am: 0ec3ad08fb
am: 2043646a60
Change-Id: I480f726eb094dd3fe4ce029dd0972fadf783b0b2
Diffstat (limited to 'compiler/optimizing/codegen_test_utils.h')
| -rw-r--r-- | compiler/optimizing/codegen_test_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h index bcbcc12349a..c41c290c8b4 100644 --- a/compiler/optimizing/codegen_test_utils.h +++ b/compiler/optimizing/codegen_test_utils.h @@ -207,7 +207,7 @@ class InternalCodeAllocator : public CodeAllocator { static bool CanExecuteOnHardware(InstructionSet target_isa) { return (target_isa == kRuntimeISA) // Handle the special case of ARM, with two instructions sets (ARM32 and Thumb-2). - || (kRuntimeISA == kArm && target_isa == kThumb2); + || (kRuntimeISA == InstructionSet::kArm && target_isa == InstructionSet::kThumb2); } static bool CanExecute(InstructionSet target_isa) { @@ -271,7 +271,7 @@ static void Run(const InternalCodeAllocator& allocator, typedef Expected (*fptr)(); CommonCompilerTest::MakeExecutable(allocator.GetMemory(), allocator.GetSize()); fptr f = reinterpret_cast<fptr>(allocator.GetMemory()); - if (target_isa == kThumb2) { + if (target_isa == InstructionSet::kThumb2) { // For thumb we need the bottom bit set. f = reinterpret_cast<fptr>(reinterpret_cast<uintptr_t>(f) + 1); } |