Merge pull request #7104 from medismailben/stable/20221013

Author: medismailben

lldb/bindings/lua/lua-wrapper.swig

@@ -3,7 +3,8 @@
 template <typename T> void PushSBClass(lua_State * L, T * obj);
 
 // This function is called from Lua::CallBreakpointCallback
-llvm::Expected<bool> lldb_private::LLDBSwigLuaBreakpointCallbackFunction(
+llvm::Expected<bool>
+lldb_private::lua::SWIGBridge::LLDBSwigLuaBreakpointCallbackFunction(
     lua_State * L, lldb::StackFrameSP stop_frame_sp,
     lldb::BreakpointLocationSP bp_loc_sp,
     const StructuredDataImpl &extra_args_impl) {
@@ -41,7 +42,8 @@ llvm::Expected<bool> lldb_private::LLDBSwigLuaBreakpointCallbackFunction(
 }
 
 // This function is called from Lua::CallWatchpointCallback
-llvm::Expected<bool> lldb_private::LLDBSwigLuaWatchpointCallbackFunction(
+llvm::Expected<bool>
+lldb_private::lua::SWIGBridge::LLDBSwigLuaWatchpointCallbackFunction(
     lua_State * L, lldb::StackFrameSP stop_frame_sp, lldb::WatchpointSP wp_sp) {
   lldb::SBFrame sb_frame(stop_frame_sp);
   lldb::SBWatchpoint sb_wp(wp_sp);

lldb/bindings/python/python-swigsafecast.swig

@@ -5,113 +5,117 @@ PythonObject ToSWIGHelper(void *obj, swig_type_info *info) {
   return {PyRefType::Owned, SWIG_NewPointerObj(obj, info, SWIG_POINTER_OWN)};
 }
 
-PythonObject ToSWIGWrapper(std::unique_ptr<lldb::SBValue> value_sb) {
+PythonObject SWIGBridge::ToSWIGWrapper(std::unique_ptr<lldb::SBValue> value_sb) {
   return ToSWIGHelper(value_sb.release(), SWIGTYPE_p_lldb__SBValue);
 }
 
-PythonObject ToSWIGWrapper(lldb::ValueObjectSP value_sp) {
-  return ToSWIGWrapper(std::make_unique<lldb::SBValue>(std::move(value_sp)));
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::ValueObjectSP value_sp) {
+  return ToSWIGWrapper(std::unique_ptr<lldb::SBValue>(new lldb::SBValue(value_sp)));
 }
 
-PythonObject ToSWIGWrapper(lldb::TargetSP target_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::TargetSP target_sp) {
   return ToSWIGHelper(new lldb::SBTarget(std::move(target_sp)),
                       SWIGTYPE_p_lldb__SBTarget);
 }
 
-PythonObject ToSWIGWrapper(lldb::ProcessSP process_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::ProcessSP process_sp) {
   return ToSWIGHelper(new lldb::SBProcess(std::move(process_sp)),
                       SWIGTYPE_p_lldb__SBProcess);
 }
 
-PythonObject ToSWIGWrapper(lldb::ThreadPlanSP thread_plan_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::ThreadPlanSP thread_plan_sp) {
   return ToSWIGHelper(new lldb::SBThreadPlan(std::move(thread_plan_sp)),
                       SWIGTYPE_p_lldb__SBThreadPlan);
 }
 
-PythonObject ToSWIGWrapper(lldb::BreakpointSP breakpoint_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::BreakpointSP breakpoint_sp) {
   return ToSWIGHelper(new lldb::SBBreakpoint(std::move(breakpoint_sp)),
                       SWIGTYPE_p_lldb__SBBreakpoint);
 }
 
-PythonObject ToSWIGWrapper(const Status& status) {
+PythonObject SWIGBridge::ToSWIGWrapper(const Status& status) {
   return ToSWIGHelper(new lldb::SBError(status), SWIGTYPE_p_lldb__SBError);
 }
 
-PythonObject ToSWIGWrapper(std::unique_ptr<lldb::SBStream> stream_sb) {
+PythonObject SWIGBridge::ToSWIGWrapper(std::unique_ptr<lldb::SBStream> stream_sb) {
   return ToSWIGHelper(stream_sb.release(), SWIGTYPE_p_lldb__SBStream);
 }
 
-PythonObject ToSWIGWrapper(std::unique_ptr<lldb::SBStructuredData> data_sb) {
+PythonObject SWIGBridge::ToSWIGWrapper(std::unique_ptr<lldb::SBStructuredData> data_sb) {
   return ToSWIGHelper(data_sb.release(), SWIGTYPE_p_lldb__SBStructuredData);
 }
 
-PythonObject ToSWIGWrapper(const StructuredDataImpl &data_impl) {
-  return ToSWIGWrapper(std::make_unique<lldb::SBStructuredData>(data_impl));
+PythonObject SWIGBridge::ToSWIGWrapper(const StructuredDataImpl &data_impl) {
+  return ToSWIGWrapper(std::unique_ptr<lldb::SBStructuredData>(new lldb::SBStructuredData(data_impl)));
 }
 
-PythonObject ToSWIGWrapper(lldb::ThreadSP thread_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::ThreadSP thread_sp) {
   return ToSWIGHelper(new lldb::SBThread(std::move(thread_sp)),
                       SWIGTYPE_p_lldb__SBThread);
 }
 
-PythonObject ToSWIGWrapper(lldb::StackFrameSP frame_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::StackFrameSP frame_sp) {
   return ToSWIGHelper(new lldb::SBFrame(std::move(frame_sp)),
                       SWIGTYPE_p_lldb__SBFrame);
 }
 
-PythonObject ToSWIGWrapper(lldb::DebuggerSP debugger_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::DebuggerSP debugger_sp) {
   return ToSWIGHelper(new lldb::SBDebugger(std::move(debugger_sp)),
                       SWIGTYPE_p_lldb__SBDebugger);
 }
 
-PythonObject ToSWIGWrapper(lldb::WatchpointSP watchpoint_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::WatchpointSP watchpoint_sp) {
   return ToSWIGHelper(new lldb::SBWatchpoint(std::move(watchpoint_sp)),
                       SWIGTYPE_p_lldb__SBWatchpoint);
 }
 
-PythonObject ToSWIGWrapper(lldb::BreakpointLocationSP bp_loc_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::BreakpointLocationSP bp_loc_sp) {
   return ToSWIGHelper(new lldb::SBBreakpointLocation(std::move(bp_loc_sp)),
                       SWIGTYPE_p_lldb__SBBreakpointLocation);
 }
 
-PythonObject ToSWIGWrapper(lldb::ExecutionContextRefSP ctx_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::ExecutionContextRefSP ctx_sp) {
   return ToSWIGHelper(new lldb::SBExecutionContext(std::move(ctx_sp)),
                       SWIGTYPE_p_lldb__SBExecutionContext);
 }
 
-PythonObject ToSWIGWrapper(const TypeSummaryOptions &summary_options) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::TypeImplSP type_impl_sp) {
+  return ToSWIGHelper(new lldb::SBType(type_impl_sp), SWIGTYPE_p_lldb__SBType);
+}
+
+PythonObject SWIGBridge::ToSWIGWrapper(const TypeSummaryOptions &summary_options) {
   return ToSWIGHelper(new lldb::SBTypeSummaryOptions(summary_options),
                       SWIGTYPE_p_lldb__SBTypeSummaryOptions);
 }
 
-PythonObject ToSWIGWrapper(const SymbolContext &sym_ctx) {
+PythonObject SWIGBridge::ToSWIGWrapper(const SymbolContext &sym_ctx) {
   return ToSWIGHelper(new lldb::SBSymbolContext(sym_ctx),
                       SWIGTYPE_p_lldb__SBSymbolContext);
 }
 
-PythonObject ToSWIGWrapper(lldb::ProcessLaunchInfoSP launch_info_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::ProcessLaunchInfoSP launch_info_sp) {
    return ToSWIGHelper(new lldb::ProcessLaunchInfoSP(std::move(launch_info_sp)),
                        SWIGTYPE_p_lldb__SBLaunchInfo);
  }
 
- PythonObject ToSWIGWrapper(lldb::ProcessAttachInfoSP attach_info_sp) {
+ PythonObject SWIGBridge::ToSWIGWrapper(lldb::ProcessAttachInfoSP attach_info_sp) {
    return ToSWIGHelper(new lldb::ProcessAttachInfoSP(std::move(attach_info_sp)),
                        SWIGTYPE_p_lldb__SBAttachInfo);
  }
 
-PythonObject ToSWIGWrapper(lldb::DataExtractorSP data_sp) {
+PythonObject SWIGBridge::ToSWIGWrapper(lldb::DataExtractorSP data_sp) {
   return ToSWIGHelper(new lldb::DataExtractorSP(std::move(data_sp)),
                       SWIGTYPE_p_lldb__SBData);
 }
 
 ScopedPythonObject<lldb::SBCommandReturnObject>
-ToSWIGWrapper(CommandReturnObject &cmd_retobj) {
+SWIGBridge::ToSWIGWrapper(CommandReturnObject &cmd_retobj) {
   return ScopedPythonObject<lldb::SBCommandReturnObject>(
       new lldb::SBCommandReturnObject(cmd_retobj),
       SWIGTYPE_p_lldb__SBCommandReturnObject);
 }
 
-ScopedPythonObject<lldb::SBEvent> ToSWIGWrapper(Event *event) {
+ScopedPythonObject<lldb::SBEvent> SWIGBridge::ToSWIGWrapper(Event *event) {
   return ScopedPythonObject<lldb::SBEvent>(new lldb::SBEvent(event),
                                            SWIGTYPE_p_lldb__SBEvent);
 }

lldb/bindings/python/python-typemaps.swig

@@ -384,6 +384,29 @@ template <> bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {
   $1 = $1 || PyCallable_Check(reinterpret_cast<PyObject *>($input));
 }
 
+// For lldb::SBDebuggerDestroyCallback
+%typemap(in) (lldb::SBDebuggerDestroyCallback destroy_callback, void *baton) {
+  if (!($input == Py_None ||
+        PyCallable_Check(reinterpret_cast<PyObject *>($input)))) {
+    PyErr_SetString(PyExc_TypeError, "Need a callable object or None!");
+    SWIG_fail;
+  }
+
+  // FIXME (filcab): We can't currently check if our callback is already
+  // LLDBSwigPythonCallPythonSBDebuggerTerminateCallback (to DECREF the previous
+  // baton) nor can we just remove all traces of a callback, if we want to
+  // revert to a file logging mechanism.
+
+  // Don't lose the callback reference
+  Py_INCREF($input);
+  $1 = LLDBSwigPythonCallPythonSBDebuggerTerminateCallback;
+  $2 = $input;
+}
+
+%typemap(typecheck) (lldb::SBDebuggerDestroyCallback destroy_callback, void *baton) {
+  $1 = $input == Py_None;
+  $1 = $1 || PyCallable_Check(reinterpret_cast<PyObject *>($input));
+}
 
 %typemap(in) lldb::FileSP {
   PythonFile py_file(PyRefType::Borrowed, $input);