Fix: Assert failure: Thread::IsObjRefValid (#118307)

Fixes #117961

Author: jkotas

src/coreclr/vm/callsiteinspect.cpp

@@ -200,7 +200,7 @@ namespace
 
                 // return the object so it can be stored in the frame and
                 // propagated to the root set
-                *(OBJECTREF*)&ret  = (*src);
+                *(Object**)&ret  = OBJECTREFToObject(*src);
             }
         }
         else if (CorTypeInfo::IsObjRef(typ))
@@ -211,7 +211,7 @@ namespace
             if (pvDest)
                 SetObjectReference((OBJECTREF *)pvDest, *src);
 
-            *(OBJECTREF*)&ret = (*src);
+            *(Object**)&ret = OBJECTREFToObject(*src);
         }
         else
         {

src/coreclr/vm/clrtocomcall.cpp

@@ -347,7 +347,7 @@ UINT32 CLRToCOMEventCallWorker(CLRToCOMMethodFrame* pFrame, CLRToCOMCallMethodDe
         MethodDescCallSite eventProvider(pEvProvMD, &gc.EventProviderObj);
 
         // Retrieve the event handler passed in.
-        OBJECTREF EventHandlerObj = *(OBJECTREF*)(pFrame->GetTransitionBlock() + ArgItr.GetNextOffset());
+        OBJECTREF EventHandlerObj = ObjectToOBJECTREF(*(Object**)(pFrame->GetTransitionBlock() + ArgItr.GetNextOffset()));
 
         ARG_SLOT EventMethArgs[] =
         {

src/coreclr/vm/comtoclrcall.cpp

@@ -174,8 +174,7 @@ inline static void InvokeStub(ComCallMethodDesc *pCMD, PCODE pManagedTarget, OBJ
     ARG_SLOT retVal = 0;
     PCODE pStubEntryPoint = pCMD->GetILStub();
 
-    INT_PTR dangerousThis;
-    *(OBJECTREF *)&dangerousThis = orThis;
+    INT_PTR dangerousThis = (INT_PTR)OBJECTREFToObject(orThis);
 
     DWORD dwStackSlots = pCMD->GetNumStackBytes() / TARGET_POINTER_SIZE;
 

src/coreclr/vm/eedbginterfaceimpl.cpp

@@ -173,11 +173,7 @@ void* EEDbgInterfaceImpl::GetObjectFromHandle(OBJECTHANDLE handle)
     }
     CONTRACTL_END;
 
-    void *v;
-
-    *((OBJECTREF *)&v) = *(OBJECTREF *)handle;
-
-    return v;
+    return OBJECTREFToObject(ObjectFromHandle(handle));
 }
 
 OBJECTHANDLE EEDbgInterfaceImpl::GetHandleFromObject(void *obj,

src/coreclr/vm/field.h

@@ -450,7 +450,7 @@ class FieldDesc
     OBJECTREF GetStaticOBJECTREF()
     {
         WRAPPER_NO_CONTRACT;
-        return *(OBJECTREF *)GetCurrentStaticAddress();
+        return ObjectToOBJECTREF(*(Object**)GetCurrentStaticAddress());
     }
 
     VOID SetStaticOBJECTREF(OBJECTREF objRef);

src/coreclr/vm/interpexec.cpp

@@ -2202,7 +2202,7 @@ do {                                                                           \
                         COMPlusThrow(kIndexOutOfRangeException);
 
                     uint8_t* pData = arr->GetDataPtr();
-                    OBJECTREF elemRef = *(OBJECTREF*)(pData + idx * sizeof(OBJECTREF));
+                    OBJECTREF elemRef = ObjectToOBJECTREF(*(Object**)(pData + idx * sizeof(OBJECTREF)));
                     LOCAL_VAR(ip[1], OBJECTREF) = elemRef;
                     ip += 4;
                     break;

src/coreclr/vm/reflectioninvocation.cpp

@@ -617,7 +617,7 @@ extern "C" void QCALLTYPE RuntimeMethodHandle_InvokeMethod(
         // We have a special case for Strings...The object is returned...
         if (fCtorOfVariableSizedObject) {
             PVOID pReturnValue = &callDescrData.returnValue;
-            gc.retVal = *(OBJECTREF *)pReturnValue;
+            gc.retVal = ObjectToOBJECTREF(*(Object**)pReturnValue);
         }
 
         // If it is a Nullable<T>, box it using Nullable<T> conventions.