vendor/llvm-project/llvmorg-13-init-16847-g88e66fa60ae5vendor/llvm-project/llvmorg-12.0.1-rc2-0-ge7dac564cd0evendor/llvm-project/llvmorg-12.0.1-0-gfed41342a82f

1 files changed, 46 insertions, 33 deletions

diff --git a/llvm/lib/Support/Signposts.cpp b/llvm/lib/Support/Signposts.cpp
index 9353e9b294d1..49a0b16baa02 100644
--- a/llvm/lib/Support/Signposts.cpp
+++ b/llvm/lib/Support/Signposts.cpp
@@ -10,12 +10,10 @@
 #include "llvm/Support/Signposts.h"
 #include "llvm/Support/Timer.h"
 
-#include "llvm/Config/config.h"
 #if LLVM_SUPPORT_XCODE_SIGNPOSTS
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Mutex.h"
-#include <os/signpost.h>
-#endif // if LLVM_SUPPORT_XCODE_SIGNPOSTS
+#endif
 
 using namespace llvm;
 
@@ -26,55 +24,69 @@ os_log_t *LogCreator() {
   *X = os_log_create("org.llvm.signposts", OS_LOG_CATEGORY_POINTS_OF_INTEREST);
   return X;
 }
-void LogDeleter(os_log_t *X) {
-  os_release(*X);
-  delete X;
-}
+struct LogDeleter {
+  void operator()(os_log_t *X) const {
+    os_release(*X);
+    delete X;
+  }
+};
 } // end anonymous namespace
 
 namespace llvm {
 class SignpostEmitterImpl {
-  using LogPtrTy = std::unique_ptr<os_log_t, std::function<void(os_log_t *)>>;
-  using LogTy = LogPtrTy::element_type;
+  using LogPtrTy = std::unique_ptr<os_log_t, LogDeleter>;
 
   LogPtrTy SignpostLog;
   DenseMap<const void *, os_signpost_id_t> Signposts;
   sys::SmartMutex<true> Mutex;
 
-  LogTy &getLogger() const { return *SignpostLog; }
+public:
+  os_log_t &getLogger() const { return *SignpostLog; }
   os_signpost_id_t getSignpostForObject(const void *O) {
     sys::SmartScopedLock<true> Lock(Mutex);
     const auto &I = Signposts.find(O);
     if (I != Signposts.end())
       return I->second;
-
-    const auto &Inserted = Signposts.insert(
-        std::make_pair(O, os_signpost_id_make_with_pointer(getLogger(), O)));
+    os_signpost_id_t ID = {};
+    if (SIGNPOSTS_AVAILABLE()) {
+      ID = os_signpost_id_make_with_pointer(getLogger(), O);
+    }
+    const auto &Inserted = Signposts.insert(std::make_pair(O, ID));
     return Inserted.first->second;
   }
 
-public:
-  SignpostEmitterImpl() : SignpostLog(LogCreator(), LogDeleter), Signposts() {}
+  SignpostEmitterImpl() : SignpostLog(LogCreator()) {}
 
-  bool isEnabled() const { return os_signpost_enabled(*SignpostLog); }
+  bool isEnabled() const {
+    if (SIGNPOSTS_AVAILABLE())
+      return os_signpost_enabled(*SignpostLog);
+    return false;
+  }
 
   void startInterval(const void *O, llvm::StringRef Name) {
     if (isEnabled()) {
-      // Both strings used here are required to be constant literal strings.
-      os_signpost_interval_begin(getLogger(), getSignpostForObject(O),
-                                 "LLVM Timers", "Begin %s", Name.data());
+      if (SIGNPOSTS_AVAILABLE()) {
+        // Both strings used here are required to be constant literal strings.
+        os_signpost_interval_begin(getLogger(), getSignpostForObject(O),
+                                   "LLVM Timers", "%s", Name.data());
+      }
     }
   }
 
-  void endInterval(const void *O, llvm::StringRef Name) {
+  void endInterval(const void *O) {
     if (isEnabled()) {
-      // Both strings used here are required to be constant literal strings.
-      os_signpost_interval_end(getLogger(), getSignpostForObject(O),
-                               "LLVM Timers", "End %s", Name.data());
+      if (SIGNPOSTS_AVAILABLE()) {
+        // Both strings used here are required to be constant literal strings.
+        os_signpost_interval_end(getLogger(), getSignpostForObject(O),
+                                 "LLVM Timers", "");
+      }
     }
   }
 };
 } // end namespace llvm
+#else
+/// Definition necessary for use of std::unique_ptr in SignpostEmitter::Impl.
+class llvm::SignpostEmitterImpl {};
 #endif // if LLVM_SUPPORT_XCODE_SIGNPOSTS
 
 #if LLVM_SUPPORT_XCODE_SIGNPOSTS
@@ -85,17 +97,11 @@ public:
 
 SignpostEmitter::SignpostEmitter() {
 #if HAVE_ANY_SIGNPOST_IMPL
-  Impl = new SignpostEmitterImpl();
-#else  // if HAVE_ANY_SIGNPOST_IMPL
-  Impl = nullptr;
+  Impl = std::make_unique<SignpostEmitterImpl>();
 #endif // if !HAVE_ANY_SIGNPOST_IMPL
 }
 
-SignpostEmitter::~SignpostEmitter() {
-#if HAVE_ANY_SIGNPOST_IMPL
-  delete Impl;
-#endif // if HAVE_ANY_SIGNPOST_IMPL
-}
+SignpostEmitter::~SignpostEmitter() = default;
 
 bool SignpostEmitter::isEnabled() const {
 #if HAVE_ANY_SIGNPOST_IMPL
@@ -113,10 +119,17 @@ void SignpostEmitter::startInterval(const void *O, StringRef Name) {
 #endif // if !HAVE_ANY_SIGNPOST_IMPL
 }
 
-void SignpostEmitter::endInterval(const void *O, StringRef Name) {
+#if HAVE_ANY_SIGNPOST_IMPL
+os_log_t &SignpostEmitter::getLogger() const { return Impl->getLogger(); }
+os_signpost_id_t SignpostEmitter::getSignpostForObject(const void *O) {
+  return Impl->getSignpostForObject(O);
+}
+#endif
+
+void SignpostEmitter::endInterval(const void *O) {
 #if HAVE_ANY_SIGNPOST_IMPL
   if (Impl == nullptr)
     return;
-  Impl->endInterval(O, Name);
+  Impl->endInterval(O);
 #endif // if !HAVE_ANY_SIGNPOST_IMPL
 }