File size: 7,716 Bytes
ff994b2 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 |
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs
index b10ec23495b98d..6e89f50a1ea294 100644
--- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs
+++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs
@@ -24,11 +24,26 @@ internal static void ThrowInvalidCastException(object fromType, void* toTypeHnd)
throw null!; // Provide hint to the inliner that this method does not return
}
- [MethodImpl(MethodImplOptions.InternalCall)]
- private static extern object IsInstanceOfAny_NoCacheLookup(void* toTypeHnd, object obj);
+ [LibraryImport(RuntimeHelpers.QCall)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ private static partial bool IsInstanceOf_NoCacheLookup(void *toTypeHnd, [MarshalAs(UnmanagedType.Bool)] bool throwCastException, ObjectHandleOnStack obj);
- [MethodImpl(MethodImplOptions.InternalCall)]
- private static extern object ChkCastAny_NoCacheLookup(void* toTypeHnd, object obj);
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ private static object? IsInstanceOfAny_NoCacheLookup(void* toTypeHnd, object obj)
+ {
+ if (IsInstanceOf_NoCacheLookup(toTypeHnd, false, ObjectHandleOnStack.Create(ref obj)))
+ {
+ return obj;
+ }
+ return null;
+ }
+
+ [MethodImpl(MethodImplOptions.NoInlining)]
+ private static object ChkCastAny_NoCacheLookup(void* toTypeHnd, object obj)
+ {
+ IsInstanceOf_NoCacheLookup(toTypeHnd, true, ObjectHandleOnStack.Create(ref obj));
+ return obj;
+ }
[MethodImpl(MethodImplOptions.InternalCall)]
private static extern void WriteBarrier(ref object? dst, object? obj);
@@ -464,13 +479,13 @@ private static void StelemRef_Helper_NoCacheLookup(ref object? element, void* el
{
Debug.Assert(obj != null);
- obj = IsInstanceOfAny_NoCacheLookup(elementType, obj);
- if (obj == null)
+ object? obj2 = IsInstanceOfAny_NoCacheLookup(elementType, obj);
+ if (obj2 == null)
{
ThrowArrayMismatchException();
}
- WriteBarrier(ref element, obj);
+ WriteBarrier(ref element, obj2);
}
[DebuggerHidden]
@@ -496,8 +511,7 @@ private static unsafe void ArrayTypeCheck_Helper(object obj, void* elementType)
{
Debug.Assert(obj != null);
- obj = IsInstanceOfAny_NoCacheLookup(elementType, obj);
- if (obj == null)
+ if (IsInstanceOfAny_NoCacheLookup(elementType, obj) == null)
{
ThrowArrayMismatchException();
}
diff --git a/src/coreclr/vm/JitQCallHelpers.h b/src/coreclr/vm/JitQCallHelpers.h
index ff3bfa97981f3e..f229bff39f9fca 100644
--- a/src/coreclr/vm/JitQCallHelpers.h
+++ b/src/coreclr/vm/JitQCallHelpers.h
@@ -24,5 +24,6 @@ extern "C" void QCALLTYPE InitClassHelper(MethodTable* pMT);
extern "C" void QCALLTYPE ThrowInvalidCastException(CORINFO_CLASS_HANDLE pTargetType, CORINFO_CLASS_HANDLE pSourceType);
extern "C" void QCALLTYPE GetThreadStaticsByMethodTable(QCall::ByteRefOnStack refHandle, MethodTable* pMT, bool gcStatic);
extern "C" void QCALLTYPE GetThreadStaticsByIndex(QCall::ByteRefOnStack refHandle, uint32_t staticBlockIndex, bool gcStatic);
+extern "C" BOOL QCALLTYPE IsInstanceOf_NoCacheLookup(CORINFO_CLASS_HANDLE type, BOOL throwCastException, QCall::ObjectHandleOnStack objOnStack);
#endif //_JITQCALLHELPERS_H
diff --git a/src/coreclr/vm/ecalllist.h b/src/coreclr/vm/ecalllist.h
index 5aff25d5caa72c..a934364e77591c 100644
--- a/src/coreclr/vm/ecalllist.h
+++ b/src/coreclr/vm/ecalllist.h
@@ -256,8 +256,6 @@ FCFuncStart(gThreadPoolFuncs)
FCFuncEnd()
FCFuncStart(gCastHelpers)
- FCFuncElement("IsInstanceOfAny_NoCacheLookup", ::IsInstanceOfAny_NoCacheLookup)
- FCFuncElement("ChkCastAny_NoCacheLookup", ::ChkCastAny_NoCacheLookup)
FCFuncElement("WriteBarrier", ::WriteBarrier_Helper)
FCFuncEnd()
diff --git a/src/coreclr/vm/jithelpers.cpp b/src/coreclr/vm/jithelpers.cpp
index 197c2035a847a5..780323637cf4bd 100644
--- a/src/coreclr/vm/jithelpers.cpp
+++ b/src/coreclr/vm/jithelpers.cpp
@@ -781,51 +781,22 @@ BOOL ObjIsInstanceOf(Object* pObject, TypeHandle toTypeHnd, BOOL throwCastExcept
return ObjIsInstanceOfCore(pObject, toTypeHnd, throwCastException);
}
-HCIMPL2(Object*, ChkCastAny_NoCacheLookup, CORINFO_CLASS_HANDLE type, Object* obj)
+extern "C" BOOL QCALLTYPE IsInstanceOf_NoCacheLookup(CORINFO_CLASS_HANDLE type, BOOL throwCastException, QCall::ObjectHandleOnStack objOnStack)
{
- FCALL_CONTRACT;
-
- // This case should be handled by frameless helper
- _ASSERTE(obj != NULL);
-
- OBJECTREF oref = ObjectToOBJECTREF(obj);
- VALIDATEOBJECTREF(oref);
-
- TypeHandle clsHnd(type);
-
- HELPER_METHOD_FRAME_BEGIN_RET_1(oref);
- if (!ObjIsInstanceOfCore(OBJECTREFToObject(oref), clsHnd, TRUE))
- {
- UNREACHABLE(); //ObjIsInstanceOf will throw if cast can't be done
- }
- HELPER_METHOD_POLL();
- HELPER_METHOD_FRAME_END();
-
- return OBJECTREFToObject(oref);
-}
-HCIMPLEND
-
-HCIMPL2(Object*, IsInstanceOfAny_NoCacheLookup, CORINFO_CLASS_HANDLE type, Object* obj)
-{
- FCALL_CONTRACT;
+ QCALL_CONTRACT;
+ BOOL result = FALSE;
- // This case should be handled by frameless helper
- _ASSERTE(obj != NULL);
+ BEGIN_QCALL;
- OBJECTREF oref = ObjectToOBJECTREF(obj);
- VALIDATEOBJECTREF(oref);
+ GCX_COOP();
TypeHandle clsHnd(type);
+ result = ObjIsInstanceOfCore(OBJECTREFToObject(objOnStack.Get()), clsHnd, throwCastException);
- HELPER_METHOD_FRAME_BEGIN_RET_1(oref);
- if (!ObjIsInstanceOfCore(OBJECTREFToObject(oref), clsHnd))
- oref = NULL;
- HELPER_METHOD_POLL();
- HELPER_METHOD_FRAME_END();
+ END_QCALL;
- return OBJECTREFToObject(oref);
+ return result;
}
-HCIMPLEND
//========================================================================
//
diff --git a/src/coreclr/vm/jitinterface.h b/src/coreclr/vm/jitinterface.h
index 0de84367ab3c70..a99604cd66716c 100644
--- a/src/coreclr/vm/jitinterface.h
+++ b/src/coreclr/vm/jitinterface.h
@@ -236,10 +236,7 @@ extern "C" FCDECL2(VOID, JIT_CheckedWriteBarrier, Object **dst, Object *ref);
extern "C" FCDECL2(VOID, JIT_WriteBarrier, Object **dst, Object *ref);
extern "C" FCDECL2(VOID, JIT_WriteBarrierEnsureNonHeapTarget, Object **dst, Object *ref);
-extern "C" FCDECL2(Object*, ChkCastAny_NoCacheLookup, CORINFO_CLASS_HANDLE type, Object* obj);
-extern "C" FCDECL2(Object*, IsInstanceOfAny_NoCacheLookup, CORINFO_CLASS_HANDLE type, Object* obj);
-
-// ARM64 JIT_WriteBarrier uses speciall ABI and thus is not callable directly
+// ARM64 JIT_WriteBarrier uses special ABI and thus is not callable directly
// Copied write barriers must be called at a different location
extern "C" FCDECL2(VOID, JIT_WriteBarrier_Callable, Object **dst, Object *ref);
diff --git a/src/coreclr/vm/qcallentrypoints.cpp b/src/coreclr/vm/qcallentrypoints.cpp
index 32dc4c7ed27853..c41ab9e70bdc62 100644
--- a/src/coreclr/vm/qcallentrypoints.cpp
+++ b/src/coreclr/vm/qcallentrypoints.cpp
@@ -515,6 +515,7 @@ static const Entry s_QCall[] =
DllImportEntry(GetThreadStaticsByIndex)
DllImportEntry(GenericHandleWorker)
DllImportEntry(ThrowInvalidCastException)
+ DllImportEntry(IsInstanceOf_NoCacheLookup)
};
const void* QCallResolveDllImport(const char* name)
|