diff options
Diffstat (limited to 'compiler/optimizing/intrinsic_objects.h')
| -rw-r--r-- | compiler/optimizing/intrinsic_objects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/intrinsic_objects.h b/compiler/optimizing/intrinsic_objects.h index 61f4825224..c9ae449467 100644 --- a/compiler/optimizing/intrinsic_objects.h +++ b/compiler/optimizing/intrinsic_objects.h @@ -41,7 +41,7 @@ template <class T> class ObjectArray; V(Character, 0, 127, DataType::Type::kUint16, kShortCacheLastIndex) \ V(Integer, -128, 127, DataType::Type::kInt32, kCharacterCacheLastIndex) -#define DEFINE_BOXED_CONSTANTS(name, low, high, primitive_type, start_index) \ +#define DEFINE_BOXED_CONSTANTS(name, low, high, unused, start_index) \ static constexpr size_t k ##name ##CacheLastIndex = start_index + (high - low + 1); \ static constexpr size_t k ##name ##CacheFirstIndex = start_index; BOXED_TYPES(DEFINE_BOXED_CONSTANTS) @@ -72,7 +72,7 @@ class IntrinsicObjects { } // Helpers returning addresses of objects, suitable for embedding in generated code. -#define DEFINE_BOXED_ACCESSES(name, _, __, ___, start_index) \ +#define DEFINE_BOXED_ACCESSES(name, unused1, unused2, unused3, start_index) \ static ObjPtr<mirror::Object> Get ##name ##ValueOfObject( \ ObjPtr<mirror::ObjectArray<mirror::Object>> boot_image_live_objects, \ uint32_t index) REQUIRES_SHARED(Locks::mutator_lock_) { \ @@ -90,7 +90,7 @@ class IntrinsicObjects { ObjPtr<mirror::ObjectArray<mirror::Object>> boot_image_live_objects, size_t start_index) REQUIRES_SHARED(Locks::mutator_lock_); - static size_t GetNumberOfIntrinsicObjects() { + static constexpr size_t GetNumberOfIntrinsicObjects() { return kNumberOfBoxedCaches; } |