diff options
| author | 2018-09-21 15:34:55 +0000 | |
|---|---|---|
| committer | 2018-09-21 15:34:55 +0000 | |
| commit | 7ee67be05356a74bc993b7afa67439cb2f6c6a57 (patch) | |
| tree | 71bdc2c097765b5fc909b8fbe0de5bc2a7da6204 | |
| parent | d75a268d2efdcc063d483c965c4899875aaf42b1 (diff) | |
| parent | 5ec6f36d4688e70c652882bff8c6a3c060ccc83e (diff) | |
Merge "ART: Fix incorrect dispatch"
| -rw-r--r-- | runtime/mirror/var_handle.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/var_handle.cc b/runtime/mirror/var_handle.cc index 864e1eab73..903826a047 100644 --- a/runtime/mirror/var_handle.cc +++ b/runtime/mirror/var_handle.cc @@ -1033,7 +1033,7 @@ bool FieldAccessor<ObjPtr<Object>>::Dispatch(VarHandle::AccessMode access_mode, CASMode::kStrong, std::memory_order_seq_cst); } - StoreResult(cas_result, result); + StoreResult(static_cast<uint8_t>(cas_result), result); break; } case VarHandle::AccessMode::kWeakCompareAndSet: @@ -1058,7 +1058,7 @@ bool FieldAccessor<ObjPtr<Object>>::Dispatch(VarHandle::AccessMode access_mode, CASMode::kWeak, std::memory_order_seq_cst); } - StoreResult(cas_result, result); + StoreResult(static_cast<uint8_t>(cas_result), result); break; } case VarHandle::AccessMode::kCompareAndExchange: |