diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-01 21:25:41 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-01 21:25:41 -0700 |
| commit | 6e83c172f385cb45dd13bbcf41d2df8e410828c6 (patch) | |
| tree | e2c2f4ee55cfd623ea9d363286b380213748e1e8 /runtime/mirror/array-inl.h | |
| parent | 9a16f222cdf40e68b084316b6e768c14d4b9e020 (diff) | |
| download | art-6e83c172f385cb45dd13bbcf41d2df8e410828c6.tar.gz art-6e83c172f385cb45dd13bbcf41d2df8e410828c6.tar.bz2 art-6e83c172f385cb45dd13bbcf41d2df8e410828c6.zip | |
Replace the bool kDoReadBarrier template parameter with an enum.
Fix one kDoReadBarrier/kIsVolatile mixup in an Object::GetFieldObject
call.
Bug: 12687968
Change-Id: I896b1137b21a20c0504abd2bf3fe6f83805f3300
Diffstat (limited to 'runtime/mirror/array-inl.h')
| -rw-r--r-- | runtime/mirror/array-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h index bc8d34815f..65799cdad8 100644 --- a/runtime/mirror/array-inl.h +++ b/runtime/mirror/array-inl.h @@ -27,11 +27,11 @@ namespace art { namespace mirror { -template<VerifyObjectFlags kVerifyFlags, bool kDoReadBarrier> +template<VerifyObjectFlags kVerifyFlags, ReadBarrierOption kReadBarrierOption> inline size_t Array::SizeOf() { // This is safe from overflow because the array was already allocated, so we know it's sane. size_t component_size = - GetClass<kVerifyFlags, kDoReadBarrier>()->template GetComponentSize<kDoReadBarrier>(); + GetClass<kVerifyFlags, kReadBarrierOption>()->template GetComponentSize<kReadBarrierOption>(); // Don't need to check this since we already check this in GetClass. int32_t component_count = GetLength<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>(); |