diff options
| author | 2016-02-01 16:08:15 -0800 | |
|---|---|---|
| committer | 2016-02-01 16:19:59 -0800 | |
| commit | e7f75f35371cf32954d94f9bb10fc96924f7edb4 (patch) | |
| tree | 4968ea7f5dd02786e50bf4dc1873c30ff37cde8a /runtime/fault_handler.cc | |
| parent | c3cf1d2e35a45bd2e2c60fbc9c2a1a6a56dfc529 (diff) | |
Add read barrier option to UpdateEntrypoints
Also call this without read barrier for image relocation.
Bug: 26786304
Change-Id: Ia718c1491b54cadb7283c62afc1eb9031a15b4ef
Diffstat (limited to 'runtime/fault_handler.cc')
| -rw-r--r-- | runtime/fault_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index 5345b890a1..5c5abeb0a6 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -349,7 +349,7 @@ bool FaultManager::IsInGeneratedCode(siginfo_t* siginfo, void* context, bool che // Check that the class pointer inside the object is not null and is aligned. // TODO: Method might be not a heap address, and GetClass could fault. // No read barrier because method_obj may not be a real object. - mirror::Class* cls = method_obj->GetDeclaringClassNoBarrier(); + mirror::Class* cls = method_obj->GetDeclaringClassUnchecked<kWithoutReadBarrier>(); if (cls == nullptr) { VLOG(signals) << "not a class"; return false; |