diff options
Diffstat (limited to 'runtime/fault_handler.cc')
| -rw-r--r-- | runtime/fault_handler.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index 762f061ce2..5f915663c1 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -320,7 +320,7 @@ bool FaultManager::IsInGeneratedCode(siginfo_t* siginfo, void* context, bool che return false; } - ArtMethod* method_obj = 0; + ArtMethod* method_obj = nullptr; uintptr_t return_pc = 0; uintptr_t sp = 0; @@ -331,7 +331,9 @@ bool FaultManager::IsInGeneratedCode(siginfo_t* siginfo, void* context, bool che // If we don't have a potential method, we're outta here. VLOG(signals) << "potential method: " << method_obj; // TODO: Check linear alloc and image. - if (method_obj == 0 || !IsAligned<kObjectAlignment>(method_obj)) { + DCHECK(IsAligned<sizeof(void*)>(ArtMethod::ObjectSize(sizeof(void*)))) + << "ArtMethod is not pointer aligned"; + if (method_obj == nullptr || !IsAligned<sizeof(void*)>(method_obj)) { VLOG(signals) << "no method"; return false; } |