Remove unused code in marshalnative. (dotnet/coreclr#26689)

Commit migrated from https://github.com/dotnet/coreclr/commit/46348ff653f38749e87f5939c134fcdc832cb646

diff --git a/src/coreclr/src/vm/marshalnative.cpp b/src/coreclr/src/vm/marshalnative.cpp
index 2f4a8d9403f6e46670907971b0c119b7b31f9653..349fb1b9912b97f9ef3991ce70cad2066a65efff 100644 (file)
--- a/src/coreclr/src/vm/marshalnative.cpp
+++ b/src/coreclr/src/vm/marshalnative.cpp
@@ -422,69 +422,6 @@ FCIMPL1(LPVOID, MarshalNative::GetFunctionPointerForDelegateInternal, Object* re
 }
 FCIMPLEND
 
-//====================================================================
-// map a fiber cookie from the hosting APIs into a managed Thread object
-//====================================================================
-FCIMPL1(THREADBASEREF, MarshalNative::GetThreadFromFiberCookie, int cookie)
-{
-    FCALL_CONTRACT;
-
-    _ASSERTE(cookie);
-
-    THREADBASEREF ret = 0;
-    
-    // Set up a frame
-    HELPER_METHOD_FRAME_BEGIN_RET_0();
-
-    // Any host who is sophisticated enough to correctly schedule fibers
-    // had better be sophisticated enough to give us a real fiber cookie.
-    Thread  *pThread = *((Thread **) &cookie);
-    
-    // Minimal check that it smells like a thread:
-    _ASSERTE(pThread->m_fPreemptiveGCDisabled.Load() == 0 || pThread->m_fPreemptiveGCDisabled.Load() == 1);
-    
-    ret = (THREADBASEREF)(pThread->GetExposedObject()); 
-    HELPER_METHOD_FRAME_END();
-
-    return ret;
-}
-FCIMPLEND
-
-FCIMPL3(LPVOID, MarshalNative::GetUnmanagedThunkForManagedMethodPtr, LPVOID pfnMethodToWrap, PCCOR_SIGNATURE pbSignature, ULONG cbSignature)
-{
-    CONTRACTL
-    {
-        FCALL_CHECK;
-        INJECT_FAULT(FCThrow(kOutOfMemoryException););
-        PRECONDITION(CheckPointer(pfnMethodToWrap, NULL_OK));
-        PRECONDITION(CheckPointer(pbSignature, NULL_OK));
-    }
-    CONTRACTL_END;
-
-    LPVOID pThunk = NULL;
-    return pThunk;
-}
-FCIMPLEND
-
-
-/************************************************************************
- * PInvoke.GetManagedThunkForUnmanagedMethodPtr()
- */
-FCIMPL3(LPVOID, MarshalNative::GetManagedThunkForUnmanagedMethodPtr, LPVOID pfnMethodToWrap, PCCOR_SIGNATURE pbSignature, ULONG cbSignature)
-{
-    CONTRACTL
-    {
-        FCALL_CHECK;
-        PRECONDITION(CheckPointer(pfnMethodToWrap, NULL_OK));
-        PRECONDITION(CheckPointer(pbSignature, NULL_OK));
-    }
-    CONTRACTL_END;
-
-    LPVOID pThunk = NULL;
-    return pThunk;
-}
-FCIMPLEND
-
 /************************************************************************
  * PInvoke.GetLastWin32Error
  */

diff --git a/src/coreclr/src/vm/marshalnative.h b/src/coreclr/src/vm/marshalnative.h
index 089ed6c4a0594bf145e8fc8a57cb9ab1b49309b9..497817bcfbc3cd3899664d77032f60de4f4a5f7d 100644 (file)
--- a/src/coreclr/src/vm/marshalnative.h
+++ b/src/coreclr/src/vm/marshalnative.h
@@ -60,14 +60,6 @@ public:
 
     static FCDECL1(FC_BOOL_RET, IsPinnable, Object* obj);
 
-    //====================================================================
-    // map a fiber cookie from the hosting APIs into a managed Thread object
-    //====================================================================
-    static FCDECL1(THREADBASEREF, GetThreadFromFiberCookie, int cookie);
-
-    static FCDECL3(LPVOID, GetUnmanagedThunkForManagedMethodPtr, LPVOID pfnMethodToWrap, PCCOR_SIGNATURE pbSignature, ULONG cbSignature);
-    static FCDECL3(LPVOID, GetManagedThunkForUnmanagedMethodPtr, LPVOID pfnMethodToWrap, PCCOR_SIGNATURE pbSignature, ULONG cbSignature);
-
     static FCDECL2(LPVOID, GCHandleInternalAlloc, Object *obj, int type);
     static FCDECL1(VOID, GCHandleInternalFree, OBJECTHANDLE handle);
     static FCDECL1(LPVOID, GCHandleInternalGet, OBJECTHANDLE handle);