Remove unused and unnecessary CLRConfigs.

src/coreclr/inc/clrconfigvalues.h

@@ -109,11 +109,6 @@
 // * W("UNSUPPORTED_Security_DisableTransparency")
 // * W("Security_LegacyHMACMode") <---------------------- (No EXTERNAL prefix)
 
-///
-/// AppDomain
-///
-CONFIG_DWORD_INFO(INTERNAL_EnableFullDebug, W("EnableFullDebug"), 0, "Heavy-weight checking for AD boundary violations (AD leaks)")
-
 ///
 /// Jit Pitching
 ///
@@ -397,8 +392,6 @@ CONFIG_DWORD_INFO(INTERNAL_MD_ApplyDeltaBreak, W("MD_ApplyDeltaBreak"), 0, "ASSE
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_AssertOnBadImageFormat, W("AssertOnBadImageFormat"), 0, "ASSERT when invalid MD read")
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_MD_DeltaCheck, W("MD_DeltaCheck"), 1, "Some checks of GUID when applying EnC (?)")
 CONFIG_DWORD_INFO(INTERNAL_MD_EncDelta, W("MD_EncDelta"), 0, "Forces EnC Delta format in MD (?)")
-RETAIL_CONFIG_DWORD_INFO(INTERNAL_MD_ForceNoColDesSharing, W("MD_ForceNoColDesSharing"), 0, "Don't know - the only usage I could find is #if 0 (?)")
-CONFIG_DWORD_INFO(INTERNAL_MD_KeepKnownCA, W("MD_KeepKnownCA"), 0, "Something with known CAs (?)")
 CONFIG_DWORD_INFO(INTERNAL_MD_MiniMDBreak, W("MD_MiniMDBreak"), 0, "ASSERT when creating CMiniMdRw class")
 CONFIG_DWORD_INFO(INTERNAL_MD_PreSaveBreak, W("MD_PreSaveBreak"), 0, "ASSERT when calling CMiniMdRw::PreSave")
 CONFIG_DWORD_INFO(INTERNAL_MD_RegMetaBreak, W("MD_RegMetaBreak"), 0, "ASSERT when creating RegMeta class")
@@ -455,7 +448,6 @@ CONFIG_DWORD_INFO(INTERNAL_TestOnlyEnableObjectAllocatedHook, W("TestOnlyEnableO
 CONFIG_DWORD_INFO(INTERNAL_TestOnlyEnableSlowELTHooks, W("TestOnlyEnableSlowELTHooks"), 0, "Test-only flag that forces CLR to initialize on startup as if slow-ELT were requested, to enable post-attach ELT functionality.")
 
 RETAIL_CONFIG_STRING_INFO(UNSUPPORTED_ETW_ObjectAllocationEventsPerTypePerSec, W("ETW_ObjectAllocationEventsPerTypePerSec"), "Desired number of GCSampledObjectAllocation ETW events to be logged per type per second.  If 0, then the default built in to the implementation for the enabled event (e.g., High, Low), will be used.")
-RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_ProfAPI_ValidateNGENInstrumentation, W("ProfAPI_ValidateNGENInstrumentation"), 0, "This flag enables additional validations when using the IMetaDataEmit APIs for NGEN'ed images to ensure only supported edits are made.")
 
 #ifdef FEATURE_PERFMAP
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_PerfMapEnabled, W("PerfMapEnabled"), 0, "This flag is used on Linux and macOS to enable writing /tmp/perf-$pid.map. It is disabled by default")
@@ -777,28 +769,18 @@ CONFIG_DWORD_INFO(INTERNAL_ActivatePatchSkip, W("ActivatePatchSkip"), 0, "Allows
 CONFIG_DWORD_INFO(INTERNAL_AlwaysUseMetadataInterfaceMapLayout, W("AlwaysUseMetadataInterfaceMapLayout"), 0, "Used for debugging generic interface map layout.")
 CONFIG_DWORD_INFO(INTERNAL_AssertOnUnneededThis, W("AssertOnUnneededThis"), 0, "While the ConfigDWORD is unnecessary, the contained ASSERT should be kept. This may result in some work tracking down violating MethodDescCallSites.")
 CONFIG_DWORD_INFO(INTERNAL_AssertStacktrace, W("AssertStacktrace"), 1, "")
-CONFIG_DWORD_INFO(INTERNAL_CPUFamily, W("CPUFamily"), 0xFFFFFFFF, "")
-CONFIG_DWORD_INFO(INTERNAL_CPUFeatures, W("CPUFeatures"), 0xFFFFFFFF, "")
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_DisableConfigCache, W("DisableConfigCache"), 0, "Used to disable the \"probabilistic\" config cache, which walks through the appropriate config registry keys on init and probabilistically keeps track of which exist.")
-RETAIL_CONFIG_DWORD_INFO(EXTERNAL_DisableStackwalkCache, W("DisableStackwalkCache"), 0, "")
 RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_DoubleArrayToLargeObjectHeap, W("DoubleArrayToLargeObjectHeap"), 0, "Controls double[] placement")
 CONFIG_STRING_INFO(INTERNAL_DumpOnClassLoad, W("DumpOnClassLoad"), "Dumps information about loaded class to log.")
 CONFIG_DWORD_INFO(INTERNAL_ExpandAllOnLoad, W("ExpandAllOnLoad"), 0, "")
 CONFIG_DWORD_INFO(INTERNAL_ForceRelocs, W("ForceRelocs"), 0, "")
 CONFIG_DWORD_INFO(INTERNAL_GenerateLongJumpDispatchStubRatio, W("GenerateLongJumpDispatchStubRatio"), 0, "Useful for testing VSD on AMD64")
-CONFIG_DWORD_INFO(INTERNAL_HostManagerConfig, W("HostManagerConfig"), (DWORD)-1, "")
 CONFIG_DWORD_INFO(INTERNAL_HostTestThreadAbort, W("HostTestThreadAbort"), 0, "")
 CONFIG_STRING_INFO(INTERNAL_InvokeHalt, W("InvokeHalt"), "Throws an assert when the given method is invoked through reflection.")
 CONFIG_DWORD_INFO(INTERNAL_MaxStubUnwindInfoSegmentSize, W("MaxStubUnwindInfoSegmentSize"), 0, "")
-CONFIG_DWORD_INFO(INTERNAL_MessageDebugOut, W("MessageDebugOut"), 0, "")
-RETAIL_CONFIG_DWORD_INFO(EXTERNAL_NativeImageRequire, W("NativeImageRequire"), 0, "")
-CONFIG_DWORD_INFO(INTERNAL_NestedEhOom, W("NestedEhOom"), 0, "")
-RETAIL_CONFIG_DWORD_INFO(EXTERNAL_NoProcedureSplitting, W("NoProcedureSplitting"), 0, "")
-CONFIG_DWORD_INFO(INTERNAL_PauseOnLoad, W("PauseOnLoad"), 0, "Stops in SystemDomain::init. I think it can be removed.")
 CONFIG_DWORD_INFO(INTERNAL_PerfAllocsSizeThreshold, W("PerfAllocsSizeThreshold"), 0x3FFFFFFF, "Log facility LF_GCALLOC logs object allocations. This flag controls which ones also log stacktraces. Predates ClrProfiler.")
 CONFIG_DWORD_INFO(INTERNAL_PerfNumAllocsThreshold, W("PerfNumAllocsThreshold"), 0x3FFFFFFF, "Log facility LF_GCALLOC logs object allocations. This flag controls which ones also log stacktraces. Predates ClrProfiler.")
 CONFIG_STRING_INFO(INTERNAL_PerfTypesToLog, W("PerfTypesToLog"), "Log facility LF_GCALLOC logs object allocations. This flag controls which ones also log stacktraces. Predates ClrProfiler.")
-RETAIL_CONFIG_DWORD_INFO(EXTERNAL_Prepopulate1, W("Prepopulate1"), 1, "")
 CONFIG_STRING_INFO(INTERNAL_PrestubGC, W("PrestubGC"), "")
 CONFIG_STRING_INFO(INTERNAL_PrestubHalt, W("PrestubHalt"), "")
 RETAIL_CONFIG_STRING_INFO(EXTERNAL_RestrictedGCStressExe, W("RestrictedGCStressExe"), "")
@@ -816,7 +798,6 @@ RETAIL_CONFIG_DWORD_INFO(EXTERNAL_ThreadGuardPages, W("ThreadGuardPages"), 0, ""
 RETAIL_CONFIG_DWORD_INFO(EXTERNAL_TraceWrap, W("TraceWrap"), 0, "")
 #endif
 
-CONFIG_DWORD_INFO(INTERNAL_VerifierOff, W("VerifierOff"), 0, "")
 // **
 // PLEASE MOVE ANY CONFIG SWITCH YOU OWN OUT OF THIS SECTION INTO A CATEGORY ABOVE
 //

src/coreclr/md/compiler/custattr_emit.cpp

@@ -1025,7 +1025,7 @@ HRESULT RegMeta::_HandleKnownCustomAttribute(    // S_OK or error.
     CQuickArray<BYTE>       qNativeType;// Native type string.
 
     _ASSERTE(ixCa > 0 && ixCa < CA_COUNT);
-    *bKeep = props->bKeepCa || m_bKeepKnownCa;
+    *bKeep = props->bKeepCa;
 
     // Validate that target is valid for attribute.
     tkObjType = TypeFromToken(tkObj);

src/coreclr/md/compiler/regmeta.cpp

@@ -66,7 +66,6 @@ RegMeta::RegMeta() :
     m_trLanguageType(0),
     m_SetAPICaller(EXTERNAL_CALLER),
     m_ModuleType(ValidatorModuleTypeInvalid),
-    m_bKeepKnownCa(false),
     m_ReorderingOptions(NoReordering)
 #ifdef FEATURE_METADATA_RELEASE_MEMORY_ON_REOPEN
     , m_safeToDeleteStgdb(true)
@@ -79,8 +78,6 @@ RegMeta::RegMeta() :
     {
         _ASSERTE(!"RegMeta()");
     }
-    if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_KeepKnownCA))
-        m_bKeepKnownCa = true;
 #endif // _DEBUG
 
 } // RegMeta::RegMeta()

src/coreclr/md/compiler/regmeta.h

@@ -2058,8 +2058,6 @@ class RegMeta :
     SHash<CustAttrHashTraits>   m_caHash;   // Hashed list of custom attribute types seen.
 #endif
 
-    bool        m_bKeepKnownCa;             // Should all known CA's be kept?
-
     MetaDataReorderingOptions m_ReorderingOptions;
 
 #ifdef FEATURE_METADATA_RELEASE_MEMORY_ON_REOPEN

src/coreclr/utilcode/loaderheap.cpp

@@ -1681,10 +1681,10 @@ void *UnlockedLoaderHeap::UnlockedAllocAlignedMem_NoThrow(size_t  dwRequestedSiz
     STATIC_CONTRACT_FAULT;
 
     // Set default value
-            if (pdwExtra)
-            {
-                *pdwExtra = 0;
-            }
+    if (pdwExtra)
+    {
+        *pdwExtra = 0;
+    }
 
     SHOULD_INJECT_FAULT(RETURN NULL);
 

src/coreclr/vm/appdomain.cpp

@@ -922,15 +922,6 @@ void SystemDomain::Init()
         CoreLibBinder::GetField(FIELD__THREAD_BLOCKING_INFO__OFFSET_OF_LOCK_OWNER_OS_THREAD_ID)
             ->SetStaticValue32(AwareLock::GetOffsetOfHoldingOSThreadId());
     }
-
-#ifdef _DEBUG
-    BOOL fPause = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_PauseOnLoad);
-
-    while (fPause)
-    {
-        ClrSleepEx(20, TRUE);
-    }
-#endif // _DEBUG
 }
 
 void SystemDomain::LazyInitGlobalStringLiteralMap()

src/coreclr/vm/codeman.cpp

@@ -1192,7 +1192,7 @@ EECodeGenManager::EECodeGenManager()
     m_cleanupList(NULL),
     // CRST_DEBUGGER_THREAD - We take this lock on debugger thread during EnC add method, among other things
     // CRST_TAKEN_DURING_SHUTDOWN - We take this lock during shutdown if ETW is on (to do rundown)
-    m_CodeHeapCritSec( CrstSingleUseLock, 
+    m_CodeHeapCritSec( CrstSingleUseLock,
                         CrstFlags(CRST_UNSAFE_ANYMODE|CRST_DEBUGGER_THREAD|CRST_TAKEN_DURING_SHUTDOWN)),
     m_storeRichDebugInfo(false)
 {
@@ -5142,11 +5142,11 @@ LPCWSTR ExecutionManager::GetJitName()
 {
     STANDARD_VM_CONTRACT;
 
-    LPCWSTR  pwzJitName = NULL;
-
     // Try to obtain a name for the jit library from the env. variable
-    IfFailThrow(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_JitName, const_cast<LPWSTR *>(&pwzJitName)));
+    LPWSTR pwzJitNameMaybe = NULL;
+    IfFailThrow(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_JitName, &pwzJitNameMaybe));
 
+    LPCWSTR  pwzJitName = pwzJitNameMaybe;
     if (NULL == pwzJitName)
     {
         pwzJitName = MAKEDLLNAME_W(W("clrjit"));
@@ -5165,11 +5165,11 @@ LPCWSTR ExecutionManager::GetInterpreterName()
 {
     STANDARD_VM_CONTRACT;
 
-    LPCWSTR  pwzInterpreterName = NULL;
-
     // Try to obtain a name for the jit library from the env. variable
-    IfFailThrow(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_InterpreterName, const_cast<LPWSTR *>(&pwzInterpreterName)));
+    LPWSTR pwzInterpreterNameMaybe = NULL;
+    IfFailThrow(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_InterpreterName, &pwzInterpreterNameMaybe));
 
+    LPCWSTR pwzInterpreterName = pwzInterpreterNameMaybe;
     if (NULL == pwzInterpreterName)
     {
         pwzInterpreterName = MAKEDLLNAME_W(W("clrinterpreter"));

src/coreclr/vm/eeconfig.cpp

@@ -133,7 +133,6 @@ HRESULT EEConfig::Init()
     pszBreakOnComToClrNativeInfoInit = 0;
     pszBreakOnStructMarshalSetup = 0;
     fJitVerificationDisable= false;
-    fVerifierOff           = false;
 
 #ifdef ENABLE_STARTUP_DELAY
     iStartupDelayMS = 0;
@@ -171,7 +170,6 @@ HRESULT EEConfig::Init()
 
     fSuppressChecks = false;
     fConditionalContracts = false;
-    fEnableFullDebug = false;
 #endif
 
 #ifdef FEATURE_DOUBLE_ALIGNMENT_HINT
@@ -557,10 +555,6 @@ HRESULT EEConfig::sync()
     Contract::SetUnconditionalContractEnforcement(!fConditionalContracts);
 #endif
 
-    fEnableFullDebug = (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_EnableFullDebug) != 0);
-
-    fVerifierOff    = (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_VerifierOff) != 0);
-
     fJitVerificationDisable = (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_JitVerificationDisable) != 0);
 #endif
 

src/coreclr/vm/eeconfig.h

@@ -321,9 +321,6 @@ class EEConfig
     unsigned SuspendDeadlockTimeout() const
     {LIMITED_METHOD_CONTRACT; return m_SuspendDeadlockTimeout; }
 
-    // Verifier
-    bool    IsVerifierOff()                 const {LIMITED_METHOD_CONTRACT;  return fVerifierOff; }
-
     inline bool fAssertOnBadImageFormat() const
     {LIMITED_METHOD_CONTRACT;  return m_fAssertOnBadImageFormat; }
 
@@ -333,9 +330,6 @@ class EEConfig
     inline bool SuppressChecks() const
     {LIMITED_METHOD_CONTRACT;  return fSuppressChecks; }
 
-    inline bool EnableFullDebug() const
-    {LIMITED_METHOD_CONTRACT;  return fEnableFullDebug; }
-
 #endif
 #ifdef ENABLE_STARTUP_DELAY
     inline int StartupDelayMS()
@@ -506,8 +500,6 @@ class EEConfig
 
     unsigned m_SuspendThreadDeadlockTimeoutMs;  // Used in Thread::SuspendThread()
     unsigned m_SuspendDeadlockTimeout; // Used in Thread::SuspendRuntime.
-
-    bool fEnableFullDebug;
 #endif // _DEBUG
 
 #ifdef FEATURE_COMINTEROP
@@ -527,10 +519,6 @@ class EEConfig
                                         // at load time.
     bool fJitVerificationDisable;       // Turn off jit verification (for testing purposes only)
 
-
-    // Verifier
-    bool fVerifierOff;
-
 #ifdef FEATURE_EH_FUNCLETS
     bool fSuppressLockViolationsOnReentryFromOS;
 #endif

src/coreclr/vm/i386/excepx86.cpp

@@ -763,11 +763,6 @@ CPFH_RealFirstPassHandler(                  // ExceptionContinueSearch, etc.
                 pNestedExInfo = new (nothrow) ExInfo();     // Very rare failure here; need robust allocator.
                 if (pNestedExInfo == NULL)
                 {   // if we can't allocate memory, we can't correctly continue.
-                    #if defined(_DEBUG)
-                    if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_NestedEhOom))
-                        _ASSERTE(!"OOM in callback from unmanaged filter.");
-                    #endif // _DEBUG
-
                     EEPOLICY_HANDLE_FATAL_ERROR(COR_E_OUTOFMEMORY);
                 }
 

src/coreclr/vm/rejit.inl

@@ -20,23 +20,27 @@ inline void ReJitManager::InitStatic()
     s_csGlobalRequest.Init(CrstReJITGlobalRequest);
 }
 
+static BOOL RejitOnAttachEnabled()
+{
+    LIMITED_METHOD_CONTRACT;
+
+    static ConfigDWORD rejitOnAttachEnabled;
+    return rejitOnAttachEnabled.val(CLRConfig::EXTERNAL_ProfAPI_RejitOnAttach) != 0;
+}
+
 // static
 inline BOOL ReJitManager::IsReJITEnabled()
 {
     LIMITED_METHOD_CONTRACT;
 
     static bool profilerStartupRejit = CORProfilerEnableRejit() != FALSE;
-    static ConfigDWORD rejitOnAttachEnabled;
-
-    return  profilerStartupRejit || (rejitOnAttachEnabled.val(CLRConfig::EXTERNAL_ProfAPI_RejitOnAttach) != 0);
+    return  profilerStartupRejit || RejitOnAttachEnabled();
 }
 
 inline BOOL ReJitManager::IsReJITInlineTrackingEnabled()
 {
     LIMITED_METHOD_CONTRACT;
-
-    static ConfigDWORD rejitInliningEnabled;
-    return rejitInliningEnabled.val(CLRConfig::EXTERNAL_ProfAPI_RejitOnAttach) != 0;
+    return RejitOnAttachEnabled();
 }
 
 #ifndef DACCESS_COMPILE