From 068bee12ad89e9ed46da04ec8791cd00d917b6f5 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 22 May 2024 13:04:28 +0200 Subject: Fix class status check in `InitializeClassVisitor`. And address other late comments on https://android-review.googlesource.com/2163021 . Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Test: run-gtests.sh Test: testrunner.py --target --optimizing Bug: 162110941 Change-Id: I9eb49179633f94044b2060231babd156787bbd14 --- compiler/optimizing/code_generator.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 3ac4bd7dcc..aec7b45a1a 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -59,15 +59,15 @@ static int32_t constexpr kPrimIntMax = 0x7fffffff; // Maximum value for a primitive long. static int64_t constexpr kPrimLongMax = INT64_C(0x7fffffffffffffff); -constexpr size_t status_lsb_position = SubtypeCheckBits::BitStructSizeOf(); -constexpr size_t status_byte_offset = - mirror::Class::StatusOffset().SizeValue() + (status_lsb_position / kBitsPerByte); -constexpr uint32_t shifted_visibly_initialized_value = - enum_cast(ClassStatus::kVisiblyInitialized) << (status_lsb_position % kBitsPerByte); -constexpr uint32_t shifted_initializing_value = - enum_cast(ClassStatus::kInitializing) << (status_lsb_position % kBitsPerByte); -constexpr uint32_t shifted_initialized_value = - enum_cast(ClassStatus::kInitialized) << (status_lsb_position % kBitsPerByte); +constexpr size_t kClassStatusLsbPosition = SubtypeCheckBits::BitStructSizeOf(); +constexpr size_t kClassStatusByteOffset = + mirror::Class::StatusOffset().SizeValue() + (kClassStatusLsbPosition / kBitsPerByte); +constexpr uint32_t kShiftedVisiblyInitializedValue = enum_cast( + ClassStatus::kVisiblyInitialized) << (kClassStatusLsbPosition % kBitsPerByte); +constexpr uint32_t kShiftedInitializingValue = + enum_cast(ClassStatus::kInitializing) << (kClassStatusLsbPosition % kBitsPerByte); +constexpr uint32_t kShiftedInitializedValue = + enum_cast(ClassStatus::kInitialized) << (kClassStatusLsbPosition % kBitsPerByte); class Assembler; class CodeGenerationData; -- cgit v1.2.3-59-g8ed1b