From 050e163ae8b4bb6eb252b59e2f8f36e68ae9239d Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 13 Jan 2016 19:58:01 +0000
Subject: Vendor import of llvm trunk r257626:
 https://llvm.org/svn/llvm-project/llvm/trunk@257626

---
 lib/Support/Windows/Signals.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/Support/Windows/Signals.inc')

diff --git a/lib/Support/Windows/Signals.inc b/lib/Support/Windows/Signals.inc
index d109a66d7035..f40ca72996a1 100644
--- a/lib/Support/Windows/Signals.inc
+++ b/lib/Support/Windows/Signals.inc
@@ -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);
-- 
cgit v1.3