From 9d479254d0dc4043a15ab26205f40439eca15493 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Tue, 24 Jul 2018 11:35:20 +0100
Subject: 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
---
 compiler/optimizing/code_generator.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'compiler/optimizing/code_generator.cc')

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());
   }
 }
 
-- 
cgit v1.2.3-59-g8ed1b