Import string.Empty as ""

EgorBo · EgorBo · commit 15a47c2660fe · 2022-01-31T13:40:20.000+03:00
diff --git a/src/coreclr/inc/corjit.h b/src/coreclr/inc/corjit.h
@@ -485,6 +485,9 @@ class ICorJitInfo : public ICorDynamicInfo
     //
     virtual uint32_t getExpectedTargetArchitecture() = 0;
 
+    // Obtains MdToken corresponding to "". It's used to import String.Empty as GT_CNS_STR
+    virtual uint32_t getEmptyStringMdToken() = 0;
+
     // Fetches extended flags for a particular compilation instance. Returns
     // the number of bytes written to the provided buffer.
     virtual uint32_t getJitFlags(
diff --git a/src/coreclr/inc/icorjitinfoimpl_generated.h b/src/coreclr/inc/icorjitinfoimpl_generated.h
@@ -702,6 +702,8 @@ uint16_t getRelocTypeHint(
 
 uint32_t getExpectedTargetArchitecture() override;
 
+uint32_t getEmptyStringMdToken() override;
+
 uint32_t getJitFlags(
           CORJIT_FLAGS* flags,
           uint32_t sizeInBytes) override;
diff --git a/src/coreclr/inc/jiteeversionguid.h b/src/coreclr/inc/jiteeversionguid.h
@@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
 #define GUID_DEFINED
 #endif // !GUID_DEFINED
 
-constexpr GUID JITEEVersionIdentifier = { /* 323185e9-208a-4b35-a413-23f9aac2d5f7 */
-    0x323185e9,
-    0x208a,
-    0x4b35,
-    {0xa4, 0x13, 0x23, 0xf9, 0xaa, 0xc2, 0xd5, 0xf7}
+constexpr GUID JITEEVersionIdentifier = { /* 7910ee9e-2034-425d-bd9a-f1d44783c86e */
+    0x7910ee9e,
+    0x2034,
+    0x425d,
+    {0xbd, 0x9a, 0xf1, 0xd4, 0x47, 0x83, 0xc8, 0x6e}
   };
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/coreclr/jit/ICorJitInfo_API_names.h b/src/coreclr/jit/ICorJitInfo_API_names.h
@@ -174,6 +174,7 @@ DEF_CLR_API(recordCallSite)
 DEF_CLR_API(recordRelocation)
 DEF_CLR_API(getRelocTypeHint)
 DEF_CLR_API(getExpectedTargetArchitecture)
+DEF_CLR_API(getEmptyStringMdToken)
 DEF_CLR_API(getJitFlags)
 DEF_CLR_API(doesFieldBelongToClass)
 
diff --git a/src/coreclr/jit/ICorJitInfo_API_wrapper.hpp b/src/coreclr/jit/ICorJitInfo_API_wrapper.hpp
@@ -1670,6 +1670,14 @@ uint32_t WrapICorJitInfo::getExpectedTargetArchitecture()
     return temp;
 }
 
+uint32_t WrapICorJitInfo::getEmptyStringMdToken()
+{
+    API_ENTER(getEmptyStringMdToken);
+    uint32_t temp = wrapHnd->getEmptyStringMdToken();
+    API_LEAVE(getEmptyStringMdToken);
+    return temp;
+}
+
 uint32_t WrapICorJitInfo::getJitFlags(
           CORJIT_FLAGS* flags,
           uint32_t sizeInBytes)
diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp
@@ -15115,9 +15115,20 @@ void Compiler::impImportBlockCode(BasicBlock* block)
                     {
                         assert(aflags & CORINFO_ACCESS_GET);
 
-                        LPVOID         pValue;
-                        InfoAccessType iat = info.compCompHnd->emptyStringLiteral(&pValue);
-                        op1                = gtNewStringLiteralNode(iat, pValue);
+                        // Try to import String.Empty as "" (GT_CNS_STR) if VM has a mdToken for ""
+                        uint32_t emptyStrTok = info.compCompHnd->getEmptyStringMdToken();
+                        if (emptyStrTok > 0)
+                        {
+                            // emptyStrTok is always from corelib 
+                            op1 = gtNewSconNode(emptyStrTok, info.compCompHnd->getClassModule(impGetObjectClass()));
+                        }
+                        else
+                        {
+                            // Import normally
+                            LPVOID         pValue;
+                            InfoAccessType iat = info.compCompHnd->emptyStringLiteral(&pValue);
+                            op1                = gtNewStringLiteralNode(iat, pValue);
+                        }
                         goto FIELD_DONE;
                     }
                     break;
diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoBase.cs b/src/coreclr/tools/Common/JitInterface/CorInfoBase.cs
@@ -2519,6 +2519,21 @@ static uint _getExpectedTargetArchitecture(IntPtr thisHandle, IntPtr* ppExceptio
             }
         }
 
+        [UnmanagedCallersOnly]
+        static uint _getEmptyStringMdToken(IntPtr thisHandle, IntPtr* ppException)
+        {
+            var _this = GetThis(thisHandle);
+            try
+            {
+                return _this.getEmptyStringMdToken();
+            }
+            catch (Exception ex)
+            {
+                *ppException = _this.AllocException(ex);
+                return default;
+            }
+        }
+
         [UnmanagedCallersOnly]
         static uint _getJitFlags(IntPtr thisHandle, IntPtr* ppException, CORJIT_FLAGS* flags, uint sizeInBytes)
         {
@@ -2552,7 +2567,7 @@ static byte _doesFieldBelongToClass(IntPtr thisHandle, IntPtr* ppException, CORI
 
         static IntPtr GetUnmanagedCallbacks()
         {
-            void** callbacks = (void**)Marshal.AllocCoTaskMem(sizeof(IntPtr) * 172);
+            void** callbacks = (void**)Marshal.AllocCoTaskMem(sizeof(IntPtr) * 173);
 
             callbacks[0] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, byte>)&_isIntrinsic;
             callbacks[1] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_METHOD_STRUCT_*, uint>)&_getMethodAttribs;
@@ -2724,8 +2739,9 @@ static IntPtr GetUnmanagedCallbacks()
             callbacks[167] = (delegate* unmanaged<IntPtr, IntPtr*, void*, void*, void*, ushort, ushort, int, void>)&_recordRelocation;
             callbacks[168] = (delegate* unmanaged<IntPtr, IntPtr*, void*, ushort>)&_getRelocTypeHint;
             callbacks[169] = (delegate* unmanaged<IntPtr, IntPtr*, uint>)&_getExpectedTargetArchitecture;
-            callbacks[170] = (delegate* unmanaged<IntPtr, IntPtr*, CORJIT_FLAGS*, uint, uint>)&_getJitFlags;
-            callbacks[171] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_FIELD_STRUCT_*, CORINFO_CLASS_STRUCT_*, byte>)&_doesFieldBelongToClass;
+            callbacks[170] = (delegate* unmanaged<IntPtr, IntPtr*, uint>)&_getEmptyStringMdToken;
+            callbacks[171] = (delegate* unmanaged<IntPtr, IntPtr*, CORJIT_FLAGS*, uint, uint>)&_getJitFlags;
+            callbacks[172] = (delegate* unmanaged<IntPtr, IntPtr*, CORINFO_FIELD_STRUCT_*, CORINFO_CLASS_STRUCT_*, byte>)&_doesFieldBelongToClass;
 
             return (IntPtr)callbacks;
         }
diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
@@ -3642,6 +3642,11 @@ private uint getExpectedTargetArchitecture()
             }
         }
 
+        private uint getEmptyStringMdToken()
+        {
+            return 0;
+        }
+
         private bool doesFieldBelongToClass(CORINFO_FIELD_STRUCT_* fld, CORINFO_CLASS_STRUCT_* cls)
         {
             var field = HandleToObject(fld);
diff --git a/src/coreclr/tools/Common/JitInterface/ThunkGenerator/ThunkInput.txt b/src/coreclr/tools/Common/JitInterface/ThunkGenerator/ThunkInput.txt
@@ -323,5 +323,6 @@ FUNCTIONS
     void recordRelocation(void* location, void* locationRW, void* target, uint16_t fRelocType, uint16_t slotNum, int32_t addlDelta)
     uint16_t getRelocTypeHint(void* target)
     uint32_t getExpectedTargetArchitecture()
+    uint32_t getEmptyStringMdToken()
     uint32_t getJitFlags(CORJIT_FLAGS* flags, uint32_t  sizeInBytes)
     bool doesFieldBelongToClass(CORINFO_FIELD_HANDLE fldHnd, CORINFO_CLASS_HANDLE cls)
diff --git a/src/coreclr/tools/aot/jitinterface/jitinterface.h b/src/coreclr/tools/aot/jitinterface/jitinterface.h
@@ -181,6 +181,7 @@ struct JitInterfaceCallbacks
     void (* recordRelocation)(void * thisHandle, CorInfoExceptionClass** ppException, void* location, void* locationRW, void* target, uint16_t fRelocType, uint16_t slotNum, int32_t addlDelta);
     uint16_t (* getRelocTypeHint)(void * thisHandle, CorInfoExceptionClass** ppException, void* target);
     uint32_t (* getExpectedTargetArchitecture)(void * thisHandle, CorInfoExceptionClass** ppException);
+    uint32_t (* getEmptyStringMdToken)(void * thisHandle, CorInfoExceptionClass** ppException);
     uint32_t (* getJitFlags)(void * thisHandle, CorInfoExceptionClass** ppException, CORJIT_FLAGS* flags, uint32_t sizeInBytes);
     bool (* doesFieldBelongToClass)(void * thisHandle, CorInfoExceptionClass** ppException, CORINFO_FIELD_HANDLE fldHnd, CORINFO_CLASS_HANDLE cls);
 
@@ -1838,6 +1839,14 @@ class JitInterfaceWrapper : public ICorJitInfo
     return temp;
 }
 
+    virtual uint32_t getEmptyStringMdToken()
+{
+    CorInfoExceptionClass* pException = nullptr;
+    uint32_t temp = _callbacks->getEmptyStringMdToken(_thisHandle, &pException);
+    if (pException != nullptr) throw pException;
+    return temp;
+}
+
     virtual uint32_t getJitFlags(
           CORJIT_FLAGS* flags,
           uint32_t sizeInBytes)
diff --git a/src/coreclr/tools/superpmi/superpmi-shared/lwmlist.h b/src/coreclr/tools/superpmi/superpmi-shared/lwmlist.h
@@ -124,6 +124,7 @@ LWM(GetReadyToRunHelper, GetReadyToRunHelper_TOKENin, GetReadyToRunHelper_TOKENo
 LWM(GetReadyToRunDelegateCtorHelper, GetReadyToRunDelegateCtorHelper_TOKENIn, Agnostic_CORINFO_LOOKUP)
 LWM(GetRelocTypeHint, DWORDLONG, DWORD)
 LWM(GetExpectedTargetArchitecture, DWORD, DWORD)
+LWM(GetEmptyStringMdToken, DWORD, DWORD)
 LWM(GetSharedCCtorHelper, DWORDLONG, DWORD)
 LWM(GetStringConfigValue, DWORD, DWORD)
 LWM(GetSystemVAmd64PassStructInRegisterDescriptor, DWORDLONG, Agnostic_GetSystemVAmd64PassStructInRegisterDescriptor)
diff --git a/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp b/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp
@@ -6220,6 +6220,25 @@ DWORD MethodContext::repGetExpectedTargetArchitecture()
     return value;
 }
 
+void MethodContext::recGetEmptyStringMdToken(DWORD result)
+{
+    if (GetEmptyStringMdToken == nullptr)
+        GetEmptyStringMdToken = new LightWeightMap<DWORD, DWORD>();
+
+    GetEmptyStringMdToken->Add(0, result);
+    DEBUG_REC(dmpGetEmptyStringMdToken(0, result));
+}
+void MethodContext::dmpGetEmptyStringMdToken(DWORD key, DWORD result)
+{
+    printf("GetEmptyStringMdToken key %u, res %u", key, result);
+}
+DWORD MethodContext::repGetEmptyStringMdToken()
+{
+    DWORD value = GetEmptyStringMdToken->Get(0);
+    DEBUG_REP(dmpGetEmptyStringMdToken(key, value));
+    return value;
+}
+
 void MethodContext::recDoesFieldBelongToClass(CORINFO_FIELD_HANDLE fld, CORINFO_CLASS_HANDLE cls, bool result)
 {
     if (DoesFieldBelongToClass == nullptr)
diff --git a/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.h b/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.h
@@ -761,6 +761,10 @@ class MethodContext
     void dmpGetExpectedTargetArchitecture(DWORD key, DWORD result);
     DWORD repGetExpectedTargetArchitecture();
 
+    void recGetEmptyStringMdToken(DWORD result);
+    void dmpGetEmptyStringMdToken(DWORD key, DWORD result);
+    DWORD repGetEmptyStringMdToken();
+
     void recDoesFieldBelongToClass(CORINFO_FIELD_HANDLE fld, CORINFO_CLASS_HANDLE cls, bool result);
     void dmpDoesFieldBelongToClass(DLDL key, bool value);
     bool repDoesFieldBelongToClass(CORINFO_FIELD_HANDLE fld, CORINFO_CLASS_HANDLE cls);
@@ -1097,6 +1101,7 @@ enum mcPackets
     Packet_GetAssemblyName = 191,
     Packet_IsIntrinsic = 192,
     Packet_UpdateEntryPointForTailCall = 193,
+    Packet_GetEmptyStringMdToken = 194
 };
 
 void SetDebugDumpVariables();
diff --git a/src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp b/src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp
@@ -1994,6 +1994,14 @@ uint32_t interceptor_ICJI::getExpectedTargetArchitecture()
     return result;
 }
 
+uint32_t interceptor_ICJI::getEmptyStringMdToken()
+{
+    mc->cr->AddCall("getEmptyStringMdToken");
+    DWORD result = original_ICorJitInfo->getEmptyStringMdToken();
+    mc->recGetEmptyStringMdToken(result);
+    return result;
+}
+
 bool interceptor_ICJI::notifyInstructionSetUsage(CORINFO_InstructionSet instructionSet, bool supported)
 {
     return original_ICorJitInfo->notifyInstructionSetUsage(instructionSet, supported);
diff --git a/src/coreclr/tools/superpmi/superpmi-shim-counter/icorjitinfo.cpp b/src/coreclr/tools/superpmi/superpmi-shim-counter/icorjitinfo.cpp
@@ -1373,6 +1373,12 @@ uint32_t interceptor_ICJI::getExpectedTargetArchitecture()
     return original_ICorJitInfo->getExpectedTargetArchitecture();
 }
 
+uint32_t interceptor_ICJI::getEmptyStringMdToken()
+{
+    mcs->AddCall("getEmptyStringMdToken");
+    return original_ICorJitInfo->getEmptyStringMdToken();
+}
+
 uint32_t interceptor_ICJI::getJitFlags(
           CORJIT_FLAGS* flags,
           uint32_t sizeInBytes)
diff --git a/src/coreclr/tools/superpmi/superpmi-shim-simple/icorjitinfo.cpp b/src/coreclr/tools/superpmi/superpmi-shim-simple/icorjitinfo.cpp
@@ -1203,6 +1203,11 @@ uint32_t interceptor_ICJI::getExpectedTargetArchitecture()
     return original_ICorJitInfo->getExpectedTargetArchitecture();
 }
 
+uint32_t interceptor_ICJI::getEmptyStringMdToken()
+{
+    return original_ICorJitInfo->getEmptyStringMdToken();
+}
+
 uint32_t interceptor_ICJI::getJitFlags(
           CORJIT_FLAGS* flags,
           uint32_t sizeInBytes)
diff --git a/src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp b/src/coreclr/tools/superpmi/superpmi/icorjitinfo.cpp
@@ -1864,3 +1864,10 @@ uint32_t MyICJI::getExpectedTargetArchitecture()
     DWORD result = jitInstance->mc->repGetExpectedTargetArchitecture();
     return result;
 }
+
+uint32_t MyICJI::getEmptyStringMdToken()
+{
+    jitInstance->mc->cr->AddCall("getEmptyStringMdToken");
+    DWORD result = jitInstance->mc->repGetEmptyStringMdToken();
+    return result;
+}
diff --git a/src/coreclr/vm/binder.cpp b/src/coreclr/vm/binder.cpp
@@ -1150,6 +1150,8 @@ void CoreLibBinder::SetDescriptions(Module * pModule,
 
     m_fieldDescriptions = pFieldDescriptions;
     m_cFields = nFields;
+
+    m_EmptyStrMdToken = 0;
 }
 
 void CoreLibBinder::AllocateTables()
diff --git a/src/coreclr/vm/binder.h b/src/coreclr/vm/binder.h
@@ -160,6 +160,11 @@ class CoreLibBinder
     static LPCUTF8 GetClassNameSpace(BinderClassID id);
     static LPCUTF8 GetClassName(BinderClassID id);
 
+    // Saved mdToken for empty string (""). It's needed
+    // mainly to replace string.Empty with "" on JIT side
+    static mdToken GetEmptyStringToken();
+    static void SetEmptyStringToken(mdToken token);
+
     //
     // Utilities for methods
     //
@@ -293,6 +298,8 @@ class CoreLibBinder
     USHORT m_cMethods;
     USHORT m_cFields;
 
+    mdToken m_EmptyStrMdToken;
+
     static CrstStatic s_SigConvertCrst;
 
 #ifdef _DEBUG
@@ -457,6 +464,18 @@ FORCEINLINE LPCUTF8 CoreLibBinder::GetClassName(BinderClassID id)
     return (&g_CoreLib)->m_classDescriptions[id].name;
 }
 
+FORCEINLINE mdToken CoreLibBinder::GetEmptyStringToken()
+{
+    LIMITED_METHOD_CONTRACT;
+    return (&g_CoreLib)->m_EmptyStrMdToken;
+}
+
+FORCEINLINE void CoreLibBinder::SetEmptyStringToken(mdToken token)
+{
+    LIMITED_METHOD_CONTRACT;
+    (&g_CoreLib)->m_EmptyStrMdToken = token;
+}
+
 FORCEINLINE LPCUTF8 CoreLibBinder::GetMethodName(BinderMethodID id)
 {
     LIMITED_METHOD_CONTRACT;
diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp
@@ -690,6 +690,13 @@ const char16_t* CEEInfo::getStringLiteral (
         {
             // For string.Empty pString will be null
             *length = dwCharCount;
+
+            // Save metaTOK for empty string (if from corelib)
+            if (dwCharCount == 0 && CoreLibBinder::GetModule() == module)
+            {
+                CoreLibBinder::SetEmptyStringToken(metaTOK);
+            }
+
             result = (const char16_t *)pString;
         }
         else
@@ -11340,10 +11347,15 @@ WORD CEEJitInfo::getRelocTypeHint(void * target)
 uint32_t CEEJitInfo::getExpectedTargetArchitecture()
 {
     LIMITED_METHOD_CONTRACT;
-
     return IMAGE_FILE_MACHINE_NATIVE;
 }
 
+uint32_t CEEJitInfo::getEmptyStringMdToken()
+{
+    LIMITED_METHOD_CONTRACT;
+    return (uint32_t)CoreLibBinder::GetEmptyStringToken();
+}
+
 bool CEEJitInfo::doesFieldBelongToClass(CORINFO_FIELD_HANDLE fldHnd, CORINFO_CLASS_HANDLE cls)
 {
     CONTRACTL {
@@ -14070,10 +14082,15 @@ WORD CEEInfo::getRelocTypeHint(void * target)
 uint32_t CEEInfo::getExpectedTargetArchitecture()
 {
     LIMITED_METHOD_CONTRACT;
-
     return IMAGE_FILE_MACHINE_NATIVE;
 }
 
+uint32_t CEEInfo::getEmptyStringMdToken()
+{
+    LIMITED_METHOD_CONTRACT;
+    return 0;
+}
+
 bool CEEInfo::doesFieldBelongToClass(CORINFO_FIELD_HANDLE fld, CORINFO_CLASS_HANDLE cls)
 {
     LIMITED_METHOD_CONTRACT;
diff --git a/src/coreclr/vm/jitinterface.h b/src/coreclr/vm/jitinterface.h
@@ -671,6 +671,8 @@ class CEEJitInfo : public CEEInfo
 
     uint32_t getExpectedTargetArchitecture() override final;
 
+    uint32_t getEmptyStringMdToken() override final;
+
     bool doesFieldBelongToClass(CORINFO_FIELD_HANDLE fld, CORINFO_CLASS_HANDLE cls) override final;
 
     void ResetForJitRetry()
diff --git a/src/libraries/System.Private.CoreLib/src/System/AppContext.cs b/src/libraries/System.Private.CoreLib/src/System/AppContext.cs

Original file line number	Diff line number	Diff line change
`@@ -3642,6 +3642,11 @@ private uint getExpectedTargetArchitecture()`
`3642`	`3642`	`}`
`3643`	`3643`	`}`
`3644`	`3644`
	`3645`	`+ private uint getEmptyStringMdToken()`
	`3646`	`+ {`
	`3647`	`+ return 0;`
	`3648`	`+ }`
	`3649`	`+`
`3645`	`3650`	`private bool doesFieldBelongToClass(CORINFO_FIELD_STRUCT_* fld, CORINFO_CLASS_STRUCT_* cls)`
`3646`	`3651`	`{`
`3647`	`3652`	`var field = HandleToObject(fld);`