diff options
| author | Davide Italiano <davide@freebsd.org> | 2015-12-01 05:33:24 +0000 |
|---|---|---|
| committer | Davide Italiano <davide@freebsd.org> | 2015-12-01 05:33:24 +0000 |
| commit | 05402671b89e66447876ba7c2d345e86a2e88b1a (patch) | |
| tree | ca4ae12f767efd0ee485878959638c6318042585 | |
| parent | d97c100dc456b7e1222ab2e0ddf233a09bbf627c (diff) | |
| download | bcm5719-llvm-05402671b89e66447876ba7c2d345e86a2e88b1a.tar.gz bcm5719-llvm-05402671b89e66447876ba7c2d345e86a2e88b1a.zip | |
[Windows] Partially revert r254363 until I can test the right fix.
Reported by: David Blaikie
llvm-svn: 254378
| -rw-r--r-- | llvm/lib/Support/Windows/DynamicLibrary.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index e612283e630..17418b015c7 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/lib/Support/Windows/DynamicLibrary.inc @@ -60,8 +60,12 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, if (OpenedHandles == 0) OpenedHandles = new DenseSet<HMODULE>(); - if (!fEnumerateLoadedModules) - assert(loadDebugHelp() && "These APIs should always be available"); + if (!fEnumerateLoadedModules) { + if (!loadDebugHelp()) { + assert(false && "These APIs should always be available"); + return DynamicLibrary(); + } + } fEnumerateLoadedModules(GetCurrentProcess(), ELM_Callback, 0); // Dummy library that represents "search all handles". |
