diff options
| author | 2022-07-18 12:30:34 +0000 | |
|---|---|---|
| committer | 2022-07-18 12:30:34 +0000 | |
| commit | 1b58103b0eee14ae63952a280a56c5147e6cba8a (patch) | |
| tree | 3b00ae154eb34371951034cadeeedccb68cb18bf | |
| parent | 7d3eabcefc991cb4721e91d6481b03b43816c469 (diff) | |
| parent | 0796b565b7a41a851fd66a785dd687540c4259c3 (diff) | |
Mention `ClassLinker::LinkFieldsHelper::LinkFields` in ART's doc. am: 87553ec1b2 am: d2ce81a701 am: c57e236283 am: ab89b7f84d am: 0796b565b7
Original change: https://android-review.googlesource.com/c/platform/art/+/2153583
Change-Id: Id1b153c647da4fd7f80ff18b2293f63ed1157db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | runtime/class_linker.cc | 3 | ||||
| -rw-r--r-- | runtime/class_linker_test.cc | 2 | ||||
| -rw-r--r-- | runtime/mirror/class.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index fd721cd732..78aac8b954 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -8585,7 +8585,8 @@ class ClassLinker::LinkFieldsHelper { }; // We use the following order of field types for assigning offsets. -// Some fields can be shuffled forward to fill gaps, see `ClassLinker::LinkFields()`. +// Some fields can be shuffled forward to fill gaps, see +// `ClassLinker::LinkFieldsHelper::LinkFields()`. enum class ClassLinker::LinkFieldsHelper::FieldTypeOrder : uint16_t { kReference = 0u, kLong, diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 6a6a3885fa..0e7dee8c9f 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -831,7 +831,7 @@ struct ByteBufferViewVarHandleOffsets : public CheckOffsets<mirror::ByteBufferVi // C++ fields must exactly match the fields in the Java classes. If this fails, // reorder the fields in the C++ class. Managed class fields are ordered by -// ClassLinker::LinkFields. +// ClassLinker::LinkFieldsHelper::LinkFields. TEST_F(ClassLinkerTest, ValidateFieldOrderOfJavaCppUnionClasses) { ScopedObjectAccess soa(Thread::Current()); EXPECT_TRUE(ObjectOffsets().Check()); diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index 48fced45c6..39f32bccee 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -1417,7 +1417,7 @@ class MANAGED Class final : public Object { REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); // 'Class' Object Fields - // Order governed by java field ordering. See art::ClassLinker::LinkFields. + // Order governed by java field ordering. See art::ClassLinker::LinkFieldsHelper::LinkFields. // Defining class loader, or null for the "bootstrap" system loader. HeapReference<ClassLoader> class_loader_; |