Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,6 @@ NativeProcessWindows::OnDebugException(bool first_chance,
ProcessDebugger::OnDebugException(first_chance, record);

static bool initial_stop = false;
if (!first_chance) {
SetState(eStateStopped, false);
}

switch (record.GetExceptionCode()) {
case DWORD(STATUS_SINGLE_STEP):
Expand Down Expand Up @@ -582,6 +579,9 @@ NativeProcessWindows::OnDebugException(bool first_chance,
record.GetExceptionCode(), record.GetExceptionAddress(),
first_chance);

if (first_chance)
return ExceptionResult::SendToApplication;

std::string desc;
llvm::raw_string_ostream desc_stream(desc);
desc_stream << "Exception "
Expand All @@ -593,12 +593,7 @@ NativeProcessWindows::OnDebugException(bool first_chance,

SetState(eStateStopped, true);

// For non-breakpoints, give the application a chance to handle the
// exception first.
if (first_chance)
return ExceptionResult::SendToApplication;
else
return ExceptionResult::BreakInDebugger;
return ExceptionResult::BreakInDebugger;
}
}
}
Expand Down