Implement the QCall

src/coreclr/System.Private.CoreLib/src/System/ValueType.cs

@@ -67,6 +67,8 @@ ref RuntimeHelpers.GetRawData(obj),
             return true;
         }
 
+        // Return true if the valuetype does not contain pointer, is tightly packed,
+        // does not have floating point number field and does not override Equals method.
         private static unsafe bool CanCompareBits(object obj)
         {
             MethodTable* pMT = RuntimeHelpers.GetMethodTable(obj);
@@ -86,7 +88,7 @@ private static unsafe bool CanCompareBits(object obj)
             return result;
         }
 
-        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "ValueType_CanCompareBitsOrUseFastGetHashCode")]
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "MethodTable_CanCompareBitsOrUseFastGetHashCode")]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static unsafe partial bool CanCompareBitsOrUseFastGetHashCode(MethodTable* pMT);
 

src/coreclr/vm/comutilnative.cpp

@@ -1681,44 +1681,20 @@ BOOL CanCompareBitsOrUseFastGetHashCode(MethodTable* mt)
     return canCompareBitsOrUseFastGetHashCode;
 }
 
-NOINLINE static FC_BOOL_RET CanCompareBitsHelper(MethodTable* mt, OBJECTREF objRef)
+extern "C" BOOL QCALLTYPE MethodTable_CanCompareBitsOrUseFastGetHashCode(MethodTable * mt)
 {
-    FC_INNER_PROLOG(ValueTypeHelper::CanCompareBits);
-
-    _ASSERTE(mt != NULL);
-    _ASSERTE(objRef != NULL);
+    QCALL_CONTRACT;
 
     BOOL ret = FALSE;
 
-    HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_EXACT_DEPTH|Frame::FRAME_ATTR_CAPTURE_DEPTH_2, objRef);
+    BEGIN_QCALL;
 
     ret = CanCompareBitsOrUseFastGetHashCode(mt);
 
-    HELPER_METHOD_FRAME_END();
-    FC_INNER_EPILOG();
-
-    FC_RETURN_BOOL(ret);
-}
-
-// Return true if the valuetype does not contain pointer, is tightly packed,
-// does not have floating point number field and does not override Equals method.
-FCIMPL1(FC_BOOL_RET, ValueTypeHelper::CanCompareBits, Object* obj)
-{
-    FCALL_CONTRACT;
-
-    _ASSERTE(obj != NULL);
-    MethodTable* mt = obj->GetMethodTable();
-
-    if (mt->HasCheckedCanCompareBitsOrUseFastGetHashCode())
-    {
-        FC_RETURN_BOOL(mt->CanCompareBitsOrUseFastGetHashCode());
-    }
-
-    OBJECTREF objRef(obj);
+    END_QCALL;
 
-    FC_INNER_RETURN(FC_BOOL_RET, CanCompareBitsHelper(mt, objRef));
+    return ret;
 }
-FCIMPLEND
 
 static INT32 FastGetValueTypeHashCodeHelper(MethodTable *mt, void *pObjRef)
 {

src/coreclr/vm/comutilnative.h

@@ -247,7 +247,6 @@ extern "C" void QCALLTYPE Interlocked_MemoryBarrierProcessWide();
 
 class ValueTypeHelper {
 public:
-    static FCDECL1(FC_BOOL_RET, CanCompareBits, Object* obj);
     static FCDECL1(INT32, GetHashCode, Object* objRef);
 };
 
@@ -257,6 +256,7 @@ class MethodTableNative {
 };
 
 extern "C" BOOL QCALLTYPE MethodTable_AreTypesEquivalent(MethodTable* mta, MethodTable* mtb);
+extern "C" BOOL QCALLTYPE MethodTable_CanCompareBitsOrUseFastGetHashCode(MethodTable* mt);
 
 class StreamNative {
 public:

src/coreclr/vm/ecalllist.h

@@ -77,7 +77,6 @@ FCFuncStart(gStringFuncs)
 FCFuncEnd()
 
 FCFuncStart(gValueTypeFuncs)
-    FCFuncElement("CanCompareBits", ValueTypeHelper::CanCompareBits)
     FCFuncElement("GetHashCode", ValueTypeHelper::GetHashCode)
 FCFuncEnd()
 

src/coreclr/vm/qcallentrypoints.cpp

@@ -100,6 +100,7 @@ static const Entry s_QCall[] =
     DllImportEntry(QCall_GetGCHandleForTypeHandle)
     DllImportEntry(QCall_FreeGCHandleForTypeHandle)
     DllImportEntry(MethodTable_AreTypesEquivalent)
+    DllImportEntry(MethodTable_CanCompareBitsOrUseFastGetHashCode)
     DllImportEntry(RuntimeTypeHandle_MakePointer)
     DllImportEntry(RuntimeTypeHandle_MakeByRef)
     DllImportEntry(RuntimeTypeHandle_MakeSZArray)