Enable use-after-return checking in ASAN

eng/native/configurecompiler.cmake

@@ -141,6 +141,20 @@ elseif (CLR_CMAKE_HOST_UNIX)
 endif(MSVC)
 
 if (CLR_CMAKE_ENABLE_SANITIZERS)
+  enable_language(C)
+  if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+    execute_process(
+      COMMAND ${CMAKE_C_COMPILER} -print-resource-dir
+      OUTPUT_VARIABLE compilerResourceDir
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    include_directories(SYSTEM ${compilerResourceDir}/include)
+
+    # Work around https://gitlab.kitware.com/cmake/cmake/-/issues/19227 since CoreCLR passes -nostdinc
+    # and CMake will filter out the resource dir if -nostdinc is passed.
+    list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${compilerResourceDir}/include")
+    list(REMOVE_ITEM CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "${compilerResourceDir}/include")
+  endif()
+
   set (CLR_CMAKE_BUILD_SANITIZERS "")
   set (CLR_CMAKE_SANITIZER_RUNTIMES "")
   string(FIND "${CLR_CMAKE_ENABLE_SANITIZERS}" "address" __ASAN_POS)
@@ -158,12 +172,11 @@ if (CLR_CMAKE_ENABLE_SANITIZERS)
     # The rest of our platforms use statically-linked ASAN so this isn't a concern for those platforms.
     if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST)
       function(getSanitizerRuntimeDirectory output)
-        enable_language(C)
         execute_process(
-          COMMAND ${CMAKE_C_COMPILER} -print-resource-dir
-          OUTPUT_VARIABLE compilerResourceDir
+          COMMAND ${CMAKE_C_COMPILER} -print-runtime-dir
+          OUTPUT_VARIABLE compilerRuntimeDir
           OUTPUT_STRIP_TRAILING_WHITESPACE)
-        set(${output} "${compilerResourceDir}/lib/darwin/" PARENT_SCOPE)
+        set(${output} "${compilerResourceDir}" PARENT_SCOPE)
       endfunction()
       getSanitizerRuntimeDirectory(sanitizerRuntimeDirectory)
       find_library(ASAN_RUNTIME clang_rt.asan_osx_dynamic PATHS ${sanitizerRuntimeDirectory})
@@ -196,11 +209,13 @@ if (CLR_CMAKE_ENABLE_SANITIZERS)
       # define the preprocessor define ourselves.
       add_compile_definitions($<$<COMPILE_LANGUAGE:ASM,ASM_MASM>:HAS_ADDRESS_SANITIZER>)
 
-      # Disable the use-after-return check for ASAN on Clang. This is because we have a lot of code that
-      # depends on the fact that our locals are not saved in a parallel stack, so we can't enable this today.
-      # If we ever have a way to detect a parallel stack and track its bounds, we can re-enable this check.
-      add_compile_options($<$<COMPILE_LANG_AND_ID:C,Clang>:-fsanitize-address-use-after-return=never>)
-      add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,Clang>:-fsanitize-address-use-after-return=never>)
+      # Disable the use-after-return check for ASAN on release builds. We track the fake-stack used by use-after-return
+      # checking only on Debug/Checked builds.
+      # On Debug and Checked builds, always enable the use-after-return check to reduce code-size.
+      add_compile_options($<$<AND:$<CONFIG:RelWithDebInfo,Release>,$<COMPILE_LANG_AND_ID:C,Clang>>:-fsanitize-address-use-after-return=never>)
+      add_compile_options($<$<AND:$<CONFIG:RelWithDebInfo,Release>,$<COMPILE_LANG_AND_ID:CXX,Clang>>:-fsanitize-address-use-after-return=never>)
+      add_compile_options($<$<AND:$<CONFIG:Debug,Checked>,$<COMPILE_LANG_AND_ID:C,Clang>>:-fsanitize-address-use-after-return=always>)
+      add_compile_options($<$<AND:$<CONFIG:Debug,Checked>,$<COMPILE_LANG_AND_ID:CXX,Clang>>:-fsanitize-address-use-after-return=always>)
     endif()
   endif()
 

src/coreclr/pal/inc/pal.h

@@ -69,7 +69,6 @@ extern "C" {
 
 #include <pal_error.h>
 #include <pal_mstypes.h>
-#include <minipal/utils.h>
 
 // Native system libray handle.
 // On Unix systems, NATIVE_LIBRARY_HANDLE type represents a library handle not registered with the PAL.

src/coreclr/pal/src/exception/machexception.cpp

@@ -366,14 +366,16 @@ RestoreCompleteContext(
 );
 #endif
 
-__attribute__((noinline))
+__attribute__((noinline)) DISABLE_ASAN
 static void PAL_DispatchExceptionInner(PCONTEXT pContext, PEXCEPTION_RECORD pExRecord)
 {
     // Stash the inner context record into a local in a frame other than PAL_DispatchException
     // to ensure we have a compiler-defined callee stack frame state to record the context record
     // local before we call SEHProcessException. The instrumentation introduced by native sanitizers
     // doesn't interface that well with the fake caller frames we define for PAL_DispatchException,
-    // but they work fine for any callees of PAL_DispatchException.
+    // but they work fine for any callees of PAL_DispatchException. However, we still need to disable
+    // sanitizers for this function to avoid using any "fake stack" features
+    // that would break the "frame offset" calculations done below.
     CONTEXT *contextRecord = pContext;
     g_hardware_exception_context_locvar_offset = (int)((char*)&contextRecord - (char*)__builtin_frame_address(0));
 

src/coreclr/pal/src/exception/seh-unwind.cpp

@@ -684,7 +684,7 @@ BOOL PAL_VirtualUnwind(CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *contextP
     // cannot cross on some systems.
     if ((void*)curPc == g_InvokeActivationHandlerReturnAddress)
     {
-        CONTEXT* activationContext = (CONTEXT*)(CONTEXTGetFP(context) + g_inject_activation_context_locvar_offset);
+        CONTEXT* activationContext = *(CONTEXT**)(CONTEXTGetFP(context) + g_inject_activation_context_locvar_offset);
         memcpy_s(context, sizeof(CONTEXT), activationContext, sizeof(CONTEXT));
 
         return TRUE;

src/coreclr/pal/src/exception/signal.cpp

@@ -790,6 +790,19 @@ static void InvokeActivationHandler(CONTEXT *pWinContext)
     g_activationFunction(pWinContext);
 }
 
+__attribute__((noinline))
+DISABLE_ASAN
+static void HoldContextAndInvokeActivationHandler(CONTEXT* pWinContext)
+{
+    // We need to disable ASAN for this function as we use the frame offset to find the context when stackwalking.
+    // Some ASAN features use fake stacks, which is incompatible with this design.
+    CONTEXT* winContext = pWinContext;
+    g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
+    int savedErrNo = errno; // Make sure that errno is not modified
+    InvokeActivationHandler(winContext);
+    errno = savedErrNo;
+}
+
 /*++
 Function :
     inject_activation_handler
@@ -835,11 +848,7 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
 
         if (g_safeActivationCheckFunction(CONTEXTGetPC(&winContext), /* checkingCurrentThread */ TRUE))
         {
-            g_inject_activation_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
-            int savedErrNo = errno; // Make sure that errno is not modified
-            InvokeActivationHandler(&winContext);
-            errno = savedErrNo;
-
+            HoldContextAndInvokeActivationHandler(&winContext);
             // Activation function may have modified the context, so update it.
             CONTEXTToNativeContext(&winContext, ucontext);
         }
@@ -945,6 +954,22 @@ void PAL_IgnoreProfileSignal(int signalNum)
 #endif
 }
 
+__attribute__((noinline))
+DISABLE_ASAN
+static bool CallSEHProcessException(CONTEXT* pContext, PAL_SEHException* pException, ucontext_t* ucontext)
+{
+    // We need to disable ASAN for this function as we use the frame offset to find the context when stackwalking.
+    // Some ASAN features use fake stacks, which is incompatible with this design.
+    CONTEXT* winContext = pContext;
+    g_hardware_exception_context_locvar_offset = (int)((char*)&winContext - (char*)__builtin_frame_address(0));
+    if (SEHProcessException(pException))
+    {
+        // Exception handling may have modified the context, so update it.
+        CONTEXTToNativeContext(winContext, ucontext);
+        return true;
+    }
+    return false;
+}
 
 /*++
 Function :
@@ -970,12 +995,10 @@ static bool common_signal_handler(int code, siginfo_t *siginfo, void *sigcontext
 #if !HAVE_MACH_EXCEPTIONS
     sigset_t signal_set;
     CONTEXT signalContextRecord;
-    CONTEXT* signalContextRecordPtr = &signalContextRecord;
     EXCEPTION_RECORD exceptionRecord;
     native_context_t *ucontext;
 
     ucontext = (native_context_t *)sigcontext;
-    g_hardware_exception_context_locvar_offset = (int)((char*)&signalContextRecordPtr - (char*)__builtin_frame_address(0));
 
     if (code == (SIGSEGV | StackOverflowFlag))
     {
@@ -1028,14 +1051,10 @@ static bool common_signal_handler(int code, siginfo_t *siginfo, void *sigcontext
     // The exception object takes ownership of the exceptionRecord and contextRecord
     PAL_SEHException exception(&exceptionRecord, &signalContextRecord, true);
 
-    if (SEHProcessException(&exception))
-    {
-        // Exception handling may have modified the context, so update it.
-        CONTEXTToNativeContext(exception.ExceptionPointers.ContextRecord, ucontext);
-        return true;
-    }
-#endif // !HAVE_MACH_EXCEPTIONS
+    return CallSEHProcessException(&signalContextRecord, &exception, ucontext);
+#else // !HAVE_MACH_EXCEPTIONS
     return false;
+#endif // !HAVE_MACH_EXCEPTIONS
 }
 
 /*++

src/coreclr/pal/src/include/pal/palinternal.h

@@ -568,6 +568,7 @@ function_name() to call the system's implementation
 #include <unistd.h>
 #include <fcntl.h>
 #include <glob.h>
+#include <minipal/utils.h>
 
 #ifdef __APPLE__
 

src/coreclr/vm/excep.cpp

@@ -3429,7 +3429,7 @@ void UnwindFrameChain(Thread* pThread, LPVOID pvLimitSP)
     CONTRACTL_END;
 
     Frame* pFrame = pThread->m_pFrame;
-    if (pFrame < pvLimitSP)
+    if (pThread->IsStackPointerBefore(dac_cast<TADDR>(pFrame), dac_cast<TADDR>(pvLimitSP)))
     {
         GCX_COOP_THREAD_EXISTS(pThread);
 

src/coreclr/vm/exceptionhandling.cpp

@@ -337,7 +337,8 @@ StackWalkAction UpdateObjectRefInResumeContextCallback(CrawlFrame* pCF, LPVOID p
 
         if (pFrame->NeedsUpdateRegDisplay())
         {
-            CONSISTENCY_CHECK(pFrame >= pState->pHighestFrameWithRegisters);
+            CONSISTENCY_CHECK(pCF->GetThread()->IsStackPointerBefore(dac_cast<TADDR>(pState->pHighestFrameWithRegisters), dac_cast<TADDR>(pFrame)) ||
+                              pState->pHighestFrameWithRegisters == pFrame);
             pState->pHighestFrameWithRegisters = pFrame;
 
             // Is this an InlinedCallFrame?
@@ -393,7 +394,7 @@ bool ExceptionTracker::FindNonvolatileRegisterPointers(Thread* pThread, UINT_PTR
     Frame *pHighestFrameWithRegisters = NULL;
     Frame *pFrame = pThread->GetFrame();
 
-    while ((UINT_PTR)pFrame < uOriginalSP)
+    while (pThread->IsStackPointerBefore(dac_cast<TADDR>(pFrame), uOriginalSP))
     {
         if (pFrame->NeedsUpdateRegDisplay())
             pHighestFrameWithRegisters = pFrame;
@@ -1189,12 +1190,14 @@ ProcessCLRException(IN     PEXCEPTION_RECORD   pExceptionRecord,
                 //
                 INDEBUG(pTracker = (ExceptionTracker*)POISONC);
 
+                INDEBUG(DWORD exceptionCode = pExceptionRecord->ExceptionCode);
+
                 // Note that we should only fail to fix up for SO.
                 bool fFixedUp = FixNonvolatileRegisters(uOriginalSP, pThread, pContextRecord, fAborting);
-                _ASSERTE(fFixedUp || (pExceptionRecord->ExceptionCode == STATUS_STACK_OVERFLOW));
+                _ASSERTE(fFixedUp || (exceptionCode == STATUS_STACK_OVERFLOW));
 
 
-                CONSISTENCY_CHECK(pLimitFrame > dac_cast<PTR_VOID>(GetSP(pContextRecord)));
+                CONSISTENCY_CHECK(pThread->IsStackPointerBefore(dac_cast<TADDR>(GetSP(pContextRecord)), dac_cast<TADDR>(pLimitFrame)));
                 if (pICFSetAsLimitFrame != NULL)
                 {
                     _ASSERTE(pICFSetAsLimitFrame == pLimitFrame);
@@ -1789,7 +1792,7 @@ CLRUnwindStatus ExceptionTracker::ProcessOSExceptionNotification(
             cfThisFrame.SetCurGSCookie(Frame::SafeGetGSCookiePtr(pFrame));
         }
 
-        while (((UINT_PTR)pFrame) < uCallerSP)
+        while (pThread->IsStackPointerBefore(dac_cast<TADDR>(pFrame), uCallerSP))
         {
             // InlinedCallFrames (ICF) are allocated, initialized and linked to the Frame chain
             // by the code generated by the JIT for a method containing a PInvoke.
@@ -1853,8 +1856,8 @@ CLRUnwindStatus ExceptionTracker::ProcessOSExceptionNotification(
                 //
                 // 1) ICF address is higher than the current frame's SP (which we get from DispatcherContext), AND
                 // 2) ICF address is below callerSP.
-                if ((GetSP(pDispatcherContext->ContextRecord) < (TADDR)pICF) &&
-                    ((UINT_PTR)pICF < uCallerSP))
+                if (pThread->IsStackPointerBefore(GetSP(pDispatcherContext->ContextRecord), (TADDR)pICF) &&
+                    pThread->IsStackPointerBefore((TADDR)pICF, uCallerSP))
                 {
                     pICFForUnwindTarget = pFrame;
 
@@ -3265,7 +3268,7 @@ CLRUnwindStatus ExceptionTracker::ProcessManagedCallFrame(
 
 #undef OPTIONAL_SO_CLEANUP_UNWIND
 
-#define OPTIONAL_SO_CLEANUP_UNWIND(pThread, pFrame)  if (pThread->GetFrame() < pFrame) { UnwindFrameChain(pThread, pFrame); }
+#define OPTIONAL_SO_CLEANUP_UNWIND(pThread, pFrame)  if (pThread->IsStackPointerBefore(dac_cast<TADDR>(pThread->GetFrame()), dac_cast<TADDR>(pFrame))) { UnwindFrameChain(pThread, pFrame); }
 
 typedef DWORD_PTR (HandlerFn)(UINT_PTR uStackFrame, Object* pExceptionObj);
 
@@ -3958,15 +3961,15 @@ ExceptionTracker* ExceptionTracker::GetOrCreateTracker(
             {
                 // In the second pass, there's a possibility that UMThunkUnwindFrameChainHandler() has
                 // popped some frames off the frame chain underneath us.  Check for this case here.
-                if (pTracker->m_pLimitFrame < pThread->GetFrame())
+                if (pThread->IsStackPointerBefore(dac_cast<TADDR>(pTracker->m_pLimitFrame), dac_cast<TADDR>(pThread->GetFrame())))
                 {
                     pTracker->ResetLimitFrame();
                 }
             }
         }
     }
 
-    _ASSERTE(pTracker->m_pLimitFrame >= pThread->GetFrame());
+    _ASSERTE(!pThread->IsStackPointerBefore(dac_cast<TADDR>(pTracker->m_pLimitFrame), dac_cast<TADDR>(pThread->GetFrame())));
 
     RETURN pTracker;
 }
@@ -5807,7 +5810,7 @@ BOOL IsSafeToUnwindFrameChain(Thread* pThread, LPVOID MemoryStackFpForFrameChain
 {
     // Look for the last Frame to be removed that marks a managed-to-unmanaged transition
     Frame* pLastFrameOfInterest = FRAME_TOP;
-    for (Frame* pf = pThread->m_pFrame; pf < MemoryStackFpForFrameChain; pf = pf->PtrNextFrame())
+    for (Frame* pf = pThread->m_pFrame; pThread->IsStackPointerBefore(dac_cast<TADDR>(pf), dac_cast<TADDR>(MemoryStackFpForFrameChain)); pf = pf->PtrNextFrame())
     {
         PCODE retAddr = pf->GetReturnAddress();
         if (retAddr != NULL && ExecutionManager::IsManagedCode(retAddr))
@@ -5862,9 +5865,9 @@ void CleanUpForSecondPass(Thread* pThread, bool fIsSO, LPVOID MemoryStackFpForFr
     // incorrectly removed a transition frame (more details in IsSafeToUnwindFrameChain)
     // [Do not perform the IsSafeToUnwindFrameChain() check in the SO case, since
     // IsSafeToUnwindFrameChain() requires a large amount of stack space.]
-    _ASSERTE(fIsSO || IsSafeToUnwindFrameChain(pThread, (Frame*)MemoryStackFpForFrameChain));
+    _ASSERTE(fIsSO || IsSafeToUnwindFrameChain(pThread, MemoryStackFpForFrameChain));
 
-    UnwindFrameChain(pThread, (Frame*)MemoryStackFpForFrameChain);
+    UnwindFrameChain(pThread, MemoryStackFpForFrameChain);
 
     // Only pop the trackers if this is not an SO.  It's not safe to pop the trackers during EH for an SO.
     // Instead, we rely on the END_SO_TOLERANT_CODE macro to call ClearExceptionStateAfterSO().  Of course,

src/coreclr/vm/frames.cpp

@@ -390,7 +390,7 @@ VOID Frame::Push(Thread *pThread)
     // with multiple Frames in coreclr.dll
     _ASSERTE((pThread->IsExecutingOnAltStack() ||
              (m_Next == FRAME_TOP) ||
-             (PBYTE(m_Next) + (2 * GetOsPageSize())) > PBYTE(this)) &&
+             dac_cast<PBYTE>(pThread->GetRealStackPointer(dac_cast<PTR_VOID>(this))) < dac_cast<PBYTE>(pThread->GetRealStackPointer(dac_cast<PTR_VOID>(m_Next))) + (2 * GetOsPageSize())) &&
              "Pushing a frame out of order ?");
 
     _ASSERTE(// If AssertOnFailFast is set, the test expects to do stack overrun
@@ -988,7 +988,7 @@ void GCFrame::Push(Thread* pThread)
     // So GetOsPageSize() is a guess of the maximum stack frame size of any method
     // with multiple GCFrames in coreclr.dll
     _ASSERTE(((m_Next == NULL) ||
-              (PBYTE(m_Next) + (2 * GetOsPageSize())) > PBYTE(this)) &&
+            dac_cast<PBYTE>(pThread->GetRealStackPointer(dac_cast<PTR_VOID>(this))) < dac_cast<PBYTE>(pThread->GetRealStackPointer(dac_cast<PTR_VOID>(m_Next))) + (2 * GetOsPageSize())) &&
              "Pushing a GCFrame out of order ?");
 
     pThread->SetGCFrame(this);

src/coreclr/vm/stackwalk.cpp

@@ -1206,7 +1206,7 @@ BOOL StackFrameIterator::Init(Thread *    pThread,
     // Walk the ExInfo chain, past any specified starting frame.
     m_exInfoWalk.Init(&(pThread->GetExceptionState()->m_currentExInfo));
     // false means don't reset UseExInfoForStackwalk
-    m_exInfoWalk.WalkToPosition(dac_cast<TADDR>(m_pStartFrame), false);
+    m_exInfoWalk.WalkToPosition(dac_cast<TADDR>(pThread->GetRealStackPointer(m_pStartFrame)), false);
 #endif // ELIMINATE_FEF
 
     //
@@ -1351,7 +1351,7 @@ BOOL StackFrameIterator::ResetRegDisp(PREGDISPLAY pRegDisp,
         while (m_crawl.pFrame != FRAME_TOP)
         {
             // this check is sufficient on WIN64
-            if (dac_cast<TADDR>(m_crawl.pFrame) >= curSP)
+            if (m_pThread->IsStackPointerBefore(curSP, dac_cast<TADDR>(m_crawl.pFrame)))
             {
 #if defined(TARGET_X86)
                 // check the IP
@@ -2418,7 +2418,7 @@ StackWalkAction StackFrameIterator::NextRaw(void)
         // FaultingExceptionFrame is special case where it gets
         // pushed on the stack after the frame is running
         _ASSERTE((m_crawl.pFrame == FRAME_TOP) ||
-                 ((TADDR)GetRegdisplaySP(m_crawl.pRD) < dac_cast<TADDR>(m_crawl.pFrame)) ||
+                 m_pThread->IsStackPointerBefore((TADDR)GetRegdisplaySP(m_crawl.pRD), dac_cast<TADDR>(m_crawl.pFrame)) ||
                  (m_crawl.pFrame->GetVTablePtr() == FaultingExceptionFrame::GetMethodFrameVPtr()));
 #endif // !defined(ELIMINATE_FEF)
 
@@ -2524,9 +2524,9 @@ StackWalkAction StackFrameIterator::NextRaw(void)
 
         PTR_VOID newSP = PTR_VOID((TADDR)GetRegdisplaySP(m_crawl.pRD));
 #ifndef NO_FIXED_STACK_LIMIT
-        FAIL_IF_SPECULATIVE_WALK(m_crawl.pThread->IsExecutingOnAltStack() || newSP >= m_crawl.pThread->GetCachedStackLimit());
+        FAIL_IF_SPECULATIVE_WALK(m_crawl.pThread->IsExecutingOnAltStack() || m_crawl.pThread->IsStackPointerBefore(dac_cast<TADDR>(m_crawl.pThread->GetCachedStackLimit()), dac_cast<TADDR>(newSP)));
 #endif // !NO_FIXED_STACK_LIMIT
-        FAIL_IF_SPECULATIVE_WALK(m_crawl.pThread->IsExecutingOnAltStack() || newSP < m_crawl.pThread->GetCachedStackBase());
+        FAIL_IF_SPECULATIVE_WALK(m_crawl.pThread->IsExecutingOnAltStack() || m_crawl.pThread->IsStackPointerBefore(dac_cast<TADDR>(newSP), dac_cast<TADDR>(m_crawl.pThread->GetCachedStackBase())));
 
 #undef FAIL_IF_SPECULATIVE_WALK
 
@@ -2828,7 +2828,7 @@ void StackFrameIterator::ProcessCurrentFrame(void)
             //  the pContext.
             // There are still a few cases in which a FaultingExceptionFrame is linked in.  If
             //  the next frame is one of them, we don't want to override it.  THIS IS PROBABLY BAD!!!
-            if ( (pContextSP < dac_cast<TADDR>(m_crawl.pFrame)) &&
+            if ( m_pThread->IsStackPointerBefore(pContextSP, dac_cast<TADDR>(m_crawl.pFrame)) &&
                  ((m_crawl.GetFrame() == FRAME_TOP) ||
                   (m_crawl.GetFrame()->GetVTablePtr() != FaultingExceptionFrame::GetMethodFrameVPtr() ) ) )
             {
@@ -2979,7 +2979,7 @@ BOOL StackFrameIterator::CheckForSkippedFrames(void)
 #endif // PROCESS_EXPLICIT_FRAME_BEFORE_MANAGED_FRAME
 
     if ( !( (m_crawl.pFrame != FRAME_TOP) &&
-            (dac_cast<TADDR>(m_crawl.pFrame) < pvReferenceSP) )
+            m_pThread->IsStackPointerBefore(dac_cast<TADDR>(m_crawl.pFrame), pvReferenceSP) )
        )
     {
         return FALSE;
@@ -2990,7 +2990,7 @@ BOOL StackFrameIterator::CheckForSkippedFrames(void)
     // We might have skipped past some Frames.
     // This happens with InlinedCallFrames.
     while ( (m_crawl.pFrame != FRAME_TOP) &&
-            (dac_cast<TADDR>(m_crawl.pFrame) < pvReferenceSP)
+            m_pThread->IsStackPointerBefore(dac_cast<TADDR>(m_crawl.pFrame), pvReferenceSP)
           )
     {
         BOOL fReportInteropMD =