diff options
Diffstat (limited to 'runtime/mirror/object-inl.h')
| -rw-r--r-- | runtime/mirror/object-inl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h index 478cc36..484c21a 100644 --- a/runtime/mirror/object-inl.h +++ b/runtime/mirror/object-inl.h @@ -323,9 +323,9 @@ inline size_t Object::SizeOf() { size_t result; constexpr auto kNewFlags = static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis); if (IsArrayInstance<kVerifyFlags>()) { - result = AsArray<kNewFlags>()->SizeOf<>(); + result = AsArray<kNewFlags>()->template SizeOf<kNewFlags>(); } else if (IsClass<kNewFlags>()) { - result = AsClass<kNewFlags>()->SizeOf<kNewFlags>(); + result = AsClass<kNewFlags>()->template SizeOf<kNewFlags>(); } else { result = GetClass<kNewFlags>()->GetObjectSize(); } @@ -485,7 +485,6 @@ inline void Object::SetFieldObjectWithoutWriteBarrier(MemberOffset field_offset, if (kVerifyFlags & kVerifyWrites) { VerifyObject(new_value); } - HeapReference<Object> objref(HeapReference<Object>::FromMirrorPtr(new_value)); byte* raw_addr = reinterpret_cast<byte*>(this) + field_offset.Int32Value(); HeapReference<Object>* objref_addr = reinterpret_cast<HeapReference<Object>*>(raw_addr); if (UNLIKELY(is_volatile)) { |