summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2025-01-02 14:28:49 +0000
committer VladimĂ­r Marko <vmarko@google.com> 2025-01-02 23:57:02 -0800
commit82efdc3c6b9a1d70fa9e290f7c3a70778a8e816a (patch)
tree3040266b61bd5b66150c7fcbd43d4be19856d195
parent44022f13f1932dbcf948da823375c17dfc724a1c (diff)
Rename `GetBootImageVarHandleField()`, drop "Boot".
This is a minor cleanup after https://android-review.googlesource.com/3048514 . Test: m test-art-host-gtest Test: testrunner.py --host --optimizing --speed-profile Bug: 38313278 Change-Id: Ic47063231fd48656b612ede3ec100ceb8a379050
-rw-r--r--compiler/optimizing/intrinsics.h2
-rw-r--r--compiler/optimizing/intrinsics_arm64.cc2
-rw-r--r--compiler/optimizing/intrinsics_arm_vixl.cc2
-rw-r--r--compiler/optimizing/intrinsics_riscv64.cc2
-rw-r--r--compiler/optimizing/intrinsics_utils.h2
-rw-r--r--compiler/optimizing/intrinsics_x86_64.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h
index 7a27b2506b..4f164e10c6 100644
--- a/compiler/optimizing/intrinsics.h
+++ b/compiler/optimizing/intrinsics.h
@@ -270,7 +270,7 @@ class VarHandleOptimizations : public IntrinsicOptimizations {
INTRINSIC_OPTIMIZATION(DoNotIntrinsify, 0); // One of the checks is statically known to fail.
INTRINSIC_OPTIMIZATION(SkipObjectNullCheck, 1); // Not applicable for static fields.
- // Use known `VarHandle` from the boot image. To apply this optimization, the following
+ // Use known `VarHandle` from the boot/app image. To apply this optimization, the following
// `VarHandle` checks must pass based on static analysis:
// - `VarHandle` type check (must match the coordinate count),
// - access mode check,
diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc
index d12b2f7981..a4463cb248 100644
--- a/compiler/optimizing/intrinsics_arm64.cc
+++ b/compiler/optimizing/intrinsics_arm64.cc
@@ -4863,7 +4863,7 @@ static void GenerateVarHandleTarget(HInvoke* invoke,
if (expected_coordinates_count <= 1u) {
if (VarHandleOptimizations(invoke).GetUseKnownImageVarHandle()) {
ScopedObjectAccess soa(Thread::Current());
- ArtField* target_field = GetBootImageVarHandleField(invoke);
+ ArtField* target_field = GetImageVarHandleField(invoke);
if (expected_coordinates_count == 0u) {
ObjPtr<mirror::Class> declaring_class = target_field->GetDeclaringClass();
if (Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(declaring_class)) {
diff --git a/compiler/optimizing/intrinsics_arm_vixl.cc b/compiler/optimizing/intrinsics_arm_vixl.cc
index 04793b4f66..db7457a68b 100644
--- a/compiler/optimizing/intrinsics_arm_vixl.cc
+++ b/compiler/optimizing/intrinsics_arm_vixl.cc
@@ -4597,7 +4597,7 @@ static void GenerateVarHandleTarget(HInvoke* invoke,
if (expected_coordinates_count <= 1u) {
if (VarHandleOptimizations(invoke).GetUseKnownImageVarHandle()) {
ScopedObjectAccess soa(Thread::Current());
- ArtField* target_field = GetBootImageVarHandleField(invoke);
+ ArtField* target_field = GetImageVarHandleField(invoke);
if (expected_coordinates_count == 0u) {
ObjPtr<mirror::Class> declaring_class = target_field->GetDeclaringClass();
if (Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(declaring_class)) {
diff --git a/compiler/optimizing/intrinsics_riscv64.cc b/compiler/optimizing/intrinsics_riscv64.cc
index 32816b5f4b..65776236c1 100644
--- a/compiler/optimizing/intrinsics_riscv64.cc
+++ b/compiler/optimizing/intrinsics_riscv64.cc
@@ -3774,7 +3774,7 @@ static void GenerateVarHandleTarget(HInvoke* invoke,
if (expected_coordinates_count <= 1u) {
if (VarHandleOptimizations(invoke).GetUseKnownImageVarHandle()) {
ScopedObjectAccess soa(Thread::Current());
- ArtField* target_field = GetBootImageVarHandleField(invoke);
+ ArtField* target_field = GetImageVarHandleField(invoke);
if (expected_coordinates_count == 0u) {
ObjPtr<mirror::Class> declaring_class = target_field->GetDeclaringClass();
if (Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(declaring_class)) {
diff --git a/compiler/optimizing/intrinsics_utils.h b/compiler/optimizing/intrinsics_utils.h
index 6c08cea3f8..c2f32ae708 100644
--- a/compiler/optimizing/intrinsics_utils.h
+++ b/compiler/optimizing/intrinsics_utils.h
@@ -207,7 +207,7 @@ static inline DataType::Type GetVarHandleExpectedValueType(HInvoke* invoke,
}
}
-static inline ArtField* GetBootImageVarHandleField(HInvoke* invoke)
+static inline ArtField* GetImageVarHandleField(HInvoke* invoke)
REQUIRES_SHARED(Locks::mutator_lock_) {
DCHECK_LE(GetExpectedVarHandleCoordinatesCount(invoke), 1u);
DCHECK(VarHandleOptimizations(invoke).GetUseKnownImageVarHandle());
diff --git a/compiler/optimizing/intrinsics_x86_64.cc b/compiler/optimizing/intrinsics_x86_64.cc
index fd74f3f44d..18963bf135 100644
--- a/compiler/optimizing/intrinsics_x86_64.cc
+++ b/compiler/optimizing/intrinsics_x86_64.cc
@@ -4074,7 +4074,7 @@ static void GenerateVarHandleTarget(HInvoke* invoke,
if (expected_coordinates_count <= 1u) {
if (VarHandleOptimizations(invoke).GetUseKnownImageVarHandle()) {
ScopedObjectAccess soa(Thread::Current());
- ArtField* target_field = GetBootImageVarHandleField(invoke);
+ ArtField* target_field = GetImageVarHandleField(invoke);
if (expected_coordinates_count == 0u) {
ObjPtr<mirror::Class> declaring_class = target_field->GetDeclaringClass();
__ movl(CpuRegister(target.object),