diff options
author | 2016-07-26 09:02:02 -0700 | |
---|---|---|
committer | 2016-08-01 18:54:48 -0700 | |
commit | 542451cc546779f5c67840e105c51205a1b0a8fd (patch) | |
tree | 11e09bb5abaee12dddffefbe7e425291076dfa7a /runtime/class_linker.h | |
parent | 85c4a4b8c9eabfe16e4e49f9b4aa78c1bf4be023 (diff) |
ART: Convert pointer size to enum
Move away from size_t to dedicated enum (class).
Bug: 30373134
Bug: 30419309
Test: m test-art-host
Change-Id: Id453c330f1065012e7d4f9fc24ac477cc9bb9269
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r-- | runtime/class_linker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index d6822c5225..fcc6b23c7a 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -25,6 +25,7 @@ #include <vector> #include "base/allocator.h" +#include "base/enums.h" #include "base/hash_set.h" #include "base/macros.h" #include "base/mutex.h" @@ -566,8 +567,7 @@ class ClassLinker { SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!dex_lock_); - size_t GetImagePointerSize() const { - DCHECK(ValidPointerSize(image_pointer_size_)) << image_pointer_size_; + PointerSize GetImagePointerSize() const { return image_pointer_size_; } @@ -630,7 +630,7 @@ class ClassLinker { // Static version for when the class linker is not yet created. static ImtConflictTable* CreateImtConflictTable(size_t count, LinearAlloc* linear_alloc, - size_t pointer_size); + PointerSize pointer_size); // Create the IMT and conflict tables for a class. @@ -1166,7 +1166,7 @@ class ClassLinker { const void* quick_to_interpreter_bridge_trampoline_; // Image pointer size. - size_t image_pointer_size_; + PointerSize image_pointer_size_; friend class ImageDumper; // for DexLock friend class ImageWriter; // for GetClassRoots |