Move to single InterpreterFrame and few fixes

Author: janvorli

src/coreclr/debug/daccess/dacdbiimplstackwalk.cpp

@@ -189,23 +189,7 @@ void DacDbiInterfaceImpl::SetStackWalkCurrentContext(VMPTR_Thread           vmTh
     // Allocate a context in DDImpl's memory space. DDImpl can't contain raw pointers back into
     // the client space since that may not marshal.
     T_CONTEXT * pContext2 = GetContextBufferFromHandle(pSFIHandle);
-
-#ifdef FEATURE_INTERPRETER
-    PTR_Frame pTopFrame = vmThread.GetDacPtr()->GetFrame();
-
-    if ((pTopFrame != FRAME_TOP) && (pTopFrame->GetFrameIdentifier() == FrameIdentifier::InterpreterEntryFrame))
-    {
-        InterpreterEntryFrame *pEntryFrame = dac_cast<PTR_InterpreterEntryFrame>(pTopFrame);
-        PTR_InterpMethodContextFrame pTOSInterpMethodContextFrame = pEntryFrame->GetInterpMethodTopmostContextFrame();
-        SetIP(pContext2, (TADDR)pTOSInterpMethodContextFrame->ip);
-        SetSP(pContext2, dac_cast<TADDR>(pTOSInterpMethodContextFrame));
-        pContext2->ContextFlags = CONTEXT_CONTROL;
-    }
-    else
-#endif // FEATURE_INTERPRETER
-    {
-        CopyMemory(pContext2, pContext, sizeof(*pContext));
-    }
+    CopyMemory(pContext2, pContext, sizeof(*pContext));
 
     // update the REGDISPLAY with the given CONTEXT.
     // Be sure that the context is in DDImpl's memory space and not the Right-sides.

src/coreclr/debug/daccess/stack.cpp

@@ -467,24 +467,10 @@ ClrDataStackWalk::Init(void)
         return E_FAIL;
     }
 
-#ifdef FEATURE_INTERPRETER
-    PTR_Frame pTopFrame = m_thread->GetFrame();
-#endif // FEATURE_INTERPRETER
-
     if (m_thread->GetFilterContext())
     {
         m_context = *m_thread->GetFilterContext();
     }
-#ifdef FEATURE_INTERPRETER
-    else if ((pTopFrame != FRAME_TOP) && (pTopFrame->GetFrameIdentifier() == FrameIdentifier::InterpreterEntryFrame))
-    {
-        InterpreterEntryFrame *pEntryFrame = dac_cast<PTR_InterpreterEntryFrame>(pTopFrame);
-        PTR_InterpMethodContextFrame pTOSInterpMethodContextFrame = pEntryFrame->GetInterpMethodTopmostContextFrame();
-        SetIP(&m_context, (TADDR)pTOSInterpMethodContextFrame->ip);
-        SetSP(&m_context, dac_cast<TADDR>(pTOSInterpMethodContextFrame));
-        m_context.ContextFlags = CONTEXT_CONTROL;
-    }
-#endif // FEATURE_INTERPRETER
     else
     {
         DacGetThreadContext(m_thread, &m_context);

src/coreclr/vm/FrameTypes.h

@@ -48,8 +48,7 @@ FRAME_TYPE_NAME(DebuggerExitFrame)
 FRAME_TYPE_NAME(DebuggerU2MCatchHandlerFrame)
 FRAME_TYPE_NAME(ExceptionFilterFrame)
 #ifdef FEATURE_INTERPRETER
-FRAME_TYPE_NAME(InterpreterEntryFrame)
-FRAME_TYPE_NAME(InterpreterExitFrame)
+FRAME_TYPE_NAME(InterpreterFrame)
 #endif // FEATURE_INTERPRETER
 
 #undef FRAME_TYPE_NAME

src/coreclr/vm/eetwain.cpp

@@ -2296,7 +2296,7 @@ static void VirtualUnwindInterpreterCallFrame(TADDR sp, CONTEXT *pContext)
     {
         // This indicates that there are no more interpreter frames to unwind in the current InterpExecMethod
         // The stack walker will not find any code manager for the address 0 and move on to the next explicit
-        // frame which is the InterpreterEntryFrame.
+        // frame which is the InterpreterFrame.
         // Interpreter-TODO: Consider returning the context of the JITted / AOTed code that called the interpreter instead
         SetIP(pContext, 0);
         SetSP(pContext, sp);

src/coreclr/vm/frames.cpp

@@ -2084,7 +2084,7 @@ PCODE UnmanagedToManagedFrame::GetReturnAddress_Impl()
 #endif // FEATURE_COMINTEROP
 
 #ifdef FEATURE_INTERPRETER
-PTR_InterpMethodContextFrame InterpreterEntryFrame::GetInterpMethodTopmostContextFrame()
+PTR_InterpMethodContextFrame InterpreterFrame::GetInterpMethodTopmostContextFrame()
 {
     LIMITED_METHOD_CONTRACT;
     PTR_InterpMethodContextFrame pFrame = m_pInterpMethodContextFrame;
@@ -2101,20 +2101,6 @@ PTR_InterpMethodContextFrame InterpreterEntryFrame::GetInterpMethodTopmostContex
     return pFrame;
 }
 
-void InterpreterExitFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateFloats)
-{
-    LIMITED_METHOD_DAC_CONTRACT;
-
-    SetIP(pRD->pCurrentContext, (TADDR)m_pInterpMethodContextFrame->ip);
-    SetSP(pRD->pCurrentContext, dac_cast<TADDR>(m_pInterpMethodContextFrame));
-    SyncRegDisplayToCurrentContext(pRD);
-}
-
-TADDR InterpreterExitFrame::GetReturnAddress_Impl()
-{
-    return (TADDR)m_pInterpMethodContextFrame->ip;
-}
-
 #endif // FEATURE_INTERPRETER
 
 #ifndef DACCESS_COMPILE

src/coreclr/vm/frames.h

@@ -2865,49 +2865,17 @@ class ExceptionFilterFrame : public Frame
 };
 
 #ifdef FEATURE_INTERPRETER
-typedef DPTR(class InterpreterExitFrame) PTR_InterpreterExitFrame;
 struct InterpMethodContextFrame;
 typedef DPTR(struct InterpMethodContextFrame) PTR_InterpMethodContextFrame;
 
-class InterpreterExitFrame : public Frame
-{
-public:
-#ifndef DACCESS_COMPILE
-    InterpreterExitFrame(InterpMethodContextFrame* pContextFrame) : Frame(FrameIdentifier::InterpreterExitFrame),
-                                                                    m_pInterpMethodContextFrame(pContextFrame)
-    {
-        WRAPPER_NO_CONTRACT;
-        Push();
-    }
-#endif // DACCESS_COMPILE
-
-    PTR_InterpMethodContextFrame GetInterpMethodContextFrame()
-    {
-        LIMITED_METHOD_CONTRACT;
-        return m_pInterpMethodContextFrame;
-    }
-
-    BOOL NeedsUpdateRegDisplay_Impl()
-    {
-        return TRUE;
-    }
-
-    TADDR GetReturnAddress_Impl();
-
-    void UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateFloats);
-
-private:
-    PTR_InterpMethodContextFrame m_pInterpMethodContextFrame;
-};
-
-typedef DPTR(class InterpreterEntryFrame) PTR_InterpreterEntryFrame;
+typedef DPTR(class InterpreterFrame) PTR_InterpreterFrame;
 
-class InterpreterEntryFrame : public FramedMethodFrame
+class InterpreterFrame : public FramedMethodFrame
 {
 public:
 #ifndef DACCESS_COMPILE
-    InterpreterEntryFrame(TransitionBlock* pTransitionBlock, InterpMethodContextFrame* pContextFrame) 
-        : FramedMethodFrame(FrameIdentifier::InterpreterEntryFrame, pTransitionBlock, NULL),
+    InterpreterFrame(TransitionBlock* pTransitionBlock, InterpMethodContextFrame* pContextFrame)
+        : FramedMethodFrame(FrameIdentifier::InterpreterFrame, pTransitionBlock, NULL),
         m_pInterpMethodContextFrame(pContextFrame)
     {
         WRAPPER_NO_CONTRACT;

src/coreclr/vm/interpexec.cpp

@@ -706,13 +706,9 @@ void InterpExecMethod(InterpMethodContextFrame *pFrame, InterpThreadContext *pTh
                     MethodDesc *pMD = (MethodDesc*)(targetMethod & ~INTERP_METHOD_DESC_TAG);
                     PCODE code = pMD->GetNativeCode();
                     if (!code) {
-                        InterpreterExitFrame exitFrame(pFrame);
-                        {
-                            GCX_PREEMP();
-                            pMD->PrepareInitialCode(CallerGCMode::Coop);
-                            code = pMD->GetNativeCode();
-                        }
-                        exitFrame.Pop();
+                        GCX_PREEMP();
+                        pMD->PrepareInitialCode(CallerGCMode::Coop);
+                        code = pMD->GetNativeCode();
                     }
                     pMethod->pDataItems[ip[3]] = (void*)code;
                     targetIp = (const int32_t*)code;

src/coreclr/vm/prestub.cpp

@@ -2748,16 +2748,14 @@ extern "C" void STDCALL ExecuteInterpretedMethod(TransitionBlock* pTransitionBlo
 
     InterpMethodContextFrame interpFrame = {0};
     interpFrame.startIp = (int32_t*)byteCodeAddr;
-    interpFrame.ip = interpFrame.startIp;
     interpFrame.pStack = sp;
     interpFrame.pRetVal = sp;
 
-    InterpreterEntryFrame interpreterEntryFrame(pTransitionBlock, &interpFrame);
+    InterpreterFrame InterpreterFrame(pTransitionBlock, &interpFrame);
 
-    // Interpreter-TODO: catch exceptions stemming from the InterpExecMethod and call the managed exception handling
     InterpExecMethod(&interpFrame, threadContext);
 
-    interpreterEntryFrame.Pop();
+    InterpreterFrame.Pop();
 }
 #endif // FEATURE_INTERPRETER
 

src/coreclr/vm/stackwalk.cpp

@@ -989,6 +989,9 @@ void StackFrameIterator::CommonCtor(Thread * pThread, PTR_Frame pFrame, ULONG32
     m_movedPastFirstExInfo = false;
     m_fFuncletNotSeen = false;
     m_fFoundFirstFunclet = false;
+#ifdef FEATURE_INTERPRETER
+    m_walkingInterpreterFrames = false;
+#endif
 #if defined(RECORD_RESUMABLE_FRAME_SP)
     m_pvResumableFrameTargetSP = NULL;
 #endif
@@ -2896,6 +2899,33 @@ void StackFrameIterator::ProcessCurrentFrame(void)
                sizeof(m_crawl.codeManState.stateBuf));
 #endif // _DEBUG
 
+#ifdef FEATURE_INTERPRETER
+        if (!m_crawl.isFrameless)
+        {
+            if (m_crawl.pFrame->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame)
+            {
+                if (!m_walkingInterpreterFrames)
+                {
+                    // We have hit the InterpreterFrame while we were not processing the interpreter frames.
+                    // Switch to walking the underlying interpreted frames.
+                    PTR_InterpMethodContextFrame pTOSInterpMethodContextFrame = ((PTR_InterpreterFrame)m_crawl.pFrame)->GetInterpMethodTopmostContextFrame();
+                    PREGDISPLAY pRD = m_crawl.GetRegisterSet();
+                    SetIP(pRD->pCurrentContext, (TADDR)pTOSInterpMethodContextFrame->ip);
+                    SetSP(pRD->pCurrentContext, dac_cast<TADDR>(pTOSInterpMethodContextFrame));
+                    pRD->pCurrentContext->ContextFlags = CONTEXT_CONTROL;
+                    SyncRegDisplayToCurrentContext(pRD);
+                    ProcessIp(GetControlPC(pRD));
+                    m_walkingInterpreterFrames = m_crawl.isFrameless;
+                }
+                else
+                {
+                    // We have finished walking the interpreted frames. Process the InterpreterFrame itself.
+                    m_walkingInterpreterFrames = false;
+                }
+            }
+        }
+#endif // FEATURE_INTERPRETER
+
         if (m_crawl.isFrameless)
         {
             //------------------------------------------------------------------------

src/coreclr/vm/stackwalk.h

@@ -767,6 +767,9 @@ class StackFrameIterator
     bool          m_fFuncletNotSeen;
     // Indicates that the stack walk has moved past a funclet
     bool          m_fFoundFirstFunclet;
+#ifdef FEATURE_INTERPRETER
+    bool          m_walkingInterpreterFrames;
+#endif // FEATURE_INTERPRETER
 
 #if defined(RECORD_RESUMABLE_FRAME_SP)
     LPVOID m_pvResumableFrameTargetSP;