diff --git a/src/coreclr/vm/excep.cpp b/src/coreclr/vm/excep.cpp index b2cd2e52a27af..19ddfbc86d7a1 100644 --- a/src/coreclr/vm/excep.cpp +++ b/src/coreclr/vm/excep.cpp @@ -2509,8 +2509,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrow(OBJECTREF throwable) RealCOMPlusThrow(throwable, FALSE); } -#ifdef USE_CHECKED_OBJECTREFS -VOID DECLSPEC_NORETURN RealCOMPlusThrow(Object *exceptionObj) +VOID DECLSPEC_NORETURN PropagateExceptionThroughNativeFrames(Object *exceptionObj) { CONTRACTL { @@ -2523,7 +2522,6 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrow(Object *exceptionObj) OBJECTREF throwable = ObjectToOBJECTREF(exceptionObj); RealCOMPlusThrowWorker(throwable, FALSE); } -#endif // USE_CHECKED_OBJECTREFS // this function finds the managed callback to get a resource // string from the then current local domain and calls it diff --git a/src/coreclr/vm/excep.h b/src/coreclr/vm/excep.h index e5b35b85a5ed8..391ea14633bb0 100644 --- a/src/coreclr/vm/excep.h +++ b/src/coreclr/vm/excep.h @@ -253,7 +253,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowNonLocalized(RuntimeExceptionKind reKind, //========================================================================== VOID DECLSPEC_NORETURN RealCOMPlusThrow(OBJECTREF throwable); -VOID DECLSPEC_NORETURN RealCOMPlusThrow(Object *exceptionObj); +VOID DECLSPEC_NORETURN PropagateExceptionThroughNativeFrames(Object *exceptionObj); //========================================================================== // Throw an undecorated runtime exception. diff --git a/src/coreclr/vm/exceptionhandling.cpp b/src/coreclr/vm/exceptionhandling.cpp index f5b34a3d6cd28..e23852a53775b 100644 --- a/src/coreclr/vm/exceptionhandling.cpp +++ b/src/coreclr/vm/exceptionhandling.cpp @@ -7872,7 +7872,7 @@ extern "C" void * QCALLTYPE CallCatchFunclet(QCall::ObjectHandleOnStack exceptio #elif defined(HOST_RISCV) || defined(HOST_LOONGARCH64) pvRegDisplay->pCurrentContext->Ra = GetIP(pvRegDisplay->pCurrentContext); #endif - SetIP(pvRegDisplay->pCurrentContext, (PCODE)(void (*)(Object*))RealCOMPlusThrow); + SetIP(pvRegDisplay->pCurrentContext, (PCODE)(void (*)(Object*))PropagateExceptionThroughNativeFrames); #if defined(HOST_AMD64) SetSP(pvRegDisplay->pCurrentContext, targetSp - 8); #elif defined(HOST_X86)