diff options
| author | 2017-08-09 19:55:26 +0000 | |
|---|---|---|
| committer | 2017-08-09 19:55:26 +0000 | |
| commit | ac50d97b1bf63ff2e0d813774f52499b2da78f6b (patch) | |
| tree | d29b23b37900a7bf4184ce34ac1fd6286fb69aaa /runtime/fault_handler.cc | |
| parent | 3ae12d56a99fe605c6ffb8236de18677bd622567 (diff) | |
| parent | cc55e1dcdd2ec669c635420468b3cc4c99740f0a (diff) | |
Merge "Don't use fences to implement volatiles"
Diffstat (limited to 'runtime/fault_handler.cc')
| -rw-r--r-- | runtime/fault_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index fd0cd5f0b2..f86329947d 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -79,8 +79,8 @@ static mirror::Class* SafeGetDeclaringClass(ArtMethod* method) static mirror::Class* SafeGetClass(mirror::Object* obj) REQUIRES_SHARED(Locks::mutator_lock_) { char* obj_cls = reinterpret_cast<char*>(obj) + mirror::Object::ClassOffset().SizeValue(); - mirror::HeapReference<mirror::Class> cls = - mirror::HeapReference<mirror::Class>::FromMirrorPtr(nullptr); + mirror::CompressedReference<mirror::Class> cls = + mirror::CompressedReference<mirror::Class>::FromMirrorPtr(nullptr); ssize_t rc = SafeCopy(&cls, obj_cls, sizeof(cls)); CHECK_NE(-1, rc); |