Skip to content

Fix unhandled exception line number issues #2269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikem8361 merged 5 commits into from
Jan 30, 2020
Merged

Fix unhandled exception line number issues #2269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba2662a
Fix unhandled exception line number issues
Jan 8, 2020
2d7156c
Code review feedback
Jan 23, 2020
d7f0c50
Fix IL offset map search
Jan 24, 2020
6dd19d2
Code review feedback
Jan 28, 2020
41492d0
Code review feedback
Jan 30, 2020
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
Prev Previous commit
Next Next commit
Code review feedback
  • Loading branch information
Mike McLaughlin committed Jan 28, 2020
commit 6dd19d28a4c4f671e727bb1b39befb77f1e57191
6 changes: 3 additions & 3 deletions src/coreclr/src/vm/clrex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ enum StackTraceElementFlags
STEF_IP_ADJUSTED = 0x0002,
};

// This struct is used by SOS in the diagnostic repo and needs to remain backwards compatible.
// This struct is used by SOS in the diagnostic repo.
// See: https://github.com/dotnet/diagnostics/blob/master/src/SOS/Strike/strike.cpp#L2245
struct StackTraceElement
{
UINT_PTR ip;
UINT_PTR sp;
PTR_MethodDesc pFunc;
INT flags; // This is StackTraceElementFlags but it needs to always be "int" sized for compatibility with SOS.
INT flags; // This is StackTraceElementFlags but it needs to be "int" sized for compatibility with SOS.

bool operator==(StackTraceElement const & rhs) const
{
Expand All @@ -53,7 +53,7 @@ struct StackTraceElement
}
};

// This struct is used by SOS in the diagnostic repo and needs to remain backwards compatible.
// This struct is used by SOS in the diagnostic repo.
// See: https://github.com/dotnet/diagnostics/blob/master/src/SOS/Strike/strike.cpp#L2669
class StackTraceInfo
{
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ void ExceptionTracker::InitializeCrawlFrameForExplicitFrame(CrawlFrame* pcfThisF

INDEBUG(memset(pcfThisFrame, 0xCC, sizeof(*pcfThisFrame)));

// Clear various flags because the above INDEBUG sets them to true
// Clear various flags
pcfThisFrame->isFrameless = false;
pcfThisFrame->isInterrupted = false;
pcfThisFrame->hasFaulted = false;
Expand Down Expand Up @@ -1422,7 +1422,7 @@ void ExceptionTracker::InitializeCrawlFrame(CrawlFrame* pcfThisFrame, Thread* pT
INDEBUG(memset(pcfThisFrame, 0xCC, sizeof(*pcfThisFrame)));
pcfThisFrame->pRD = pRD;

// Clear various flags because the above INDEBUG sets them to true
// Clear various flags
pcfThisFrame->pFunc = NULL;
pcfThisFrame->isInterrupted = false;
pcfThisFrame->hasFaulted = false;
Expand Down