From 9c70281497730a7dc7df43435bf570bef1108454 Mon Sep 17 00:00:00 2001
From: Jez Ng <jezng@fb.com>
Date: Wed, 23 Sep 2020 20:09:49 -0700
Subject: [PATCH] [lld-macho][NFC] Make `!= nullptr` implicit

---
 lld/MachO/Driver.cpp        | 6 +++---
 lld/MachO/InputFiles.cpp    | 2 +-
 lld/MachO/OutputSegment.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp
index 79808d6..e95a7350 100644
--- a/lld/MachO/Driver.cpp
+++ b/lld/MachO/Driver.cpp
@@ -613,7 +613,7 @@ bool macho::link(llvm::ArrayRef<const char *> argsArr, bool canExitEarly,
       break;
     case OPT_weak_library: {
       auto *dylibFile = dyn_cast_or_null<DylibFile>(addFile(arg->getValue()));
-      if (dylibFile != nullptr)
+      if (dylibFile)
         dylibFile->forceWeakImport = true;
       break;
     }
@@ -628,7 +628,7 @@ bool macho::link(llvm::ArrayRef<const char *> argsArr, bool canExitEarly,
       StringRef name = arg->getValue();
       if (Optional<std::string> path = findLibrary(name)) {
         auto *dylibFile = dyn_cast_or_null<DylibFile>(addFile(*path));
-        if (opt.getID() == OPT_weak_l && dylibFile != nullptr)
+        if (opt.getID() == OPT_weak_l && dylibFile)
           dylibFile->forceWeakImport = true;
         break;
       }
@@ -640,7 +640,7 @@ bool macho::link(llvm::ArrayRef<const char *> argsArr, bool canExitEarly,
       StringRef name = arg->getValue();
       if (Optional<std::string> path = findFramework(name)) {
         auto *dylibFile = dyn_cast_or_null<DylibFile>(addFile(*path));
-        if (opt.getID() == OPT_weak_framework && dylibFile != nullptr)
+        if (opt.getID() == OPT_weak_framework && dylibFile)
           dylibFile->forceWeakImport = true;
         break;
       }
diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
index 8516e90..ad2d6a2 100644
--- a/lld/MachO/InputFiles.cpp
+++ b/lld/MachO/InputFiles.cpp
@@ -387,7 +387,7 @@ static Optional<DylibFile *> loadReexport(StringRef path, DylibFile *umbrella) {
 
   // TODO: Expand @loader_path, @executable_path etc
 
-  if (currentTopLevelTapi != nullptr) {
+  if (currentTopLevelTapi) {
     for (InterfaceFile &child :
          make_pointee_range(currentTopLevelTapi->documents())) {
       if (path == child.getInstallName())
diff --git a/lld/MachO/OutputSegment.cpp b/lld/MachO/OutputSegment.cpp
index 5e57c49..07e4590 100644
--- a/lld/MachO/OutputSegment.cpp
+++ b/lld/MachO/OutputSegment.cpp
@@ -54,7 +54,7 @@ std::vector<OutputSegment *> macho::outputSegments;
 
 OutputSegment *macho::getOrCreateOutputSegment(StringRef name) {
   OutputSegment *&segRef = nameToOutputSegment[name];
-  if (segRef != nullptr)
+  if (segRef)
     return segRef;
 
   segRef = make<OutputSegment>();
-- 
2.7.4