maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[Windows] Simplify assertion code. NFC." 

This reverts commit r254363.

load64BitDebugHelp() has the side effect of loading dbghelp and setting
globals. It should be called in no-asserts builds as well as debug
builds.

llvm_unreachable is also not appropriate here, since we actually want to
return if dbghelp couldn't be loaded in a non-asserts build.

llvm-svn: 257384
This commit is contained in:
Reid Kleckner 2016-01-11 21:07:48 +00:00
parent dc78f95dc2
commit 6cdf844d75
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Support/Windows/Signals.inc
View File

@ -405,7 +405,10 @@ static void RegisterHandler() {
// If we cannot load up the APIs (which would be unexpected as they should
// exist on every version of Windows we support), we will bail out since
// there would be nothing to report.
assert(load64BitDebugHelp() && "These APIs should always be available");
if (!load64BitDebugHelp()) {
assert(false && "These APIs should always be available");
return;
}
if (RegisteredUnhandledExceptionFilter) {
EnterCriticalSection(&CriticalSection);