summaryrefslogtreecommitdiff
path: root/compiler/optimizing/code_generator.cc
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2018-07-24 11:35:20 +0100
committerVladimir Marko <vmarko@google.com>2018-08-03 11:43:30 +0000
commit9d479254d0dc4043a15ab26205f40439eca15493 (patch)
treeaf8a9c9c6f2c28e723a971c9d39c9d1cebd1f814 /compiler/optimizing/code_generator.cc
parentca20fb6cc4dda392e63bdc8ec9de54d89793373e (diff)
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
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
-rw-r--r--compiler/optimizing/code_generator.cc8
1 files changed, 4 insertions, 4 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());
}
}