diff options
| author | Andreas Gampe <agampe@google.com> | 2016-08-29 17:43:45 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-09-08 10:13:47 -0700 |
| commit | bda1d606f2d31086874b68edd9254e3817d8049c (patch) | |
| tree | db07417935fe72e99c3da60152e13f0620c7d8d7 /runtime/utils/dex_cache_arrays_layout-inl.h | |
| parent | d14d515df39cd963179088b8721768f9645243aa (diff) | |
ART: Detach libart-disassembler from libart
Some more intrusive changes than I would have liked, as long as
ART logging is different from libbase logging.
Fix up some includes.
Bug: 15436106
Bug: 31338270
Test: m test-art-host
Change-Id: I9fbe4b85b2d74e079a4981f3aec9af63b163a461
Diffstat (limited to 'runtime/utils/dex_cache_arrays_layout-inl.h')
| -rw-r--r-- | runtime/utils/dex_cache_arrays_layout-inl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/utils/dex_cache_arrays_layout-inl.h b/runtime/utils/dex_cache_arrays_layout-inl.h index 4c63156939..a85d0332c3 100644 --- a/runtime/utils/dex_cache_arrays_layout-inl.h +++ b/runtime/utils/dex_cache_arrays_layout-inl.h @@ -55,7 +55,8 @@ inline constexpr size_t DexCacheArraysLayout::Alignment() { template <typename T> static constexpr PointerSize GcRootAsPointerSize() { - return ConvertToPointerSize(sizeof(GcRoot<T>)); + static_assert(sizeof(GcRoot<T>) == 4U, "Unexpected GcRoot size"); + return PointerSize::k32; } inline size_t DexCacheArraysLayout::TypeOffset(uint32_t type_idx) const { |