Remove some instances of %S and %ls (#78894)

* Remove unused NativeImagePerfMap * Allocate enough for UTF8 conversion * Missed VariantAsString API. Change local `sFlags` to generic `szTempBuf` * Remove all "entry point" logging for metadata APIs.
dotnet · Jan 3, 2023 · ad4bdd1 · ad4bdd1
1 parent 435bff2
commit ad4bdd1
Show file tree

Hide file tree

Showing 45 changed files with 332 additions and 906 deletions.
diff --git a/src/coreclr/debug/ee/controller.cpp b/src/coreclr/debug/ee/controller.cpp
@@ -2168,7 +2168,7 @@ void DebuggerController::RemovePatchesFromModule(Module *pModule, AppDomain *pAp
     }
     CONTRACTL_END;
 
-    LOG((LF_CORDB, LL_INFO100000, "DPT::CPFM mod:0x%p (%S)\n",
+    LOG((LF_CORDB, LL_INFO100000, "DPT::CPFM mod:0x%p (%s)\n",
         pModule, pModule->GetDebugName()));
 
     // First find all patches of interest
@@ -7398,14 +7398,14 @@ void DebuggerStepper::TriggerMethodEnter(Thread * thread,
             "See http://team/sites/clrdev/Devdocs/StubManagers.rtf for more information on StubManagers.\n"
             "Stepper this=0x%p, startMethod='%s::%s'\n"
             "---------------------------------\n"
-            "Stub manager log:\n%S"
+            "Stub manager log:\n%s"
             "\n"
             "The thread is now in managed method '%s::%s'.\n"
             "---------------------------------\n",
             this,
             ((m_StepInStartMethod == NULL) ? "unknown" : m_StepInStartMethod->m_pszDebugClassName),
             ((m_StepInStartMethod == NULL) ? "unknown" : m_StepInStartMethod->m_pszDebugMethodName),
-            sLog.GetUnicode(),
+            sLog.GetUTF8(),
             pDesc->m_pszDebugClassName, pDesc->m_pszDebugMethodName
             ));
     }
@@ -8707,8 +8707,8 @@ DebuggerEnCBreakpoint::DebuggerEnCBreakpoint(SIZE_T offset,
     _ASSERTE( jitInfo != NULL );
     // Add and activate the specified patch
     AddBindAndActivateNativeManagedPatch(jitInfo->m_nativeCodeVersion.GetMethodDesc(), jitInfo, offset, LEAF_MOST_FRAME, pAppDomain);
-    LOG((LF_ENC,LL_INFO1000, "DEnCBPDEnCBP::adding %S patch!\n",
-        fTriggerType == REMAP_PENDING ? W("remap pending") : W("remap complete")));
+    LOG((LF_ENC,LL_INFO1000, "DEnCBPDEnCBP::adding %s patch!\n",
+        fTriggerType == REMAP_PENDING ? "remap pending" : "remap complete"));
 }
 
 
@@ -8749,9 +8749,9 @@ TP_RESULT DebuggerEnCBreakpoint::TriggerPatch(DebuggerControllerPatch *patch,
     _ASSERTE(map == MAPPING_EXACT);
 
     LOG((LF_ENC, LL_ALWAYS,
-         "DEnCBP::TP: triggered E&C %S breakpoint: tid=0x%x, module=0x%08x, "
+         "DEnCBP::TP: triggered E&C %s breakpoint: tid=0x%x, module=0x%08x, "
          "method def=0x%08x, version=%d, native offset=0x%x, IL offset=0x%x\n this=0x%x\n",
-         m_fTriggerType == REMAP_PENDING ? W("ResumePending") : W("ResumeComplete"),
+         m_fTriggerType == REMAP_PENDING ? "ResumePending" : "ResumeComplete",
          thread, module, md, m_jitInfo->m_encVersion, offset, currentIP, this));
 
     // If this is a REMAP_COMPLETE patch, then dispatch the RemapComplete callback

diff --git a/src/coreclr/debug/ee/debugger.cpp b/src/coreclr/debug/ee/debugger.cpp
@@ -9335,7 +9335,7 @@ void Debugger::LoadAssembly(DomainAssembly * pDomainAssembly)
     if (CORDBUnrecoverableError(this))
         return;
 
-    LOG((LF_CORDB, LL_INFO100, "D::LA: Load Assembly Asy:0x%p AD:0x%p which:%ls\n",
+    LOG((LF_CORDB, LL_INFO100, "D::LA: Load Assembly Asy:0x%p AD:0x%p which:%s\n",
         pDomainAssembly, pDomainAssembly->GetAppDomain(), pDomainAssembly->GetAssembly()->GetDebugName() ));
 
     if (!CORDebuggerAttached())
@@ -9391,7 +9391,7 @@ void Debugger::UnloadAssembly(DomainAssembly * pDomainAssembly)
     if (CORDBUnrecoverableError(this))
         return;
 
-    LOG((LF_CORDB, LL_INFO100, "D::UA: Unload Assembly Asy:0x%p AD:0x%p which:%ls\n",
+    LOG((LF_CORDB, LL_INFO100, "D::UA: Unload Assembly Asy:0x%p AD:0x%p which:%s\n",
          pDomainAssembly, pDomainAssembly->GetAppDomain(), pDomainAssembly->GetAssembly()->GetDebugName() ));
 
     Thread *thread = g_pEEInterface->GetThread();
@@ -9676,7 +9676,7 @@ void Debugger::UnloadModule(Module* pRuntimeModule,
 
 
 
-    LOG((LF_CORDB, LL_INFO100, "D::UM: unload module Mod:%#08x AD:%#08x runtimeMod:%#08x modName:%ls\n",
+    LOG((LF_CORDB, LL_INFO100, "D::UM: unload module Mod:%#08x AD:%#08x runtimeMod:%#08x modName:%s\n",
          LookupOrCreateModule(pRuntimeModule, pAppDomain), pAppDomain, pRuntimeModule, pRuntimeModule->GetDebugName()));
 
 
@@ -9689,7 +9689,7 @@ void Debugger::UnloadModule(Module* pRuntimeModule,
         DebuggerModule* module = LookupOrCreateModule(pRuntimeModule, pAppDomain);
         if (module == NULL)
         {
-            LOG((LF_CORDB, LL_INFO100, "D::UM: module already unloaded AD:%#08x runtimeMod:%#08x modName:%ls\n",
+            LOG((LF_CORDB, LL_INFO100, "D::UM: module already unloaded AD:%#08x runtimeMod:%#08x modName:%s\n",
                  pAppDomain, pRuntimeModule, pRuntimeModule->GetDebugName()));
             goto LExit;
         }
@@ -9776,7 +9776,7 @@ void Debugger::DestructModule(Module *pModule)
     }
     CONTRACTL_END;
 
-    LOG((LF_CORDB, LL_INFO100, "D::DM: destruct module runtimeMod:%#08x modName:%ls\n",
+    LOG((LF_CORDB, LL_INFO100, "D::DM: destruct module runtimeMod:%#08x modName:%s\n",
          pModule, pModule->GetDebugName()));
 
     // @@@
@@ -10002,7 +10002,7 @@ BOOL  Debugger::LoadClass(TypeHandle th,
     // handle this in SendSystemClassLoadUnloadEvent below by looping through all AppDomains and dispatching
     // events for each that contain this assembly.
 
-    LOG((LF_CORDB, LL_INFO10000, "D::LC: load class Tok:%#08x Mod:%#08x AD:%#08x classMod:%#08x modName:%ls\n",
+    LOG((LF_CORDB, LL_INFO10000, "D::LC: load class Tok:%#08x Mod:%#08x AD:%#08x classMod:%#08x modName:%s\n",
          classMetadataToken, (pAppDomain == NULL) ? NULL : LookupOrCreateModule(classModule, pAppDomain),
          pAppDomain, classModule, classModule->GetDebugName()));
 
@@ -10057,7 +10057,7 @@ void Debugger::UnloadClass(mdTypeDef classMetadataToken,
         return;
     }
 
-    LOG((LF_CORDB, LL_INFO10000, "D::UC: unload class Tok:0x%08x Mod:%#08x AD:%#08x runtimeMod:%#08x modName:%ls\n",
+    LOG((LF_CORDB, LL_INFO10000, "D::UC: unload class Tok:0x%08x Mod:%#08x AD:%#08x runtimeMod:%#08x modName:%s\n",
          classMetadataToken, LookupOrCreateModule(classModule, pAppDomain), pAppDomain, classModule, classModule->GetDebugName()));
 
     Assembly *pAssembly = classModule->GetClassLoader()->GetAssembly();
@@ -14653,10 +14653,6 @@ HRESULT Debugger::UpdateAppDomainEntryInIPC(AppDomain *pAppDomain)
     szName = pADInfo->m_pAppDomain->GetFriendlyNameForDebugger();
     pADInfo->SetName(szName);
 
-    LOG((LF_CORDB, LL_INFO100,
-         "D::UADEIIPC: New name:%ls (AD:0x%x)\n", pADInfo->m_szAppDomainName,
-         pAppDomain));
-
 ErrExit:
     // UnLock the list
     m_pAppDomainCB->Unlock();

diff --git a/src/coreclr/debug/ee/functioninfo.cpp b/src/coreclr/debug/ee/functioninfo.cpp
@@ -2266,7 +2266,7 @@ void DebuggerMethodInfoTable::ClearMethodsOfModule(Module *pModule)
 
     _ASSERTE(g_pDebugger->HasDebuggerDataLock());
 
-    LOG((LF_CORDB, LL_INFO1000000, "CMOM:mod:0x%x (%S)\n", pModule
+    LOG((LF_CORDB, LL_INFO1000000, "CMOM:mod:0x%x (%s)\n", pModule
         ,pModule->GetDebugName()));
 
     HASHFIND info;

diff --git a/src/coreclr/inc/ceesectionstring.h b/src/coreclr/inc/ceesectionstring.h
@@ -39,10 +39,6 @@ class CeeSectionString : public CeeSection {
 	StringTableEntry *findStringInsert(
 				StringTableEntry *&entry, _In_z_ LPWSTR targetValue, ULONG hashId);
 	void deleteEntries(StringTableEntry *e);
-#ifdef RDATA_STATS
-	int dumpEntries(StringTableEntry *e);
-	void dumpTable();
-#endif
 
   public:
 	~CeeSectionString();

diff --git a/src/coreclr/inc/clrconfigvalues.h b/src/coreclr/inc/clrconfigvalues.h
@@ -486,7 +486,6 @@ RETAIL_CONFIG_DWORD_INFO(EXTERNAL_PerfMapEnabled, W("PerfMapEnabled"), 0, "This
 RETAIL_CONFIG_STRING_INFO(EXTERNAL_PerfMapJitDumpPath, W("PerfMapJitDumpPath"), "Specifies a path to write the perf jitdump file. Defaults to GetTempPathA()")
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_PerfMapIgnoreSignal, W("PerfMapIgnoreSignal"), 0, "When perf map is enabled, this option will configure the specified signal to be accepted and ignored as a marker in the perf logs.  It is disabled by default")
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_PerfMapShowOptimizationTiers, W("PerfMapShowOptimizationTiers"), 1, "Shows optimization tiers in the perf map for methods, as part of the symbol name. Useful for seeing separate stack frames for different optimization tiers of each method.")
-RETAIL_CONFIG_STRING_INFO(EXTERNAL_NativeImagePerfMapFormat, W("NativeImagePerfMapFormat"), "Specifies the format of native image perfmap files generated by crossgen.  Valid options are RVA or OFFSET.")
 #endif
 
 RETAIL_CONFIG_STRING_INFO(EXTERNAL_StartupDelayMS, W("StartupDelayMS"), "")

diff --git a/src/coreclr/jit/importervectorization.cpp b/src/coreclr/jit/importervectorization.cpp
@@ -845,7 +845,7 @@ GenTree* Compiler::impSpanEqualsOrStartsWith(bool startsWith, CORINFO_SIG_INFO*
     {
         // check for fake "" first
         cnsLength = 0;
-        JITDUMP("Trying to unroll MemoryExtensions.Equals|SequenceEqual|StartsWith(op1, \"\")...\n", str)
+        JITDUMP("Trying to unroll MemoryExtensions.Equals|SequenceEqual|StartsWith(op1, \"\")...\n")
     }
     else
     {

diff --git a/src/coreclr/md/ceefilegen/ceesectionstring.cpp b/src/coreclr/md/ceefilegen/ceesectionstring.cpp
@@ -28,37 +28,8 @@ void CeeSectionString::deleteEntries(StringTableEntry *e)
     delete e;
 }
 
-#ifdef RDATA_STATS
-int CeeSectionString::dumpEntries(StringTableEntry *e)
-{
-    if (!e)
-        return 0;
-    else {
-        printf("    HashId: %d, value: %S\n", e->m_hashId, computOffset(e->m_offset));
-        return dumpEntries(e->m_next) + 1;
-    }
-}
-
-void CeeSectionString::dumpTable()
-{
-    int sum = 0, count = 0;
-    for (int i=0; i < MaxRealEntries; i++) {
-        if (stringTable[i]) {
-            printf("Bucket %d\n", i);
-            printf("Total size: %d\n\n",
-                    count = dumpEntries(stringTable[i]));
-            sum += count;
-        }
-    }
-    printf("Total number strings: %d\n\n", sum);
-}
-#endif
-
 CeeSectionString::~CeeSectionString()
 {
-#ifdef RDATA_STATS
-    dumpTable();
-#endif
     for (int i=0; i < MaxRealEntries; i++)
         deleteEntries(stringTable[i]);
 }

diff --git a/src/coreclr/md/compiler/assemblymd.cpp b/src/coreclr/md/compiler/assemblymd.cpp
@@ -38,10 +38,6 @@ STDMETHODIMP RegMeta::GetAssemblyProps(       // S_OK or error.
     AssemblyRec *pRecord;
     CMiniMdRW   *pMiniMd = &(m_pStgdb->m_MiniMd);
 
-    LOG((LOGMD, "RegMeta::GetAssemblyProps(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x)\n",
-        mda, ppbPublicKey, pcbPublicKey, pulHashAlgId, szName, cchName, pchName, pMetaData,
-        pdwAssemblyFlags));
-
     LOCKREAD();
 
     _ASSERTE(TypeFromToken(mda) == mdtAssembly && RidFromToken(mda));
@@ -102,10 +98,6 @@ STDMETHODIMP RegMeta::GetAssemblyRefProps(    // S_OK or error.
     AssemblyRefRec  *pRecord;
     CMiniMdRW   *pMiniMd = &(m_pStgdb->m_MiniMd);
 
-    LOG((LOGMD, "RegMeta::GetAssemblyRefProps(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x)\n",
-        mdar, ppbPublicKeyOrToken, pcbPublicKeyOrToken, szName, cchName,
-        pchName, pMetaData, ppbHashValue, pdwAssemblyRefFlags));
-
     LOCKREAD();
 
     _ASSERTE(TypeFromToken(mdar) == mdtAssemblyRef && RidFromToken(mdar));
@@ -156,9 +148,6 @@ STDMETHODIMP RegMeta::GetFileProps(     // S_OK or error.
     FileRec   *pRecord;
     CMiniMdRW *pMiniMd = &(m_pStgdb->m_MiniMd);
 
-    LOG((LOGMD, "RegMeta::GetFileProps(%#08x, %#08x, %#08x, %#08x, %#08x, %#08x, %#08x)\n",
-        mdf, szName, cchName, pchName, ppbHashValue, pcbHashValue, pdwFileFlags));
-
     LOCKREAD();
 
     _ASSERTE(TypeFromToken(mdf) == mdtFile && RidFromToken(mdf));
@@ -198,10 +187,6 @@ STDMETHODIMP RegMeta::GetExportedTypeProps(   // S_OK or error.
     CMiniMdRW   *pMiniMd = &(m_pStgdb->m_MiniMd);
     int         bTruncation=0;          // Was there name truncation?
 
-    LOG((LOGMD, "RegMeta::GetExportedTypeProps(%#08x, %#08x, %#08x, %#08x, %#08x, %#08x, %#08x)\n",
-        mdct, szName, cchName, pchName,
-        ptkImplementation, ptkTypeDef, pdwExportedTypeFlags));
-
     LOCKREAD();
 
     _ASSERTE(TypeFromToken(mdct) == mdtExportedType && RidFromToken(mdct));
@@ -269,12 +254,6 @@ STDMETHODIMP RegMeta::GetManifestResourceProps(   // S_OK or error.
     ManifestResourceRec *pRecord;
     CMiniMdRW   *pMiniMd = &(m_pStgdb->m_MiniMd);
 
-    LOG((LOGMD, "RegMeta::GetManifestResourceProps("
-        "%#08x, %#08x, %#08x, %#08x, %#08x, %#08x, %#08x)\n",
-        mdmr, szName, cchName, pchName,
-        ptkImplementation, pdwOffset,
-        pdwResourceFlags));
-
     LOCKREAD();
 
     _ASSERTE(TypeFromToken(mdmr) == mdtManifestResource && RidFromToken(mdmr));
@@ -308,9 +287,6 @@ STDMETHODIMP RegMeta::EnumAssemblyRefs(       // S_OK or error
     HENUMInternal       **ppmdEnum = reinterpret_cast<HENUMInternal **> (phEnum);
     HENUMInternal       *pEnum;
 
-    LOG((LOGMD, "MD RegMeta::EnumAssemblyRefs(%#08x, %#08x, %#08x, %#08x)\n",
-        phEnum, rAssemblyRefs, cMax, pcTokens));
-
     LOCKREAD();
 
     if (*ppmdEnum == 0)
@@ -353,8 +329,6 @@ STDMETHODIMP RegMeta::EnumFiles(              // S_OK or error
     HENUMInternal       **ppmdEnum = reinterpret_cast<HENUMInternal **> (phEnum);
     HENUMInternal       *pEnum;
 
-    LOG((LOGMD, "MD RegMeta::EnumFiles(%#08x, %#08x, %#08x, %#08x)\n",
-        phEnum, rFiles, cMax, pcTokens));
     LOCKREAD();
 
     if (*ppmdEnum == 0)
@@ -397,9 +371,6 @@ STDMETHODIMP RegMeta::EnumExportedTypes(           // S_OK or error
     HENUMInternal       **ppmdEnum = reinterpret_cast<HENUMInternal **> (phEnum);
     HENUMInternal       *pEnum = NULL;
 
-    LOG((LOGMD, "MD RegMeta::EnumExportedTypes(%#08x, %#08x, %#08x, %#08x)\n",
-        phEnum, rExportedTypes, cMax, pcTokens));
-
     LOCKREAD();
 
     if (*ppmdEnum == 0)
@@ -464,9 +435,6 @@ STDMETHODIMP RegMeta::EnumManifestResources(  // S_OK or error
     HENUMInternal       **ppmdEnum = reinterpret_cast<HENUMInternal **> (phEnum);
     HENUMInternal       *pEnum;
 
-    LOG((LOGMD, "MD RegMeta::EnumManifestResources(%#08x, %#08x, %#08x, %#08x)\n",
-        phEnum, rManifestResources, cMax, pcTokens));
-
     LOCKREAD();
 
     if (*ppmdEnum == 0)
@@ -504,7 +472,6 @@ STDMETHODIMP RegMeta::GetAssemblyFromScope(   // S_OK or error
     HRESULT     hr = NOERROR;
     CMiniMdRW   *pMiniMd = NULL;
 
-    LOG((LOGMD, "MD RegMeta::GetAssemblyFromScope(%#08x)\n", ptkAssembly));
     LOCKREAD();
     _ASSERTE(ptkAssembly);
 
@@ -534,12 +501,8 @@ STDMETHODIMP RegMeta::FindExportedTypeByName( // S_OK or error
     CMiniMdRW   *pMiniMd = NULL;
     LPSTR       szNameUTF8 = NULL;
 
-    LOG((LOGMD, "MD RegMeta::FindExportedTypeByName(%S, %#08x, %#08x)\n",
-        MDSTR(szName), tkEnclosingType, ptkExportedType));
-
     LOCKREAD();
 
-
     // Validate name for prefix.
     if (!szName)
         IfFailGo(E_INVALIDARG);
@@ -574,12 +537,8 @@ STDMETHODIMP RegMeta::FindManifestResourceByName( // S_OK or error
     LPCUTF8     szNameTmp = NULL;
     CMiniMdRW   *pMiniMd = NULL;
 
-    LOG((LOGMD, "MD RegMeta::FindManifestResourceByName(%S, %#08x)\n",
-        MDSTR(szName), ptkManifestResource));
-
     LOCKREAD();
 
-
     // Validate name for prefix.
     if (!szName)
         IfFailGo(E_INVALIDARG);
@@ -624,11 +583,6 @@ STDMETHODIMP RegMeta::FindAssembliesByName( // S_OK or error
         ULONG    *pcAssemblies)       // [OUT] The number of assemblies returned.
 {
 #ifdef FEATURE_METADATA_IN_VM
-    LOG((LOGMD, "RegMeta::FindAssembliesByName(0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x, 0x%08x)\n",
-        szAppBase, szPrivateBin, szAssemblyName, ppIUnk, cMax, pcAssemblies));
-
-    // No need to lock this function. It is going through fusion to find the matching Assemblies by name
-
     return COR_E_NOTSUPPORTED;
 #else //!FEATURE_METADATA_IN_VM
     // Calls to fusion are not supported outside VM