Revert "Fix exception handling in the prestub worker (#111937)"

This reverts commit 12fa864.

Author: jkotas

src/coreclr/vm/excep.cpp

@@ -3053,17 +3053,14 @@ void StackTraceInfo::AppendElement(OBJECTHANDLE hThrowable, UINT_PTR currentIP,
     // This is a workaround to fix the generation of stack traces from exception objects so that
     // they point to the line that actually generated the exception instead of the line
     // following.
-    if (pCf != NULL)
+    if (pCf->IsIPadjusted())
     {
-        if (pCf->IsIPadjusted())
-        {
-            stackTraceElem.flags |= STEF_IP_ADJUSTED;
-        }
-        else if (!pCf->HasFaulted() && stackTraceElem.ip != 0)
-        {
-            stackTraceElem.ip -= STACKWALK_CONTROLPC_ADJUST_OFFSET;
-            stackTraceElem.flags |= STEF_IP_ADJUSTED;
-        }
+        stackTraceElem.flags |= STEF_IP_ADJUSTED;
+    }
+    else if (!pCf->HasFaulted() && stackTraceElem.ip != 0)
+    {
+        stackTraceElem.ip -= STACKWALK_CONTROLPC_ADJUST_OFFSET;
+        stackTraceElem.flags |= STEF_IP_ADJUSTED;
     }
 
 #ifndef TARGET_UNIX // Watson is supported on Windows only

src/coreclr/vm/exceptionhandling.cpp

@@ -932,12 +932,7 @@ ProcessCLRExceptionNew(IN     PEXCEPTION_RECORD   pExceptionRecord,
 
     Thread* pThread         = GetThread();
 
-    // Skip native frames of asm helpers that have the ProcessCLRException set as their personality routine.
-    // There is nothing to do for those with the new exception handling.
-    // Also skip all frames when processing unhandled exceptions. That allows them to reach the host app
-    // level and let 3rd party the chance to handle them.
-    if (!ExecutionManager::IsManagedCode((PCODE)pDispatcherContext->ControlPc) ||
-        pThread->HasThreadStateNC(Thread::TSNC_ProcessedUnhandledException))
+    if (pThread->HasThreadStateNC(Thread::TSNC_ProcessedUnhandledException))
     {
         if ((pExceptionRecord->ExceptionFlags & EXCEPTION_UNWINDING))
         {
@@ -8519,7 +8514,7 @@ static StackWalkAction MoveToNextNonSkippedFrame(StackFrameIterator* pStackFrame
     return retVal;
 }
 
-bool IsCallDescrWorkerInternalReturnAddress(PCODE pCode);
+extern "C" size_t CallDescrWorkerInternalReturnAddressOffset;
 
 extern "C" bool QCALLTYPE SfiNext(StackFrameIterator* pThis, uint* uExCollideClauseIdx, bool* fUnwoundReversePInvoke, bool* pfIsExceptionIntercepted)
 {
@@ -8574,7 +8569,8 @@ extern "C" bool QCALLTYPE SfiNext(StackFrameIterator* pThis, uint* uExCollideCla
         }
         else
         {
-            if (IsCallDescrWorkerInternalReturnAddress(GetIP(pThis->m_crawl.GetRegisterSet()->pCallerContext)))
+            size_t CallDescrWorkerInternalReturnAddress = (size_t)CallDescrWorkerInternal + CallDescrWorkerInternalReturnAddressOffset;
+            if (GetIP(pThis->m_crawl.GetRegisterSet()->pCallerContext) == CallDescrWorkerInternalReturnAddress)
             {
                 invalidRevPInvoke = true;
             }

src/coreclr/vm/exceptmacros.h

@@ -277,22 +277,15 @@ VOID DECLSPEC_NORETURN UnwindAndContinueRethrowHelperAfterCatch(Frame* pEntryFra
 #ifdef TARGET_UNIX
 VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHardwareException);
 
-#define INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX     \
+#define INSTALL_MANAGED_EXCEPTION_DISPATCHER        \
         PAL_SEHException exCopy;                    \
         bool hasCaughtException = false;            \
         try {
 
-#define INSTALL_MANAGED_EXCEPTION_DISPATCHER        \
-        INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX
-
-#define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX(nativeRethrow) \
+#define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER      \
         }                                           \
         catch (PAL_SEHException& ex)                \
         {                                           \
-            if (nativeRethrow)                      \
-            {                                       \
-                throw;                              \
-            }                                       \
             exCopy = std::move(ex);                 \
             hasCaughtException = true;              \
         }                                           \
@@ -301,9 +294,6 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar
             DispatchManagedException(exCopy, false);\
         }
 
-#define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER      \
-    UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX(false)
-
 // Install trap that catches unhandled managed exception and dumps its stack
 #define INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP                                            \
         try {
@@ -325,9 +315,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar
 #else // TARGET_UNIX
 
 #define INSTALL_MANAGED_EXCEPTION_DISPATCHER
-#define INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX
 #define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER
-#define UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX
 
 #define INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP
 #define UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP

src/coreclr/vm/prestub.cpp

@@ -2536,20 +2536,6 @@ Stub * MakeInstantiatingStubWorker(MethodDesc *pMD)
 }
 #endif // defined(FEATURE_SHARE_GENERIC_CODE)
 
-extern "C" size_t CallDescrWorkerInternalReturnAddressOffset;
-
-bool IsCallDescrWorkerInternalReturnAddress(PCODE pCode)
-{
-    LIMITED_METHOD_CONTRACT;
-#ifdef FEATURE_EH_FUNCLETS
-    size_t CallDescrWorkerInternalReturnAddress = (size_t)CallDescrWorkerInternal + CallDescrWorkerInternalReturnAddressOffset;
-
-    return pCode == CallDescrWorkerInternalReturnAddress;
-#else // FEATURE_EH_FUNCLETS
-    return false;
-#endif // FEATURE_EH_FUNCLETS
-}
-
 //=============================================================================
 // This function generates the real code when from Preemptive mode.
 // It is specifically designed to work with the UnmanagedCallersOnlyAttribute.
@@ -2645,76 +2631,60 @@ extern "C" PCODE STDCALL PreStubWorker(TransitionBlock* pTransitionBlock, Method
 
         pPFrame->Push(CURRENT_THREAD);
 
-        EX_TRY
-        {
-            bool propagateExceptionToNativeCode = IsCallDescrWorkerInternalReturnAddress(pTransitionBlock->m_ReturnAddress);
+        INSTALL_MANAGED_EXCEPTION_DISPATCHER;
+        INSTALL_UNWIND_AND_CONTINUE_HANDLER;
 
-            INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX;
-            INSTALL_UNWIND_AND_CONTINUE_HANDLER_EX;
+        // Make sure the method table is restored, and method instantiation if present
+        pMD->CheckRestore();
+        CONSISTENCY_CHECK(GetAppDomain()->CheckCanExecuteManagedCode(pMD));
 
-            // Make sure the method table is restored, and method instantiation if present
-            pMD->CheckRestore();
-            CONSISTENCY_CHECK(GetAppDomain()->CheckCanExecuteManagedCode(pMD));
+        MethodTable* pDispatchingMT = NULL;
+        if (pMD->IsVtableMethod())
+        {
+            OBJECTREF curobj = pPFrame->GetThis();
 
-            MethodTable* pDispatchingMT = NULL;
-            if (pMD->IsVtableMethod())
+            if (curobj != NULL) // Check for virtual function called non-virtually on a NULL object
             {
-                OBJECTREF curobj = pPFrame->GetThis();
+                pDispatchingMT = curobj->GetMethodTable();
 
-                if (curobj != NULL) // Check for virtual function called non-virtually on a NULL object
+                if (pDispatchingMT->IsIDynamicInterfaceCastable())
                 {
-                    pDispatchingMT = curobj->GetMethodTable();
+                    MethodTable* pMDMT = pMD->GetMethodTable();
+                    TypeHandle objectType(pDispatchingMT);
+                    TypeHandle methodType(pMDMT);
 
-                    if (pDispatchingMT->IsIDynamicInterfaceCastable())
+                    GCStress<cfg_any>::MaybeTrigger();
+                    INDEBUG(curobj = NULL); // curobj is unprotected and CanCastTo() can trigger GC
+                    if (!objectType.CanCastTo(methodType))
                     {
-                        MethodTable* pMDMT = pMD->GetMethodTable();
-                        TypeHandle objectType(pDispatchingMT);
-                        TypeHandle methodType(pMDMT);
-
-                        GCStress<cfg_any>::MaybeTrigger();
-                        INDEBUG(curobj = NULL); // curobj is unprotected and CanCastTo() can trigger GC
-                        if (!objectType.CanCastTo(methodType))
-                        {
-                            // Apparently IDynamicInterfaceCastable magic was involved when we chose this method to be called
-                            // that's why we better stick to the MethodTable it belongs to, otherwise
-                            // DoPrestub() will fail not being able to find implementation for pMD in pDispatchingMT.
+                        // Apparently IDynamicInterfaceCastable magic was involved when we chose this method to be called
+                        // that's why we better stick to the MethodTable it belongs to, otherwise
+                        // DoPrestub() will fail not being able to find implementation for pMD in pDispatchingMT.
 
-                            pDispatchingMT = pMDMT;
-                        }
+                        pDispatchingMT = pMDMT;
                     }
+                }
 
-                    // For value types, the only virtual methods are interface implementations.
-                    // Thus pDispatching == pMT because there
-                    // is no inheritance in value types.  Note the BoxedEntryPointStubs are shared
-                    // between all sharable generic instantiations, so the == test is on
-                    // canonical method tables.
+                // For value types, the only virtual methods are interface implementations.
+                // Thus pDispatching == pMT because there
+                // is no inheritance in value types.  Note the BoxedEntryPointStubs are shared
+                // between all sharable generic instantiations, so the == test is on
+                // canonical method tables.
 #ifdef _DEBUG
-                    MethodTable* pMDMT = pMD->GetMethodTable(); // put this here to see what the MT is in debug mode
-                    _ASSERTE(!pMD->GetMethodTable()->IsValueType() ||
-                    (pMD->IsUnboxingStub() && (pDispatchingMT->GetCanonicalMethodTable() == pMDMT->GetCanonicalMethodTable())));
+                MethodTable* pMDMT = pMD->GetMethodTable(); // put this here to see what the MT is in debug mode
+                _ASSERTE(!pMD->GetMethodTable()->IsValueType() ||
+                (pMD->IsUnboxingStub() && (pDispatchingMT->GetCanonicalMethodTable() == pMDMT->GetCanonicalMethodTable())));
 #endif // _DEBUG
-                }
-            }
-
-            GCX_PREEMP_THREAD_EXISTS(CURRENT_THREAD);
-            {
-                pbRetVal = pMD->DoPrestub(pDispatchingMT, CallerGCMode::Coop);
             }
-
-            UNINSTALL_UNWIND_AND_CONTINUE_HANDLER_EX(propagateExceptionToNativeCode);
-            UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX(propagateExceptionToNativeCode);
         }
-        EX_CATCH
+
+        GCX_PREEMP_THREAD_EXISTS(CURRENT_THREAD);
         {
-            if (g_isNewExceptionHandlingEnabled)
-            {
-                OBJECTHANDLE ohThrowable = CURRENT_THREAD->LastThrownObjectHandle();
-                _ASSERTE(ohThrowable);
-                StackTraceInfo::AppendElement(ohThrowable, 0, (UINT_PTR)pTransitionBlock, pMD, NULL);
-            }
-            EX_RETHROW;
+            pbRetVal = pMD->DoPrestub(pDispatchingMT, CallerGCMode::Coop);
         }
-        EX_END_CATCH(SwallowAllExceptions)
+
+        UNINSTALL_UNWIND_AND_CONTINUE_HANDLER;
+        UNINSTALL_MANAGED_EXCEPTION_DISPATCHER;
 
         {
             HardwareExceptionHolder;
@@ -3184,10 +3154,8 @@ EXTERN_C PCODE STDCALL ExternalMethodFixupWorker(TransitionBlock * pTransitionBl
 
     pEMFrame->Push(CURRENT_THREAD);         // Push the new ExternalMethodFrame onto the frame stack
 
-    bool propagateExceptionToNativeCode = IsCallDescrWorkerInternalReturnAddress(pTransitionBlock->m_ReturnAddress);
-
-    INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX;
-    INSTALL_UNWIND_AND_CONTINUE_HANDLER_EX;
+    INSTALL_MANAGED_EXCEPTION_DISPATCHER;
+    INSTALL_UNWIND_AND_CONTINUE_HANDLER;
 
     bool fVirtual = false;
     MethodDesc * pMD = NULL;
@@ -3429,8 +3397,8 @@ EXTERN_C PCODE STDCALL ExternalMethodFixupWorker(TransitionBlock * pTransitionBl
     }
     // Ready to return
 
-    UNINSTALL_UNWIND_AND_CONTINUE_HANDLER_EX(propagateExceptionToNativeCode);
-    UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX(propagateExceptionToNativeCode);
+    UNINSTALL_UNWIND_AND_CONTINUE_HANDLER;
+    UNINSTALL_MANAGED_EXCEPTION_DISPATCHER;
 
     pEMFrame->Pop(CURRENT_THREAD);          // Pop the ExternalMethodFrame from the frame stack
 

src/coreclr/vm/virtualcallstub.cpp

@@ -1262,8 +1262,6 @@ ResolveCacheElem* __fastcall VirtualCallStubManager::PromoteChainEntry(ResolveCa
 }
 #endif // CHAIN_LOOKUP
 
-bool IsCallDescrWorkerInternalReturnAddress(PCODE pCode);
-
 /* Resolve to a method and return its address or NULL if there is none.
    Our return value is the target address that control should continue to.  Our caller will
    enter the target address as if a direct call with the original stack frame had been made from
@@ -1311,16 +1309,14 @@ PCODE VSD_ResolveWorker(TransitionBlock * pTransitionBlock,
 
     PCODE target = (PCODE)NULL;
 
-    bool propagateExceptionToNativeCode = IsCallDescrWorkerInternalReturnAddress(pTransitionBlock->m_ReturnAddress);
-
     if (pObj == NULL) {
         pSDFrame->SetForNullReferenceException();
         pSDFrame->Push(CURRENT_THREAD);
-        INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX;
-        INSTALL_UNWIND_AND_CONTINUE_HANDLER_EX;
+        INSTALL_MANAGED_EXCEPTION_DISPATCHER;
+        INSTALL_UNWIND_AND_CONTINUE_HANDLER;
         COMPlusThrow(kNullReferenceException);
-        UNINSTALL_UNWIND_AND_CONTINUE_HANDLER_EX(propagateExceptionToNativeCode);
-        UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX(propagateExceptionToNativeCode);
+        UNINSTALL_UNWIND_AND_CONTINUE_HANDLER;
+        UNINSTALL_MANAGED_EXCEPTION_DISPATCHER;
         _ASSERTE(!"Throw returned");
     }
 
@@ -1355,9 +1351,8 @@ PCODE VSD_ResolveWorker(TransitionBlock * pTransitionBlock,
 
     pSDFrame->SetRepresentativeSlot(pRepresentativeMT, representativeToken.GetSlotNumber());
     pSDFrame->Push(CURRENT_THREAD);
-
-    INSTALL_MANAGED_EXCEPTION_DISPATCHER_EX;
-    INSTALL_UNWIND_AND_CONTINUE_HANDLER_EX;
+    INSTALL_MANAGED_EXCEPTION_DISPATCHER;
+    INSTALL_UNWIND_AND_CONTINUE_HANDLER;
 
     // For Virtual Delegates the m_siteAddr is a field of a managed object
     // Thus we have to report it as an interior pointer,
@@ -1393,8 +1388,8 @@ PCODE VSD_ResolveWorker(TransitionBlock * pTransitionBlock,
 
     GCPROTECT_END();
 
-    UNINSTALL_UNWIND_AND_CONTINUE_HANDLER_EX(propagateExceptionToNativeCode);
-    UNINSTALL_MANAGED_EXCEPTION_DISPATCHER_EX(propagateExceptionToNativeCode);
+    UNINSTALL_UNWIND_AND_CONTINUE_HANDLER;
+    UNINSTALL_MANAGED_EXCEPTION_DISPATCHER;
     pSDFrame->Pop(CURRENT_THREAD);
 
     return target;