Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Merge changes from TFS #269

Merged
jkotas merged 1 commit into from
Feb 14, 2015
Merged

Merge changes from TFS #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vm/stackwalk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2925,17 +2925,17 @@ BOOL StackFrameIterator::CheckForSkippedFrames(void)
// Can the caller handle skipped frames;
fHandleSkippedFrames = (m_flags & HANDLESKIPPEDFRAMES);

#if !defined(_TARGET_X86_)
#if defined(_TARGET_X86_)
pvReferenceSP = GetRegdisplaySP(m_crawl.pRD);
#else // !_TARGET_X86_
#else // _TARGET_X86_
// Order the Frames relative to the caller SP of the methods
// this makes it so that any Frame that is in a managed call
// frame will be reported before its containing method.

// This should always succeed! If it doesn't, it's a bug somewhere else!
EECodeManager::EnsureCallerContextIsValid(m_crawl.pRD, m_crawl.GetStackwalkCacheEntry(), &m_cachedCodeInfo);
pvReferenceSP = GetSP(m_crawl.pRD->pCallerContext);
#endif // !_TARGET_X86_
#endif // _TARGET_X86_

if ( !( (m_crawl.pFrame != FRAME_TOP) &&
(dac_cast<TADDR>(m_crawl.pFrame) < pvReferenceSP) )
Expand Down