Cleanup after GC info version update.

src/coreclr/inc/clrconfigvalues.h

@@ -507,7 +507,6 @@ CONFIG_DWORD_INFO(INTERNAL_DiagnosticSuspend, W("DiagnosticSuspend"), 0, "")
 CONFIG_DWORD_INFO(INTERNAL_SuspendDeadlockTimeout, W("SuspendDeadlockTimeout"), 40000, "")
 CONFIG_DWORD_INFO(INTERNAL_SuspendThreadDeadlockTimeoutMs, W("SuspendThreadDeadlockTimeoutMs"), 2000, "")
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_ThreadSuspendInjection, W("INTERNAL_ThreadSuspendInjection"), 1, "Specifies whether to inject activations for thread suspension on Unix")
-RETAIL_CONFIG_DWORD_INFO(INTERNAL_InterruptibleCallSites, W("InterruptibleCallSites"), 1, "Specifies whether to allow asynchronous thread interruptions at call sites (requires GCInfo v3)")
 
 ///
 /// Thread (miscellaneous)

src/coreclr/inc/eetwain.h

@@ -457,9 +457,6 @@ virtual
 bool IsGcSafe(  EECodeInfo     *pCodeInfo,
                 DWORD           dwRelOffset);
 
-static
-bool InterruptibleSafePointsEnabled();
-
 #if defined(TARGET_ARM) || defined(TARGET_ARM64) || defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
 virtual
 bool HasTailCalls(EECodeInfo *pCodeInfo);

src/coreclr/inc/gcinfo.h

@@ -67,14 +67,6 @@ struct GCInfoToken
 
     static uint32_t ReadyToRunVersionToGcInfoVersion(uint32_t readyToRunMajorVersion, uint32_t readyToRunMinorVersion)
     {
-        // Once MINIMUM_READYTORUN_MAJOR_VERSION is bumped to 10+
-        // delete the following and just return GCINFO_VERSION
-        //
-        // R2R 9.0 and 9.1 use GCInfo v2
-        // R2R 9.2 uses GCInfo v3
-        if (readyToRunMajorVersion == 9 && readyToRunMinorVersion < 2)
-            return 2;
-
         return GCINFO_VERSION;
     }
 };

src/coreclr/inc/gcinfodecoder.h

@@ -528,11 +528,9 @@ class GcInfoDecoder
 
 #ifdef PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED
     bool IsSafePoint();
-    bool AreSafePointsInterruptible();
-    bool IsInterruptibleSafePoint();
-    bool CouldBeInterruptibleSafePoint();
+    bool CouldBeSafePoint();
 
-    // This is used for gccoverage
+    // This is used for gcinfodumper
     bool IsSafePoint(UINT32 codeOffset);
 
     typedef void EnumerateSafePointsCallback (GcInfoDecoder* decoder, UINT32 offset, void * hCallback);

src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

@@ -196,7 +196,7 @@ bool UnixNativeCodeManager::IsSafePoint(PTR_VOID pvAddress)
     if (decoder.IsInterruptible())
         return true;
 
-    if (decoder.IsInterruptibleSafePoint())
+    if (decoder.IsSafePoint())
         return true;
 
     return false;
@@ -246,7 +246,7 @@ void UnixNativeCodeManager::EnumGcRefs(MethodInfo *    pMethodInfo,
                 codeOffset - 1
             );
 
-            assert(decoder.IsInterruptibleSafePoint());
+            assert(decoder.IsSafePoint());
         }
     }
 

src/coreclr/nativeaot/Runtime/windows/CoffNativeCodeManager.cpp

@@ -418,7 +418,7 @@ bool CoffNativeCodeManager::IsSafePoint(PTR_VOID pvAddress)
     if (decoder.IsInterruptible())
         return true;
 
-    if (decoder.IsInterruptibleSafePoint())
+    if (decoder.IsSafePoint())
         return true;
 
     return false;
@@ -479,7 +479,7 @@ void CoffNativeCodeManager::EnumGcRefs(MethodInfo *    pMethodInfo,
                 codeOffset - 1
             );
 
-            assert(decoder.IsInterruptibleSafePoint());
+            assert(decoder.IsSafePoint());
         }
     }
 

src/coreclr/vm/codeman.h

@@ -2570,10 +2570,6 @@ class EECodeInfo
 
     void         GetOffsetsFromUnwindInfo(ULONG* pRSPOffset, ULONG* pRBPOffset);
     ULONG        GetFrameOffsetFromUnwindInfo();
-#if defined(_DEBUG) && defined(HAVE_GCCOVER)
-    // Find first funclet inside (pvFuncletStart, pvFuncletStart + cbCode)
-    static LPVOID findNextFunclet (LPVOID pvFuncletStart, SIZE_T cbCode, LPVOID *ppvFuncletEnd);
-#endif // _DEBUG && HAVE_GCCOVER
 #endif // TARGET_AMD64
 
 private:

src/coreclr/vm/eetwain.cpp

@@ -846,21 +846,12 @@ bool EECodeManager::IsGcSafe( EECodeInfo     *pCodeInfo,
     if (gcInfoDecoder.IsInterruptible())
         return true;
 
-    if (InterruptibleSafePointsEnabled() && gcInfoDecoder.IsInterruptibleSafePoint())
+    if (gcInfoDecoder.IsSafePoint())
         return true;
 
     return false;
 }
 
-bool EECodeManager::InterruptibleSafePointsEnabled()
-{
-    LIMITED_METHOD_CONTRACT;
-
-    // zero initialized
-    static ConfigDWORD interruptibleCallSitesEnabled;
-    return interruptibleCallSitesEnabled.val(CLRConfig::INTERNAL_InterruptibleCallSites) != 0;
-}
-
 #if defined(TARGET_ARM) || defined(TARGET_ARM64) || defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
 bool EECodeManager::HasTailCalls( EECodeInfo     *pCodeInfo)
 {
@@ -1431,8 +1422,7 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pRD,
                             DECODE_INTERRUPTIBILITY,
                             curOffs
                             );
-        _ASSERTE(_gcInfoDecoder.IsInterruptible() ||
-            (InterruptibleSafePointsEnabled() && _gcInfoDecoder.CouldBeInterruptibleSafePoint()));
+        _ASSERTE(_gcInfoDecoder.IsInterruptible() || _gcInfoDecoder.CouldBeSafePoint());
     }
 #endif
 
@@ -1535,7 +1525,7 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pRD,
                 curOffs - 1
             );
 
-            _ASSERTE((InterruptibleSafePointsEnabled() && gcInfoDecoder.CouldBeInterruptibleSafePoint()));
+            _ASSERTE(gcInfoDecoder.CouldBeSafePoint());
         }
     }