Move getNamedIntrinsicID() and getMethodName() into Interpreter Type.

Author: nikolahua

src/coreclr/vm/interpreter.cpp

@@ -11728,7 +11728,7 @@ static const char* CorInfoTypeNames[] = {
 };
 
 // Also see Compiler::lookupNamedIntrinsic
-InterpreterNamedIntrinsics getNamedIntrinsicID(CEEInfo* info, CORINFO_METHOD_HANDLE methodHnd)
+Interpreter::InterpreterNamedIntrinsics Interpreter::getNamedIntrinsicID(CEEInfo* info, CORINFO_METHOD_HANDLE methodHnd)
 {
     InterpreterNamedIntrinsics result = NI_Illegal;
 
@@ -11773,7 +11773,7 @@ InterpreterNamedIntrinsics getNamedIntrinsicID(CEEInfo* info, CORINFO_METHOD_HAN
 
 // Simple version of getMethodName which supports IL Stubs such as IL_STUB_PInvoke additionally.
 // Also see getMethodNameFromMetadata and printMethodName in corinfo.h
-const char* getMethodName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** className, const char** namespaceName, const char **enclosingClassName)
+const char* Interpreter::getMethodName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** className, const char** namespaceName, const char **enclosingClassName)
 {
     MethodDesc *pMD = GetMethod(hnd);
     if (pMD->IsILStub())
@@ -11801,7 +11801,7 @@ const char* eeGetMethodFullName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const
     const char* returnType = NULL;
 
     const char* className;
-    const char* methodName = getMethodName(info, hnd, &className);
+    const char* methodName = Interpreter::getMethodName(info, hnd, &className);
     if (clsName != NULL)
     {
         *clsName = className;

src/coreclr/vm/interpreter.h

@@ -537,17 +537,7 @@ struct CachedItem
     }
 };
 
-// Also see namedintrinsiclist.h
-enum InterpreterNamedIntrinsics : unsigned short
-{
-    NI_Illegal = 0,
-    NI_System_StubHelpers_GetStubContext,
-    NI_System_Runtime_InteropService_MemoryMarshal_GetArrayDataReference,
-};
-
-InterpreterNamedIntrinsics getNamedIntrinsicID(CEEInfo* info, CORINFO_METHOD_HANDLE methodHnd);
 
-const char* getMethodName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** className, const char** namespaceName = NULL, const char **enclosingClassName = NULL);
 const char* eeGetMethodFullName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** clsName = NULL);
 
 // The per-InterpMethodInfo cache may map generic instantiation information to the
@@ -924,6 +914,16 @@ class Interpreter
 
     void*      GetParamTypeArg() { return m_genericsCtxtArg; }
 
+    // Also see namedintrinsiclist.h
+    enum InterpreterNamedIntrinsics : unsigned short
+    {
+        NI_Illegal = 0,
+        NI_System_StubHelpers_GetStubContext,
+        NI_System_Runtime_InteropService_MemoryMarshal_GetArrayDataReference,
+    };
+    static InterpreterNamedIntrinsics getNamedIntrinsicID(CEEInfo* info, CORINFO_METHOD_HANDLE methodHnd);
+    static const char* getMethodName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** className, const char** namespaceName = NULL, const char **enclosingClassName = NULL);
+
 private:
     // Architecture-dependent helpers.
     inline static unsigned short NumberOfIntegerRegArgs();