diff options
Diffstat (limited to 'runtime/oat_quick_method_header.h')
-rw-r--r-- | runtime/oat_quick_method_header.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h index 3625b9e7a7..4443255f64 100644 --- a/runtime/oat_quick_method_header.h +++ b/runtime/oat_quick_method_header.h @@ -136,8 +136,8 @@ class PACKED(4) OatQuickMethodHeader { bool Contains(uintptr_t pc) const { uintptr_t code_start = reinterpret_cast<uintptr_t>(code_); - static_assert(kRuntimeISA != kThumb2, "kThumb2 cannot be a runtime ISA"); - if (kRuntimeISA == kArm) { + static_assert(kRuntimeISA != InstructionSet::kThumb2, "kThumb2 cannot be a runtime ISA"); + if (kRuntimeISA == InstructionSet::kArm) { // On Thumb-2, the pc is offset by one. code_start++; } @@ -149,8 +149,8 @@ class PACKED(4) OatQuickMethodHeader { // (not `kThumb2`), *but* we always generate code for the Thumb-2 // instruction set anyway. Thumb-2 requires the entrypoint to be of // offset 1. - static_assert(kRuntimeISA != kThumb2, "kThumb2 cannot be a runtime ISA"); - return (kRuntimeISA == kArm) + static_assert(kRuntimeISA != InstructionSet::kThumb2, "kThumb2 cannot be a runtime ISA"); + return (kRuntimeISA == InstructionSet::kArm) ? reinterpret_cast<uint8_t*>(reinterpret_cast<uintptr_t>(code_) | 1) : code_; } |