Fix warning converting from boolean to pointer introduced in r301153.

This reverts commit r301155, which was incorrect.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301156 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp
index 05e7ca630ecbad8f86dfb13fca68682e831316e3..1541a5726302e3e661db20aa51801d104e6c22b8 100644 (file)
--- a/lib/Support/DynamicLibrary.cpp
+++ b/lib/Support/DynamicLibrary.cpp
@@ -61,7 +61,7 @@ public:
       Handles.push_back(Handle);
     } else {
 #ifndef LLVM_ON_WIN32
-      if (Process != nullptr) {
+      if (Process) {
         if (CanClose)
           DLClose(Process);
         if (Process == Handle)

diff --git a/lib/Support/Windows/DynamicLibrary.inc b/lib/Support/Windows/DynamicLibrary.inc
index c9bd38ab76c071df2492ef999dc3aa1c58a61fbc..b43ae54cf859b065523a500302c4ed8f6d0f8e46 100644 (file)
--- a/lib/Support/Windows/DynamicLibrary.inc
+++ b/lib/Support/Windows/DynamicLibrary.inc
@@ -61,7 +61,7 @@ void *DynamicLibrary::HandleSet::DLOpen(const char *File, std::string *Err) {
 
 static DynamicLibrary::HandleSet *IsOpenedHandlesInstance(void *Handle) {
   if (!OpenedHandles.isConstructed())
-    return false;
+    return nullptr;
   DynamicLibrary::HandleSet &Inst = *OpenedHandles;
   return Handle == &Inst ? &Inst : nullptr;
 }