diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-05 07:20:45 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-05 07:20:45 +0000 |
| commit | efeeff392bab5bb54d42ebb763df419938c7cc69 (patch) | |
| tree | b79aa6e99e01fcba51bfb8ef37aa441a35594879 /compiler/optimizing/codegen_test_utils.h | |
| parent | d799d1986eee62e862ecb1264bc24ef22444fff0 (diff) | |
| parent | 3bc869ec78f2770b988b3252b29543cded573e0f (diff) | |
Snap for 4434599 from 3bc869ec78f2770b988b3252b29543cded573e0f to pi-release
Change-Id: If677236f459afa699800dc0ebd1547112d8761d0
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); } |