[PATCH] D38121: [XRay][compiler-rt] Remove non-trivial globals from xray_log_interface.cc

[Dean Michael Berris via Phabricator via llvm-commits]

dberris created this revision.

Remove dependency on std::unique_ptr<...> for the global representing
the installed XRay implementation.


https://reviews.llvm.org/D38121

Files:
  lib/xray/xray_log_interface.cc


Index: lib/xray/xray_log_interface.cc
===================================================================
--- lib/xray/xray_log_interface.cc
+++ lib/xray/xray_log_interface.cc
@@ -17,30 +17,30 @@
 #include "xray/xray_interface.h"
 #include "xray_defs.h"
 
-#include <memory>
-
 __sanitizer::SpinMutex XRayImplMutex;
-std::unique_ptr<XRayLogImpl> GlobalXRayImpl;
+XRayLogImpl *GlobalXRayImpl = nullptr;
 
 void __xray_set_log_impl(XRayLogImpl Impl) XRAY_NEVER_INSTRUMENT {
   if (Impl.log_init == nullptr || Impl.log_finalize == nullptr ||
       Impl.handle_arg0 == nullptr || Impl.flush_log == nullptr) {
     __sanitizer::SpinMutexLock Guard(&XRayImplMutex);
-    GlobalXRayImpl.reset();
+    delete GlobalXRayImpl;
+    GlobalXRayImpl = nullptr;
     __xray_remove_handler();
     __xray_remove_handler_arg1();
     return;
   }
 
   __sanitizer::SpinMutexLock Guard(&XRayImplMutex);
-  GlobalXRayImpl.reset(new XRayLogImpl);
+  GlobalXRayImpl = new XRayLogImpl();
   *GlobalXRayImpl = Impl;
   __xray_set_handler(Impl.handle_arg0);
 }
 
 void __xray_remove_log_impl() XRAY_NEVER_INSTRUMENT {
   __sanitizer::SpinMutexLock Guard(&XRayImplMutex);
-  GlobalXRayImpl.reset();
+  delete GlobalXRayImpl;
+  GlobalXRayImpl = nullptr;
   __xray_remove_handler();
   __xray_remove_handler_arg1();
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38121.116142.patch
Type: text/x-patch
Size: 1295 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170921/621de88a/attachment.bin>