Rename type resolution entrypoints.
Rename the InitializeType and InitializeTypeAndVerifyAccess
entrypoints to Resolve* to better match their semantics.
Keep the InitializeStaticStorage name for now as the most
appropriate name InitializeType would clash with the old
name of the ResolveType entrypoint.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: Ide55b58c490d085ab37d8536f90699f7ed571d59
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index f6a104b..4ef0dae 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -741,11 +741,11 @@
LocationSummary* locations = cls->GetLocations();
MoveConstant(locations->GetTemp(0), cls->GetTypeIndex().index_);
if (cls->NeedsAccessCheck()) {
- CheckEntrypointTypes<kQuickInitializeTypeAndVerifyAccess, void*, uint32_t>();
- InvokeRuntime(kQuickInitializeTypeAndVerifyAccess, cls, cls->GetDexPc());
+ CheckEntrypointTypes<kQuickResolveTypeAndVerifyAccess, void*, uint32_t>();
+ InvokeRuntime(kQuickResolveTypeAndVerifyAccess, cls, cls->GetDexPc());
} else {
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
- InvokeRuntime(kQuickInitializeType, cls, cls->GetDexPc());
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
+ InvokeRuntime(kQuickResolveType, cls, cls->GetDexPc());
}
}
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 3446dd6..5a3b22c 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -339,8 +339,8 @@
DCHECK(IsSameDexFile(cls_->GetDexFile(), arm64_codegen->GetGraph()->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ Mov(calling_convention.GetRegisterAt(0).W(), type_index.index_);
- arm64_codegen->InvokeRuntime(kQuickInitializeType, instruction_, dex_pc, this);
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
+ arm64_codegen->InvokeRuntime(kQuickResolveType, instruction_, dex_pc, this);
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
// If we also must_do_clinit, the resolved type is now in the correct register.
} else {
DCHECK(must_do_clinit);
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index 4e70d8b..e7b2c78 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -540,8 +540,8 @@
DCHECK(IsSameDexFile(cls_->GetDexFile(), arm_codegen->GetGraph()->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ Mov(calling_convention.GetRegisterAt(0), type_index.index_);
- arm_codegen->InvokeRuntime(kQuickInitializeType, instruction_, dex_pc, this);
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
+ arm_codegen->InvokeRuntime(kQuickResolveType, instruction_, dex_pc, this);
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
// If we also must_do_clinit, the resolved type is now in the correct register.
} else {
DCHECK(must_do_clinit);
diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc
index 8b7479a..0ed5756 100644
--- a/compiler/optimizing/code_generator_mips.cc
+++ b/compiler/optimizing/code_generator_mips.cc
@@ -252,8 +252,8 @@
DCHECK(IsSameDexFile(cls_->GetDexFile(), mips_codegen->GetGraph()->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ LoadConst32(calling_convention.GetRegisterAt(0), type_index.index_);
- mips_codegen->InvokeRuntime(kQuickInitializeType, instruction_, dex_pc, this);
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
+ mips_codegen->InvokeRuntime(kQuickResolveType, instruction_, dex_pc, this);
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
// If we also must_do_clinit, the resolved type is now in the correct register.
} else {
DCHECK(must_do_clinit);
diff --git a/compiler/optimizing/code_generator_mips64.cc b/compiler/optimizing/code_generator_mips64.cc
index 1d93fc8..2b6928e 100644
--- a/compiler/optimizing/code_generator_mips64.cc
+++ b/compiler/optimizing/code_generator_mips64.cc
@@ -205,8 +205,8 @@
DCHECK(IsSameDexFile(cls_->GetDexFile(), mips64_codegen->GetGraph()->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ LoadConst32(calling_convention.GetRegisterAt(0), type_index.index_);
- mips64_codegen->InvokeRuntime(kQuickInitializeType, instruction_, dex_pc, this);
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
+ mips64_codegen->InvokeRuntime(kQuickResolveType, instruction_, dex_pc, this);
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
// If we also must_do_clinit, the resolved type is now in the correct register.
} else {
DCHECK(must_do_clinit);
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 46bd479..a835aed 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -286,8 +286,8 @@
DCHECK(IsSameDexFile(cls_->GetDexFile(), x86_codegen->GetGraph()->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ movl(calling_convention.GetRegisterAt(0), Immediate(type_index.index_));
- x86_codegen->InvokeRuntime(kQuickInitializeType, instruction_, dex_pc, this);
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
+ x86_codegen->InvokeRuntime(kQuickResolveType, instruction_, dex_pc, this);
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
// If we also must_do_clinit, the resolved type is now in the correct register.
} else {
DCHECK(must_do_clinit);
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 7e3fded..dee891b 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -268,8 +268,8 @@
DCHECK(IsSameDexFile(cls_->GetDexFile(), x86_64_codegen->GetGraph()->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ movl(CpuRegister(RAX), Immediate(type_index.index_));
- x86_64_codegen->InvokeRuntime(kQuickInitializeType, instruction_, dex_pc, this);
- CheckEntrypointTypes<kQuickInitializeType, void*, uint32_t>();
+ x86_64_codegen->InvokeRuntime(kQuickResolveType, instruction_, dex_pc, this);
+ CheckEntrypointTypes<kQuickResolveType, void*, uint32_t>();
// If we also must_do_clinit, the resolved type is now in the correct register.
} else {
DCHECK(must_do_clinit);