diff options
Diffstat (limited to 'runtime/imtable.h')
| -rw-r--r-- | runtime/imtable.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/runtime/imtable.h b/runtime/imtable.h index 51faf70d14..2416621f49 100644 --- a/runtime/imtable.h +++ b/runtime/imtable.h @@ -32,10 +32,10 @@ class ImTable { // (non-marker) interfaces. static constexpr size_t kSize = IMT_SIZE; - ArtMethod* Get(size_t index, size_t pointer_size) { + ArtMethod* Get(size_t index, PointerSize pointer_size) { DCHECK_LT(index, kSize); uint8_t* ptr = reinterpret_cast<uint8_t*>(this) + OffsetOfElement(index, pointer_size); - if (pointer_size == 4) { + if (pointer_size == PointerSize::k32) { uint32_t value = *reinterpret_cast<uint32_t*>(ptr); return reinterpret_cast<ArtMethod*>(value); } else { @@ -44,10 +44,10 @@ class ImTable { } } - void Set(size_t index, ArtMethod* method, size_t pointer_size) { + void Set(size_t index, ArtMethod* method, PointerSize pointer_size) { DCHECK_LT(index, kSize); uint8_t* ptr = reinterpret_cast<uint8_t*>(this) + OffsetOfElement(index, pointer_size); - if (pointer_size == 4) { + if (pointer_size == PointerSize::k32) { uintptr_t value = reinterpret_cast<uintptr_t>(method); DCHECK_EQ(static_cast<uint32_t>(value), value); // Check that we dont lose any non 0 bits. *reinterpret_cast<uint32_t*>(ptr) = static_cast<uint32_t>(value); @@ -56,18 +56,18 @@ class ImTable { } } - static size_t OffsetOfElement(size_t index, size_t pointer_size) { - return index * pointer_size; + static size_t OffsetOfElement(size_t index, PointerSize pointer_size) { + return index * static_cast<size_t>(pointer_size); } - void Populate(ArtMethod** data, size_t pointer_size) { + void Populate(ArtMethod** data, PointerSize pointer_size) { for (size_t i = 0; i < kSize; ++i) { Set(i, data[i], pointer_size); } } - constexpr static size_t SizeInBytes(size_t pointer_size) { - return kSize * pointer_size; + constexpr static size_t SizeInBytes(PointerSize pointer_size) { + return kSize * static_cast<size_t>(pointer_size); } }; |