diff options
20 files changed, 45 insertions, 45 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index f6a104b7c2..4ef0dae073 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -741,11 +741,11 @@ void CodeGenerator::GenerateLoadClassRuntimeCall(HLoadClass* cls) { 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 3446dd63be..5a3b22cabd 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -339,8 +339,8 @@ class LoadClassSlowPathARM64 : public SlowPathCodeARM64 { 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 4e70d8b6c6..e7b2c7853f 100644 --- a/compiler/optimizing/code_generator_arm_vixl.cc +++ b/compiler/optimizing/code_generator_arm_vixl.cc @@ -540,8 +540,8 @@ class LoadClassSlowPathARMVIXL : public SlowPathCodeARMVIXL { 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 8b7479a861..0ed5756b53 100644 --- a/compiler/optimizing/code_generator_mips.cc +++ b/compiler/optimizing/code_generator_mips.cc @@ -252,8 +252,8 @@ class LoadClassSlowPathMIPS : public SlowPathCodeMIPS { 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 1d93fc809f..2b6928eee2 100644 --- a/compiler/optimizing/code_generator_mips64.cc +++ b/compiler/optimizing/code_generator_mips64.cc @@ -205,8 +205,8 @@ class LoadClassSlowPathMIPS64 : public SlowPathCodeMIPS64 { 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 46bd479c2c..a835aed6b0 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -286,8 +286,8 @@ class LoadClassSlowPathX86 : public SlowPathCode { 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 7e3fdedce0..dee891b8de 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -268,8 +268,8 @@ class LoadClassSlowPathX86_64 : public SlowPathCode { 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); diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S index 96d7c9629d..c86baa1057 100644 --- a/runtime/arch/arm/quick_entrypoints_arm.S +++ b/runtime/arch/arm/quick_entrypoints_arm.S @@ -1036,8 +1036,8 @@ END \name .endm ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_static_storage, artInitializeStaticStorageFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_type, artInitializeTypeFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_initialize_type_and_verify_access, artInitializeTypeAndVerifyAccessFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_resolve_type, artResolveTypeFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_type_and_verify_access, artResolveTypeAndVerifyAccessFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_handle, artResolveMethodHandleFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_type, artResolveMethodTypeFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_string, artResolveStringFromCode diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index 6b0de4848b..8b77453f30 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -1561,8 +1561,8 @@ TWO_ARG_REF_DOWNCALL art_quick_handle_fill_data, artHandleFillArrayDataFromCode, * returned. */ ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_static_storage, artInitializeStaticStorageFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_type, artInitializeTypeFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_initialize_type_and_verify_access, artInitializeTypeAndVerifyAccessFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_resolve_type, artResolveTypeFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_type_and_verify_access, artResolveTypeAndVerifyAccessFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_handle, artResolveMethodHandleFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_type, artResolveMethodTypeFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_string, artResolveStringFromCode diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index dca59cab34..05172dbe43 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -196,11 +196,11 @@ void InitEntryPoints(JniEntryPoints* jpoints, QuickEntryPoints* qpoints) { qpoints->pInitializeStaticStorage = art_quick_initialize_static_storage; static_assert(!IsDirectEntrypoint(kQuickInitializeStaticStorage), "Non-direct C stub marked direct."); - qpoints->pInitializeTypeAndVerifyAccess = art_quick_initialize_type_and_verify_access; - static_assert(!IsDirectEntrypoint(kQuickInitializeTypeAndVerifyAccess), + qpoints->pResolveTypeAndVerifyAccess = art_quick_resolve_type_and_verify_access; + static_assert(!IsDirectEntrypoint(kQuickResolveTypeAndVerifyAccess), "Non-direct C stub marked direct."); - qpoints->pInitializeType = art_quick_initialize_type; - static_assert(!IsDirectEntrypoint(kQuickInitializeType), "Non-direct C stub marked direct."); + qpoints->pResolveType = art_quick_resolve_type; + static_assert(!IsDirectEntrypoint(kQuickResolveType), "Non-direct C stub marked direct."); qpoints->pResolveString = art_quick_resolve_string; static_assert(!IsDirectEntrypoint(kQuickResolveString), "Non-direct C stub marked direct."); qpoints->pResolveMethodHandle = art_quick_resolve_method_handle; diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S index 303333cd0e..b10d1fc849 100644 --- a/runtime/arch/mips/quick_entrypoints_mips.S +++ b/runtime/arch/mips/quick_entrypoints_mips.S @@ -2086,13 +2086,13 @@ ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_static_storage, /* * Entry from managed code when dex cache misses for a type_idx. */ -ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_type, artInitializeTypeFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_resolve_type, artResolveTypeFromCode /* * Entry from managed code when type_idx needs to be checked for access and dex cache may also * miss. */ -ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_initialize_type_and_verify_access, artInitializeTypeAndVerifyAccessFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_type_and_verify_access, artResolveTypeAndVerifyAccessFromCode /* * Called by managed code when the value in rSUSPEND has been decremented to 0. diff --git a/runtime/arch/mips64/quick_entrypoints_mips64.S b/runtime/arch/mips64/quick_entrypoints_mips64.S index f35cb16b03..ebf1d5b0b4 100644 --- a/runtime/arch/mips64/quick_entrypoints_mips64.S +++ b/runtime/arch/mips64/quick_entrypoints_mips64.S @@ -1986,13 +1986,13 @@ ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_static_storage, /* * Entry from managed code when dex cache misses for a type_idx. */ -ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_type, artInitializeTypeFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_resolve_type, artResolveTypeFromCode /* * Entry from managed code when type_idx needs to be checked for access and dex cache may also * miss. */ -ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_initialize_type_and_verify_access, artInitializeTypeAndVerifyAccessFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_type_and_verify_access, artResolveTypeAndVerifyAccessFromCode /* * Called by managed code when the value in rSUSPEND has been decremented to 0. diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 9fe41ca83b..b0bed56ce4 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -1281,8 +1281,8 @@ GENERATE_ALLOC_ARRAY_TLAB art_quick_alloc_array_resolved32_tlab, artAllocArrayFr GENERATE_ALLOC_ARRAY_TLAB art_quick_alloc_array_resolved64_tlab, artAllocArrayFromCodeResolvedTLAB, COMPUTE_ARRAY_SIZE_64 ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_static_storage, artInitializeStaticStorageFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_type, artInitializeTypeFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_initialize_type_and_verify_access, artInitializeTypeAndVerifyAccessFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_resolve_type, artResolveTypeFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_type_and_verify_access, artResolveTypeAndVerifyAccessFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_handle, artResolveMethodHandleFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_type, artResolveMethodTypeFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_string, artResolveStringFromCode diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S index c41d3e4685..a8a648f2ca 100644 --- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S +++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S @@ -1301,8 +1301,8 @@ DEFINE_FUNCTION art_quick_alloc_object_initialized_region_tlab END_FUNCTION art_quick_alloc_object_initialized_region_tlab ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_static_storage, artInitializeStaticStorageFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_initialize_type, artInitializeTypeFromCode -ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_initialize_type_and_verify_access, artInitializeTypeAndVerifyAccessFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL_FOR_CLINIT art_quick_resolve_type, artResolveTypeFromCode +ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_type_and_verify_access, artResolveTypeAndVerifyAccessFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_handle, artResolveMethodHandleFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_method_type, artResolveMethodTypeFromCode ONE_ARG_SAVE_EVERYTHING_DOWNCALL art_quick_resolve_string, artResolveStringFromCode diff --git a/runtime/entrypoints/quick/quick_default_externs.h b/runtime/entrypoints/quick/quick_default_externs.h index 70e81734a7..aa32113eb8 100644 --- a/runtime/entrypoints/quick/quick_default_externs.h +++ b/runtime/entrypoints/quick/quick_default_externs.h @@ -35,8 +35,8 @@ extern "C" void art_quick_check_instance_of(art::mirror::Object*, art::mirror::C // Resolution and initialization entrypoints. extern "C" void* art_quick_initialize_static_storage(art::mirror::Class*); -extern "C" void* art_quick_initialize_type(uint32_t); -extern "C" void* art_quick_initialize_type_and_verify_access(uint32_t); +extern "C" void* art_quick_resolve_type(uint32_t); +extern "C" void* art_quick_resolve_type_and_verify_access(uint32_t); extern "C" void* art_quick_resolve_method_handle(uint32_t); extern "C" void* art_quick_resolve_method_type(uint32_t); extern "C" void* art_quick_resolve_string(uint32_t); diff --git a/runtime/entrypoints/quick/quick_default_init_entrypoints.h b/runtime/entrypoints/quick/quick_default_init_entrypoints.h index 32b6be29a5..8e784c164c 100644 --- a/runtime/entrypoints/quick/quick_default_init_entrypoints.h +++ b/runtime/entrypoints/quick/quick_default_init_entrypoints.h @@ -35,8 +35,8 @@ static void DefaultInitEntryPoints(JniEntryPoints* jpoints, QuickEntryPoints* qp // Resolution and initialization qpoints->pInitializeStaticStorage = art_quick_initialize_static_storage; - qpoints->pInitializeTypeAndVerifyAccess = art_quick_initialize_type_and_verify_access; - qpoints->pInitializeType = art_quick_initialize_type; + qpoints->pResolveTypeAndVerifyAccess = art_quick_resolve_type_and_verify_access; + qpoints->pResolveType = art_quick_resolve_type; qpoints->pResolveMethodHandle = art_quick_resolve_method_handle; qpoints->pResolveMethodType = art_quick_resolve_method_type; qpoints->pResolveString = art_quick_resolve_string; diff --git a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc index c46ea356c1..c4d85a3ef8 100644 --- a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc @@ -147,7 +147,7 @@ extern "C" mirror::Class* artInitializeStaticStorageFromCode(mirror::Class* klas return h_klass.Get(); } -extern "C" mirror::Class* artInitializeTypeFromCode(uint32_t type_idx, Thread* self) +extern "C" mirror::Class* artResolveTypeFromCode(uint32_t type_idx, Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { // Called when the .bss slot was empty or for main-path runtime call. ScopedQuickEntrypointChecks sqec(self); @@ -165,7 +165,7 @@ extern "C" mirror::Class* artInitializeTypeFromCode(uint32_t type_idx, Thread* s return result.Ptr(); } -extern "C" mirror::Class* artInitializeTypeAndVerifyAccessFromCode(uint32_t type_idx, Thread* self) +extern "C" mirror::Class* artResolveTypeAndVerifyAccessFromCode(uint32_t type_idx, Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) { // Called when caller isn't guaranteed to have access to a type. ScopedQuickEntrypointChecks sqec(self); diff --git a/runtime/entrypoints/quick/quick_entrypoints_list.h b/runtime/entrypoints/quick/quick_entrypoints_list.h index 014f1bd4cc..42b680e05a 100644 --- a/runtime/entrypoints/quick/quick_entrypoints_list.h +++ b/runtime/entrypoints/quick/quick_entrypoints_list.h @@ -39,8 +39,8 @@ V(CheckInstanceOf, void, mirror::Object*, mirror::Class*) \ \ V(InitializeStaticStorage, void*, mirror::Class*) \ - V(InitializeTypeAndVerifyAccess, void*, uint32_t) \ - V(InitializeType, void*, uint32_t) \ + V(ResolveTypeAndVerifyAccess, void*, uint32_t) \ + V(ResolveType, void*, uint32_t) \ V(ResolveMethodHandle, void*, uint32_t) \ V(ResolveMethodType, void*, uint32_t) \ V(ResolveString, void*, uint32_t) \ diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index c3cd793780..cb85804986 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -181,11 +181,11 @@ class EntrypointsOrderTest : public CommonRuntimeTest { EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pInstanceofNonTrivial, pCheckInstanceOf, sizeof(void*)); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pCheckInstanceOf, pInitializeStaticStorage, sizeof(void*)); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pInitializeStaticStorage, pInitializeTypeAndVerifyAccess, + EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pInitializeStaticStorage, pResolveTypeAndVerifyAccess, sizeof(void*)); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pInitializeTypeAndVerifyAccess, pInitializeType, + EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pResolveTypeAndVerifyAccess, pResolveType, sizeof(void*)); - EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pInitializeType, pResolveMethodHandle, sizeof(void*)); + EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pResolveType, pResolveMethodHandle, sizeof(void*)); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pResolveMethodHandle, pResolveMethodType, sizeof(void*)); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pResolveMethodType, pResolveString, sizeof(void*)); EXPECT_OFFSET_DIFFNP(QuickEntryPoints, pResolveString, pSet8Instance, sizeof(void*)); diff --git a/runtime/thread.cc b/runtime/thread.cc index 18dc0e8c45..69ac01e1f0 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -3223,8 +3223,8 @@ void Thread::DumpThreadOffset(std::ostream& os, uint32_t offset) { QUICK_ENTRY_POINT_INFO(pInstanceofNonTrivial) QUICK_ENTRY_POINT_INFO(pCheckInstanceOf) QUICK_ENTRY_POINT_INFO(pInitializeStaticStorage) - QUICK_ENTRY_POINT_INFO(pInitializeTypeAndVerifyAccess) - QUICK_ENTRY_POINT_INFO(pInitializeType) + QUICK_ENTRY_POINT_INFO(pResolveTypeAndVerifyAccess) + QUICK_ENTRY_POINT_INFO(pResolveType) QUICK_ENTRY_POINT_INFO(pResolveString) QUICK_ENTRY_POINT_INFO(pSet8Instance) QUICK_ENTRY_POINT_INFO(pSet8Static) |