diff --git a/lldb/include/lldb/API/SBDefines.h b/lldb/include/lldb/API/SBDefines.h index fcbcffec9951..838c84cece6d 100644 --- a/lldb/include/lldb/API/SBDefines.h +++ b/lldb/include/lldb/API/SBDefines.h @@ -16,10 +16,6 @@ #include "lldb/lldb-types.h" #include "lldb/lldb-versioning.h" -#ifdef SWIG -#define LLDB_API -#endif - // Forward Declarations namespace lldb { diff --git a/lldb/include/lldb/API/SBThread.h b/lldb/include/lldb/API/SBThread.h index de4e7cd21707..773193b23362 100644 --- a/lldb/include/lldb/API/SBThread.h +++ b/lldb/include/lldb/API/SBThread.h @@ -205,14 +205,7 @@ public: bool SafeToCallFunctions(); -#ifndef SWIG - lldb_private::Thread *operator->(); - - lldb_private::Thread *get(); - -#endif - -protected: +private: friend class SBBreakpoint; friend class SBBreakpointLocation; friend class SBBreakpointCallbackBaton; @@ -223,16 +216,18 @@ protected: friend class SBValue; friend class lldb_private::QueueImpl; friend class SBQueueItem; + friend class SBThreadPlan; void SetThread(const lldb::ThreadSP &lldb_object_sp); -#ifndef SWIG SBError ResumeNewPlan(lldb_private::ExecutionContext &exe_ctx, lldb_private::ThreadPlan *new_plan); -#endif -private: lldb::ExecutionContextRefSP m_opaque_sp; + + lldb_private::Thread *operator->(); + + lldb_private::Thread *get(); }; } // namespace lldb diff --git a/lldb/include/lldb/API/SBThreadPlan.h b/lldb/include/lldb/API/SBThreadPlan.h index 6c57364d0bbe..fae73cf5e359 100644 --- a/lldb/include/lldb/API/SBThreadPlan.h +++ b/lldb/include/lldb/API/SBThreadPlan.h @@ -103,11 +103,7 @@ public: SBThreadPlan QueueThreadPlanForStepScripted(const char *script_class_name, SBError &error); -#ifndef SWIG - lldb_private::ThreadPlan *get(); -#endif - -protected: +private: friend class SBBreakpoint; friend class SBBreakpointLocation; friend class SBFrame; @@ -117,11 +113,9 @@ protected: friend class lldb_private::QueueImpl; friend class SBQueueItem; -#ifndef SWIG + lldb_private::ThreadPlan *get(); void SetThreadPlan(const lldb::ThreadPlanSP &lldb_object_sp); -#endif -private: lldb::ThreadPlanSP m_opaque_sp; }; diff --git a/lldb/include/lldb/Core/Address.h b/lldb/include/lldb/Core/Address.h index d7eeccc58e6d..6cadf72c7ffe 100644 --- a/lldb/include/lldb/Core/Address.h +++ b/lldb/include/lldb/Core/Address.h @@ -194,9 +194,7 @@ public: /// \return /// A const Address object reference to \a this. //------------------------------------------------------------------ -#ifndef SWIG const Address &operator=(const Address &rhs); -#endif //------------------------------------------------------------------ /// Clear the object's state. diff --git a/lldb/include/lldb/Core/SourceManager.h b/lldb/include/lldb/Core/SourceManager.h index 36648378d93a..0426efce32de 100644 --- a/lldb/include/lldb/Core/SourceManager.h +++ b/lldb/include/lldb/Core/SourceManager.h @@ -39,7 +39,6 @@ namespace lldb_private { class SourceManager { public: -#ifndef SWIG class File { friend bool operator==(const SourceManager::File &lhs, const SourceManager::File &rhs); @@ -99,11 +98,9 @@ public: private: void CommonInitializer(const FileSpec &file_spec, Target *target); }; -#endif // SWIG typedef std::shared_ptr FileSP; -#ifndef SWIG // The SourceFileCache class separates the source manager from the cache of // source files, so the cache can be stored in the Debugger, but the source // managers can be per target. @@ -119,7 +116,6 @@ public: typedef std::map FileCache; FileCache m_file_cache; }; -#endif // SWIG //------------------------------------------------------------------ // Constructors and Destructors diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h index 20a5bed29781..2675c6d5c93a 100644 --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/include/lldb/Target/Process.h @@ -418,7 +418,6 @@ public: /// \see RegisterNotificationCallbacks (const Notifications&) @see /// UnregisterNotificationCallbacks (const Notifications&) //------------------------------------------------------------------ -#ifndef SWIG typedef struct { void *baton; void (*initialize)(void *baton, Process *process); @@ -503,7 +502,6 @@ public: DISALLOW_COPY_AND_ASSIGN(ProcessEventData); }; -#endif // SWIG //------------------------------------------------------------------ /// Construct with a shared pointer to a target, and the Process listener. @@ -824,9 +822,7 @@ public: /// /// \see Process::Notifications //------------------------------------------------------------------ -#ifndef SWIG void RegisterNotificationCallbacks(const Process::Notifications &callbacks); -#endif //------------------------------------------------------------------ /// Unregister for process and thread notifications. @@ -844,9 +840,7 @@ public: /// /// \see Process::Notifications //------------------------------------------------------------------ -#ifndef SWIG bool UnregisterNotificationCallbacks(const Process::Notifications &callbacks); -#endif //================================================================== // Built in Process Control functions diff --git a/lldb/scripts/interface/SBFrame.i b/lldb/scripts/interface/SBFrame.i index c1021eb855e4..b797aea44135 100644 --- a/lldb/scripts/interface/SBFrame.i +++ b/lldb/scripts/interface/SBFrame.i @@ -210,15 +210,12 @@ public: void Clear(); -#ifndef SWIG bool operator == (const lldb::SBFrame &rhs) const; bool operator != (const lldb::SBFrame &rhs) const; -#endif - %feature("docstring", " /// The version that doesn't supply a 'use_dynamic' value will use the /// target's default. diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp index 4d2cf3364b62..3ec03f28a0cb 100644 --- a/lldb/source/API/SBThread.cpp +++ b/lldb/source/API/SBThread.cpp @@ -1398,21 +1398,11 @@ bool SBThread::SafeToCallFunctions() { } lldb_private::Thread *SBThread::operator->() { - LLDB_RECORD_METHOD_NO_ARGS(lldb_private::Thread *, SBThread, operator->); - - ThreadSP thread_sp(m_opaque_sp->GetThreadSP()); - if (thread_sp) - return LLDB_RECORD_RESULT(thread_sp.get()); - return nullptr; + return get(); } lldb_private::Thread *SBThread::get() { - LLDB_RECORD_METHOD_NO_ARGS(lldb_private::Thread *, SBThread, get); - - ThreadSP thread_sp(m_opaque_sp->GetThreadSP()); - if (thread_sp) - return LLDB_RECORD_RESULT(thread_sp.get()); - return nullptr; + return m_opaque_sp->GetThreadSP().get(); } namespace lldb_private { @@ -1516,8 +1506,6 @@ void RegisterMethods(Registry &R) { LLDB_REGISTER_METHOD(lldb::SBThread, SBThread, GetCurrentExceptionBacktrace, ()); LLDB_REGISTER_METHOD(bool, SBThread, SafeToCallFunctions, ()); - LLDB_REGISTER_METHOD(lldb_private::Thread *, SBThread, operator->,()); - LLDB_REGISTER_METHOD(lldb_private::Thread *, SBThread, get, ()); } } diff --git a/lldb/source/API/SBThreadPlan.cpp b/lldb/source/API/SBThreadPlan.cpp index 742a3570f404..d1db5c0e5388 100644 --- a/lldb/source/API/SBThreadPlan.cpp +++ b/lldb/source/API/SBThreadPlan.cpp @@ -89,11 +89,7 @@ const lldb::SBThreadPlan &SBThreadPlan::operator=(const SBThreadPlan &rhs) { //---------------------------------------------------------------------- SBThreadPlan::~SBThreadPlan() {} -lldb_private::ThreadPlan *SBThreadPlan::get() { - LLDB_RECORD_METHOD_NO_ARGS(lldb_private::ThreadPlan *, SBThreadPlan, get); - - return LLDB_RECORD_RESULT(m_opaque_sp.get()); -} +lldb_private::ThreadPlan *SBThreadPlan::get() { return m_opaque_sp.get(); } bool SBThreadPlan::IsValid() const { LLDB_RECORD_METHOD_CONST_NO_ARGS(bool, SBThreadPlan, IsValid); @@ -402,7 +398,6 @@ void RegisterMethods(Registry &R) { LLDB_REGISTER_CONSTRUCTOR(SBThreadPlan, (lldb::SBThread &, const char *)); LLDB_REGISTER_METHOD(const lldb::SBThreadPlan &, SBThreadPlan, operator=,(const lldb::SBThreadPlan &)); - LLDB_REGISTER_METHOD(lldb_private::ThreadPlan *, SBThreadPlan, get, ()); LLDB_REGISTER_METHOD_CONST(bool, SBThreadPlan, IsValid, ()); LLDB_REGISTER_METHOD_CONST(bool, SBThreadPlan, operator bool, ()); LLDB_REGISTER_METHOD(void, SBThreadPlan, Clear, ());