Fix SWIG

Author: JDevlieghere

lldb/bindings/headers.swig

@@ -39,11 +39,12 @@
 #include "lldb/API/SBHostOS.h"
 #include "lldb/API/SBInstruction.h"
 #include "lldb/API/SBInstructionList.h"
-#include "lldb/API/SBLanguages.h"
 #include "lldb/API/SBLanguageRuntime.h"
+#include "lldb/API/SBLanguages.h"
 #include "lldb/API/SBLaunchInfo.h"
 #include "lldb/API/SBLineEntry.h"
 #include "lldb/API/SBListener.h"
+#include "lldb/API/SBLock.h"
 #include "lldb/API/SBMemoryRegionInfo.h"
 #include "lldb/API/SBMemoryRegionInfoList.h"
 #include "lldb/API/SBModule.h"

lldb/bindings/interfaces.swig

@@ -121,11 +121,12 @@
 %include "lldb/API/SBHostOS.h"
 %include "lldb/API/SBInstruction.h"
 %include "lldb/API/SBInstructionList.h"
-%include "lldb/API/SBLanguages.h"
 %include "lldb/API/SBLanguageRuntime.h"
+%include "lldb/API/SBLanguages.h"
 %include "lldb/API/SBLaunchInfo.h"
 %include "lldb/API/SBLineEntry.h"
 %include "lldb/API/SBListener.h"
+%include "lldb/API/SBLock.h"
 %include "lldb/API/SBMemoryRegionInfo.h"
 %include "lldb/API/SBMemoryRegionInfoList.h"
 %include "lldb/API/SBModule.h"

lldb/include/lldb/API/SBLock.h

@@ -19,16 +19,16 @@ struct APILock;
 
 namespace lldb {
 
-#ifndef SWIG
 class LLDB_API SBLock {
 public:
+  SBLock();
+  SBLock(SBLock &&rhs);
+  SBLock &operator=(SBLock &&rhs);
   ~SBLock();
 
   bool IsValid() const;
 
 private:
-  SBLock() = default;
-
   // Private constructor used by SBTarget to create the Target API lock.
   // Requires a friend declaration.
   SBLock(lldb::TargetSP target_sp);
@@ -42,5 +42,3 @@ class LLDB_API SBLock {
 #endif
 
 } // namespace lldb
-
-#endif

lldb/include/lldb/API/SBTarget.h

@@ -946,9 +946,7 @@ class LLDB_API SBTarget {
   ///     An error if a Trace already exists or the trace couldn't be created.
   lldb::SBTrace CreateTrace(SBError &error);
 
-#ifndef SWIG
   lldb::SBLock AcquireAPILock() const;
-#endif
 
 protected:
   friend class SBAddress;

lldb/source/API/SBLock.cpp

@@ -11,11 +11,18 @@
 #include "lldb/Utility/Instrumentation.h"
 #include "lldb/lldb-forward.h"
 #include <memory>
-#include <mutex>
 
 using namespace lldb;
 using namespace lldb_private;
 
+SBLock::SBLock() {}
+SBLock::SBLock(SBLock &&rhs) : m_opaque_up(std::move(rhs.m_opaque_up)) {}
+
+SBLock &SBLock::operator=(SBLock &&rhs) {
+  m_opaque_up = std::move(rhs.m_opaque_up);
+  return *this;
+}
+
 SBLock::SBLock(lldb::TargetSP target_sp)
     : m_opaque_up(std::make_unique<TargetAPILock>(target_sp)) {
   LLDB_INSTRUMENT_VA(this);

lldb/source/API/SBTarget.cpp

@@ -2434,12 +2434,10 @@ lldb::SBTrace SBTarget::CreateTrace(lldb::SBError &error) {
   return SBTrace();
 }
 
-#ifndef SWIG
 lldb::SBLock SBTarget::AcquireAPILock() const {
   LLDB_INSTRUMENT_VA(this);
 
   if (TargetSP target_sp = GetSP())
     return lldb::SBLock(target_sp);
   return lldb::SBLock();
 }
-#endif

lldb/unittests/API/SBLockTest.cpp

@@ -21,11 +21,15 @@ using namespace lldb;
 using namespace lldb_private;
 
 class SBLockTest : public testing::Test {
+protected:
+  void SetUp() override { debugger = SBDebugger::Create(); }
+  void TearDown() override { SBDebugger::Destroy(debugger); }
+
   SubsystemRAII<lldb::SBDebugger> subsystems;
+  SBDebugger debugger;
 };
 
 TEST_F(SBLockTest, LockTest) {
-  lldb::SBDebugger debugger = lldb::SBDebugger::Create();
   lldb::SBTarget target = debugger.GetDummyTarget();
 
   std::future<void> f;
@@ -50,6 +54,4 @@ TEST_F(SBLockTest, LockTest) {
     ASSERT_TRUE(locked.exchange(false));
   }
   f.wait();
-
-  lldb::SBDebugger::Destroy(debugger);
 }