[lldb] (Semi-automatically) format .swig files

[labath]

Summary

I've found my recent ventures into the swig land painful because
of the strange way they are formatted. This patch attempts to alleviate
future headaches by formatting these files into something resembling the
normal llvm style.

Unfortunately, completely formatting these files automatically does not
work because clang format gets confused by swigs % syntax, so I have
employed a hybrid approach where I formatted blocks of c++ code with
clang-format and then manually massaged the code until it looked
reasonable (and compiled).

I don't expect these files to remain perfectly formatted (although, if
one's editor is configured to configure the current line/block on
request, one can get pretty good results by using it judiciously), but
at least it will prevent the (mangled form of the) old lldb style being
proliferated endlessly.

[JDevlieghere]

LGTM

[mib]

LGTM

lldb/bindings/lua/lua-swigsafecast.swig

-template <typename SBClass>
-void
-PushSBClass (lua_State* L, SBClass* obj);
+template <typename SBClass> void PushSBClass(lua_State *L, SBClass *obj);
 
-void
-PushSBClass (lua_State* L, lldb::SBFrame* frame_sb)
-{
-   SWIG_NewPointerObj(L, frame_sb, SWIGTYPE_p_lldb__SBFrame, 0);
+void PushSBClass(lua_State *L, lldb::SBFrame *frame_sb) {
 }
 
-void
-PushSBClass (lua_State* L, lldb::SBBreakpointLocation* breakpoint_location_sb)
-{
-   SWIG_NewPointerObj(L, breakpoint_location_sb, SWIGTYPE_p_lldb__SBBreakpointLocation, 0);
+void PushSBClass(lua_State *L,
+                 lldb::SBBreakpointLocation *breakpoint_location_sb) {
+  SWIG_NewPointerObj(L, breakpoint_location_sb,
+                     SWIGTYPE_p_lldb__SBBreakpointLocation, 0);
 }
 
-void
-PushSBClass (lua_State* L, lldb::SBWatchpoint* watchpoint_sb)
-{
-   SWIG_NewPointerObj(L, watchpoint_sb, SWIGTYPE_p_lldb__SBWatchpoint, 0);
+void PushSBClass(lua_State *L, lldb::SBWatchpoint *watchpoint_sb) {
 }
 
-void
-PushSBClass (lua_State* L, lldb::SBStructuredData* structured_data_sb)
-{
-   SWIG_NewPointerObj(L, structured_data_sb, SWIGTYPE_p_lldb__SBStructuredData, 0);
+void PushSBClass(lua_State *L, lldb::SBStructuredData *structured_data_sb) {
+  SWIG_NewPointerObj(L, structured_data_sb, SWIGTYPE_p_lldb__SBStructuredData,
+                     0);
 }

lldb/bindings/lua/lua-typemaps.swig

 //  but SWIG itself evolved and some API design choices are now redundant.
 
 //===----------------------------------------------------------------------===//
 
 // Typemap definitions to allow SWIG to properly handle char buffer.
 
 // typemap for a char buffer
 %typemap(in) (char *dst, size_t dst_len) {
-   $2 = luaL_checkinteger(L, $input);
-   if ($2 <= 0) {
-      return luaL_error(L, "Positive integer expected");
-   }
-   $1 = (char *) malloc($2);
+  $1 = (char *)malloc($2);
 }
 
 // SBProcess::ReadCStringFromMemory() uses a void*, but needs to be treated
 // as char data instead of byte data.
 %typemap(in) (void *char_buf, size_t size) = (char *dst, size_t dst_len);
 
 // Also SBProcess::ReadMemory.
 %typemap(in) (void *buf, size_t size) = (char *dst, size_t dst_len);
 
 // Return the char buffer.  Discarding any previous return result
 %typemap(argout) (char *dst, size_t dst_len) {
-   lua_pop(L, 1); // Blow away the previous result
-   if ($result == 0) {
-      lua_pushliteral(L, "");
-   } else {
-      lua_pushlstring(L, (const char *)$1, $result);
-   }
-   free($1);
-   // SWIG_arg was already incremented
 }
 
 // SBProcess::ReadCStringFromMemory() uses a void*, but needs to be treated
 // as char data instead of byte data.
 %typemap(argout) (void *char_buf, size_t size) = (char *dst, size_t dst_len);
 
 // Also SBProcess::ReadMemory.
 %typemap(argout) (void *buf, size_t size) = (char *dst, size_t dst_len);
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for handling a snprintf-like API like SBThread::GetStopDescription.
 
 %typemap(in) (char *dst_or_null, size_t dst_len) {
-   $2 = luaL_checkinteger(L, $input);
-   if ($2 <= 0) {
-      return luaL_error(L, "Positive integer expected");
-   }
-   $1 = (char *)malloc($2);
 }
 
 %typemap(argout) (char *dst_or_null, size_t dst_len) {
-   lua_pop(L, 1); // Blow away the previous result
-   lua_pushlstring(L, (const char *)$1, $result);
-   free($1);
-   // SWIG_arg was already incremented
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for handling SBModule::GetVersion
 
 %typemap(in) (uint32_t *versions, uint32_t num_versions) {
-   $2 = 99;
-   $1 = (uint32_t *)malloc(sizeof(uint32_t) * $2);
 }
 
 %typemap(argout) (uint32_t *versions, uint32_t num_versions) {
-   uint32_t count = result;
-   if (count >= $2)
-      count = $2;
-   lua_newtable(L);
-   int i = 0;
-   while (i++ < count) {
-      lua_pushinteger(L, $1[i - 1]);
-      lua_seti(L, -2, i);
-   }
-   SWIG_arg++;
-   free($1);
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for handling SBDebugger::SetLoggingCallback
 
 %typemap(in) (lldb::LogOutputCallback log_callback, void *baton) {
-   $1 = LLDBSwigLuaCallLuaLogOutputCallback;
-   $2 = (void *)L;
 
-   luaL_checktype(L, 2, LUA_TFUNCTION);
-   lua_settop(L, 2);
 
-   lua_pushlightuserdata(L, (void *)&LLDBSwigLuaCallLuaLogOutputCallback);
-   lua_insert(L, 2);
-   lua_settable(L, LUA_REGISTRYINDEX);
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for handling SBEvent::SBEvent(uint32_t event, const char *cstr, uint32_t cstr_len)
 
 %typemap(in) (const char *cstr, uint32_t cstr_len) {
-   $1 = (char *)luaL_checklstring(L, $input, (size_t *)&$2);
 }
 
 // Typemap for handling SBProcess::PutSTDIN
 
 %typemap(in) (const char *src, size_t src_len) {
-   $1 = (char *)luaL_checklstring(L, $input, &$2);
 }
 
 // Typemap for handling SBProcess::WriteMemory, SBTarget::GetInstructions...
 
 %typemap(in) (const void *buf, size_t size),
              (const void *data, size_t data_len) {
-   $1 = (void *)luaL_checklstring(L, $input, &$2);
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for handling char ** in SBTarget::LaunchSimple, SBTarget::Launch...
 
 // It should accept a Lua table of strings, for stuff like "argv" and "envp".
 
 %typemap(in) char ** {
-   if (lua_istable(L, $input)) {
-      size_t size = lua_rawlen(L, $input);
-      $1 = (char **)malloc((size + 1) * sizeof(char *));
-      int i = 0, j = 0;
-      while (i++ < size) {
-         lua_rawgeti(L, $input, i);
-         if (!lua_isstring(L, -1)) {
-            // if current element cannot be converted to string, raise an error
-            lua_pop(L, 1);
-            return luaL_error(L, "List should only contain strings");
-         }
-         $1[j++] = (char *)lua_tostring(L, -1);
-         lua_pop(L, 1);
-      }
-      $1[j] = 0;
-   } else if (lua_isnil(L, $input)) {
-      // "nil" is also acceptable, equivalent as an empty table
-      $1 = NULL;
-   } else {
-      return luaL_error(L, "A list of strings expected");
-   }
 }
 
 %typemap(freearg) char ** {
-   free((char *) $1);
 }
 
 %typecheck(SWIG_TYPECHECK_STRING_ARRAY) char ** {
-   $1 = (lua_istable(L, $input) || lua_isnil(L, $input));
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for file handles (e.g. used in SBDebugger::SetOutputFile)
 
 %typemap(in) lldb::FileSP {
-   luaL_Stream *p = (luaL_Stream *)luaL_checkudata(L, $input, LUA_FILEHANDLE);
-   lldb::FileSP file_sp;
-   file_sp = std::make_shared<lldb_private::NativeFile>(p->f, false);
-   if (!file_sp->IsValid())
-      return luaL_error(L, "Invalid file");
-   $1 = file_sp;
 }
 
 %typecheck(SWIG_TYPECHECK_POINTER) lldb::FileSP {
-   $1 = (lua_isuserdata(L, $input)) &&
-        (luaL_testudata(L, $input, LUA_FILEHANDLE) != nullptr);
 }
 
 // Typemap for file handles (e.g. used in SBDebugger::GetOutputFileHandle)
 
 %typemap(out) lldb::FileSP {
-   lldb::FileSP &sp = $1;
-   if (sp && sp->IsValid()) {
-      luaL_Stream *p = (luaL_Stream *)lua_newuserdata(L, sizeof(luaL_Stream));
-      p->closef = &LLDBSwigLuaCloseFileHandle;
-      p->f = sp->GetStream();
-      luaL_setmetatable(L, LUA_FILEHANDLE);
-      SWIG_arg++;
-   }
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for SBData::CreateDataFromUInt64Array, SBData::SetDataFromUInt64Array ...
 
 %typemap(in) (uint64_t* array, size_t array_len),
              (uint32_t* array, size_t array_len),
              (int64_t* array, size_t array_len),
              (int32_t* array, size_t array_len),
              (double* array, size_t array_len) {
-   if (lua_istable(L, $input)) {
-      // It should accept a table of numbers.
-      $2 = lua_rawlen(L, $input);
-      $1 = ($1_ltype)malloc(($2) * sizeof($*1_type));
-      int i = 0, j = 0;
-      while (i++ < $2) {
-         lua_rawgeti(L, $input, i);
-         if (!lua_isnumber(L, -1)) {
-            // if current element cannot be converted to number, raise an error
-            lua_pop(L, 1);
-            return luaL_error(L, "List should only contain numbers");
-         }
-         $1[j++] = ($*1_ltype)lua_tonumber(L, -1);
-         lua_pop(L, 1);
-      }
-   } else if (lua_isnil(L, $input)) {
-      // "nil" is also acceptable, equivalent as an empty table
-      $1 = NULL;
-      $2 = 0;
-   } else {
-      // else raise an error
-      return luaL_error(L, "A list of numbers expected.");
-   }
+      $1[j++] = ($*1_ltype) lua_tonumber(L, -1);
 }
 
 %typemap(freearg) (uint64_t* array, size_t array_len),
              (uint32_t* array, size_t array_len),
              (int64_t* array, size_t array_len),
              (int32_t* array, size_t array_len),
              (double* array, size_t array_len) {
-   free($1);
 }
 
 //===----------------------------------------------------------------------===//
 
 // Typemap for SBCommandReturnObject::PutCString
 
 %typemap(in) (const char *string, int len) {
-   if (lua_isnil(L, $input)) {
-      $1 = NULL;
-      $2 = 0;
-   }
-   else {
-      $1 = (char *)luaL_checklstring(L, $input, (size_t *)&$2);
-   }
+  } else {
 }
 
 //===----------------------------------------------------------------------===//

lldb/bindings/lua/lua-wrapper.swig

 %header %{
 
-template <typename T>
-void
-PushSBClass(lua_State* L, T* obj);
+template <typename T> void PushSBClass(lua_State * L, T * obj);
 
 // This function is called from Lua::CallBreakpointCallback
-llvm::Expected<bool>
-lldb_private::LLDBSwigLuaBreakpointCallbackFunction
-(
-   lua_State *L,
-   lldb::StackFrameSP stop_frame_sp,
+llvm::Expected<bool> lldb_private::LLDBSwigLuaBreakpointCallbackFunction(
+    lua_State * L, lldb::StackFrameSP stop_frame_sp,
     lldb::BreakpointLocationSP bp_loc_sp,
-   const StructuredDataImpl &extra_args_impl
-)
-{
-   lldb::SBFrame sb_frame(stop_frame_sp);
-   lldb::SBBreakpointLocation sb_bp_loc(bp_loc_sp);
-   int nargs = 2;
+    const StructuredDataImpl &extra_args_impl) {
 
-   lldb::SBStructuredData extra_args(extra_args_impl);
 
-   // Push the Lua wrappers
-   PushSBClass(L, &sb_frame);
-   PushSBClass(L, &sb_bp_loc);
 
-   if (extra_args.IsValid()) {
-      PushSBClass(L, &extra_args);
-      nargs++;
-   }
 
-   // Call into the Lua callback passing 'sb_frame' and 'sb_bp_loc'.
-   // Expects a boolean return.
-   if (lua_pcall(L, nargs, 1, 0) != LUA_OK) {
-      llvm::Error E = llvm::make_error<llvm::StringError>(
-            llvm::formatv("{0}\n", lua_tostring(L, -1)),
-            llvm::inconvertibleErrorCode());
-      // Pop error message from the stack.
-      lua_pop(L, 1);
-      return std::move(E);
-   }
 
-   // Boolean return from the callback
-   bool stop = lua_toboolean(L, -1);
-   lua_pop(L, 1);
 
-   return stop;
 }
 
 // This function is called from Lua::CallWatchpointCallback
-llvm::Expected<bool>
-lldb_private::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);
-   int nargs = 2;
+llvm::Expected<bool> lldb_private::LLDBSwigLuaWatchpointCallbackFunction(
+    lua_State * L, lldb::StackFrameSP stop_frame_sp, lldb::WatchpointSP wp_sp) {
 
-   // Push the Lua wrappers
-   PushSBClass(L, &sb_frame);
-   PushSBClass(L, &sb_wp);
 
-   // Call into the Lua callback passing 'sb_frame' and 'sb_wp'.
-   // Expects a boolean return.
-   if (lua_pcall(L, nargs, 1, 0) != LUA_OK) {
-      llvm::Error E = llvm::make_error<llvm::StringError>(
-            llvm::formatv("{0}\n", lua_tostring(L, -1)),
-            llvm::inconvertibleErrorCode());
-      // Pop error message from the stack.
-      lua_pop(L, 1);
-      return std::move(E);
-   }
 
-   // Boolean return from the callback
-   bool stop = lua_toboolean(L, -1);
-   lua_pop(L, 1);
 
-   return stop;
 }
 
-static void
-LLDBSwigLuaCallLuaLogOutputCallback(const char *str, void *baton) {
-   lua_State *L = (lua_State *)baton;
+static void LLDBSwigLuaCallLuaLogOutputCallback(const char *str, void *baton) {
 
-   lua_pushlightuserdata(L, (void *)&LLDBSwigLuaCallLuaLogOutputCallback);
-   lua_gettable(L, LUA_REGISTRYINDEX);
 
-   // FIXME: There's no way to report errors back to the user
-   lua_pushstring(L, str);
-   lua_pcall(L, 1, 0, 0);
 }
 
-static int LLDBSwigLuaCloseFileHandle(lua_State *L) {
-   return luaL_error(L, "You cannot close a file handle used by lldb.");
+static int LLDBSwigLuaCloseFileHandle(lua_State * L) {
 }
 
 %}

lldb/bindings/python/python-typemaps.swig

 /* Typemap definitions, to allow SWIG to properly handle 'char**' data types. */
 
 %inline %{
 
 #include "../bindings/python/python-typemaps.h"
 
 %}
 
 %typemap(in) char ** {
   /* Check if is a list  */
   if (PythonList::Check($input)) {
     PythonList list(PyRefType::Borrowed, $input);
     int size = list.GetSize();
     int i = 0;
-    $1 = (char**)malloc((size+1)*sizeof(char*));
+    $1 = (char **)malloc((size + 1) * sizeof(char *));
     for (i = 0; i < size; i++) {
       PythonString py_str = list.GetItemAtIndex(i).AsType<PythonString>();
       if (!py_str.IsAllocated()) {
-        PyErr_SetString(PyExc_TypeError,"list must contain strings");
+        PyErr_SetString(PyExc_TypeError, "list must contain strings");
         free($1);
         return nullptr;
       }
 
-      $1[i] = const_cast<char*>(py_str.GetString().data());
+      $1[i] = const_cast<char *>(py_str.GetString().data());
     }
     $1[i] = 0;
   } else if ($input == Py_None) {
-    $1 =  NULL;
+    $1 = NULL;
   } else {
-    PyErr_SetString(PyExc_TypeError,"not a list");
+    PyErr_SetString(PyExc_TypeError, "not a list");
     return NULL;
   }
 }
 
 %typemap(typecheck) char ** {
   /* Check if is a list  */
   $1 = 1;
   if (PythonList::Check($input)) {
     PythonList list(PyRefType::Borrowed, $input);
     int size = list.GetSize();
     int i = 0;
     for (i = 0; i < size; i++) {
       PythonString s = list.GetItemAtIndex(i).AsType<PythonString>();
-      if (!s.IsAllocated()) { $1 = 0; }
+      if (!s.IsAllocated()) {
+        $1 = 0;
       }
     }
-  else
-  {
-    $1 = ( ($input == Py_None) ? 1 : 0);
+  } else {
+    $1 = (($input == Py_None) ? 1 : 0);
   }
 }
 
 %typemap(freearg) char** {
   free((char *) $1);
 }
 
 %typemap(out) char** {
   int len;
   int i;
   len = 0;
-  while ($1[len]) len++;
+  while ($1[len])
+    len++;
   PythonList list(len);
   for (i = 0; i < len; i++)
     list.SetItemAtIndex(i, PythonString($1[i]));
   $result = list.release();
 }
 
 %typemap(in) lldb::tid_t {
   PythonObject obj = Retain<PythonObject>($input);
   lldb::tid_t value = unwrapOrSetPythonException(As<unsigned long long>(obj));
   if (PyErr_Occurred())
     return nullptr;
   $1 = value;
 }
 
 %typemap(in) lldb::StateType {
   PythonObject obj = Retain<PythonObject>($input);
   unsigned long long state_type_value =
       unwrapOrSetPythonException(As<unsigned long long>(obj));
   if (PyErr_Occurred())
     return nullptr;
   if (state_type_value > lldb::StateType::kLastStateType) {
     PyErr_SetString(PyExc_ValueError, "Not a valid StateType value");
     return nullptr;
   }
   $1 = static_cast<lldb::StateType>(state_type_value);
 }
 
 /* Typemap definitions to allow SWIG to properly handle char buffer. */
 
 // typemap for a char buffer
 %typemap(in) (char *dst, size_t dst_len) {
-   if (!PyInt_Check($input)) {
-       PyErr_SetString(PyExc_ValueError, "Expecting an integer");
-       return NULL;
-   }
-   $2 = PyInt_AsLong($input);
-   if ($2 <= 0) {
-       PyErr_SetString(PyExc_ValueError, "Positive integer expected");
-       return NULL;
-   }
-   $1 = (char *) malloc($2);
+  $1 = (char *)malloc($2);
 }
 // SBProcess::ReadCStringFromMemory() uses a void*, but needs to be treated
 // as char data instead of byte data.
 %typemap(in) (void *char_buf, size_t size) = (char *dst, size_t dst_len);
 
 // Return the char buffer.  Discarding any previous return result
 %typemap(argout) (char *dst, size_t dst_len) {
-   Py_XDECREF($result);   /* Blow away any previous result */
-   if (result == 0) {
-      PythonString string("");
-      $result = string.release();
-      Py_INCREF($result);
-   } else {
-      llvm::StringRef ref(static_cast<const char*>($1), result);
-      PythonString string(ref);
-      $result = string.release();
-   }
-   free($1);
+  Py_XDECREF($result); /* Blow away any previous result */
+    llvm::StringRef ref(static_cast<const char *>($1), result);
 }
 // SBProcess::ReadCStringFromMemory() uses a void*, but needs to be treated
 // as char data instead of byte data.
 %typemap(argout) (void *char_buf, size_t size) = (char *dst, size_t dst_len);
 
 
 // typemap for handling an snprintf-like API like SBThread::GetStopDescription.
 %typemap(in) (char *dst_or_null, size_t dst_len) {
-   if (!PyInt_Check($input)) {
-       PyErr_SetString(PyExc_ValueError, "Expecting an integer");
-       return NULL;
-   }
-   $2 = PyInt_AsLong($input);
-   if ($2 <= 0) {
-       PyErr_SetString(PyExc_ValueError, "Positive integer expected");
-       return NULL;
-   }
-   $1 = (char *) malloc($2);
+  $1 = (char *)malloc($2);
 }
 %typemap(argout) (char *dst_or_null, size_t dst_len) {
-   Py_XDECREF($result);   /* Blow away any previous result */
-   llvm::StringRef ref($1);
-   PythonString string(ref);
-   $result = string.release();
-   free($1);
+  Py_XDECREF($result); /* Blow away any previous result */
 }
 
 
 // typemap for an outgoing buffer
 // See also SBEvent::SBEvent(uint32_t event, const char *cstr, uint32_t cstr_len).
 // Ditto for SBProcess::PutSTDIN(const char *src, size_t src_len).
 %typemap(in) (const char *cstr, uint32_t cstr_len),
              (const char *src, size_t src_len) {
-   if (PythonString::Check($input)) {
-      PythonString str(PyRefType::Borrowed, $input);
-      $1 = (char*)str.GetString().data();
-      $2 = str.GetSize();
-   }
-   else if(PythonByteArray::Check($input)) {
-      PythonByteArray bytearray(PyRefType::Borrowed, $input);
-      $1 = (char*)bytearray.GetBytes().data();
-      $2 = bytearray.GetSize();
-   }
-   else if (PythonBytes::Check($input)) {
-      PythonBytes bytes(PyRefType::Borrowed, $input);
-      $1 = (char*)bytes.GetBytes().data();
-      $2 = bytes.GetSize();
-   }
-   else {
-      PyErr_SetString(PyExc_ValueError, "Expecting a string");
-      return NULL;
-   }
+    $1 = (char *)str.GetString().data();
+  } else if (PythonByteArray::Check($input)) {
+    $1 = (char *)bytearray.GetBytes().data();
+  } else if (PythonBytes::Check($input)) {
+    $1 = (char *)bytes.GetBytes().data();
+  } else {
 }
 // For SBProcess::WriteMemory, SBTarget::GetInstructions and SBDebugger::DispatchInput.
 %typemap(in) (const void *buf, size_t size),
              (const void *data, size_t data_len) {
-   if (PythonString::Check($input)) {
-      PythonString str(PyRefType::Borrowed, $input);
-      $1 = (void*)str.GetString().data();
-      $2 = str.GetSize();
-   }
-   else if(PythonByteArray::Check($input)) {
-      PythonByteArray bytearray(PyRefType::Borrowed, $input);
-      $1 = (void*)bytearray.GetBytes().data();
-      $2 = bytearray.GetSize();
-   }
-   else if (PythonBytes::Check($input)) {
-      PythonBytes bytes(PyRefType::Borrowed, $input);
-      $1 = (void*)bytes.GetBytes().data();
-      $2 = bytes.GetSize();
-   }
-   else {
-      PyErr_SetString(PyExc_ValueError, "Expecting a buffer");
-      return NULL;
-   }
+    $1 = (void *)str.GetString().data();
+  } else if (PythonByteArray::Check($input)) {
+    $1 = (void *)bytearray.GetBytes().data();
+  } else if (PythonBytes::Check($input)) {
+    $1 = (void *)bytes.GetBytes().data();
+  } else {
 }
 
 // typemap for an incoming buffer
 // See also SBProcess::ReadMemory.
 %typemap(in) (void *buf, size_t size) {
-   if (PyInt_Check($input)) {
-      $2 = PyInt_AsLong($input);
-   } else if (PyLong_Check($input)) {
-      $2 = PyLong_AsLong($input);
-   } else {
-      PyErr_SetString(PyExc_ValueError, "Expecting an integer or long object");
-      return NULL;
-   }
-   if ($2 <= 0) {
-       PyErr_SetString(PyExc_ValueError, "Positive integer expected");
-       return NULL;
-   }
-   $1 = (void *) malloc($2);
+  $1 = (void *)malloc($2);
 }
 
 // Return the buffer.  Discarding any previous return result
 // See also SBProcess::ReadMemory.
 %typemap(argout) (void *buf, size_t size) {
-   Py_XDECREF($result);   /* Blow away any previous result */
-   if (result == 0) {
-      $result = Py_None;
-      Py_INCREF($result);
-   } else {
-      PythonBytes bytes(static_cast<const uint8_t*>($1), result);
-      $result = bytes.release();
-   }
-   free($1);
+  Py_XDECREF($result); /* Blow away any previous result */
+    PythonBytes bytes(static_cast<const uint8_t *>($1), result);
 }
 
 %{
 namespace {
 template <class T>
 T PyLongAsT(PyObject *obj) {
   static_assert(true, "unsupported type");
 }

 template <> int64_t PyLongAsT<int64_t>(PyObject *obj) {
   return static_cast<int64_t>(PyLong_AsLongLong(obj));
 }
 
 template <> int32_t PyLongAsT<int32_t>(PyObject *obj) {
   return static_cast<int32_t>(PyLong_AsLong(obj));
 }
 
-template <class T>
-bool SetNumberFromPyObject(T &number, PyObject *obj) {
+template <class T> bool SetNumberFromPyObject(T &number, PyObject *obj) {
   if (PyInt_Check(obj))
     number = static_cast<T>(PyInt_AsLong(obj));
   else if (PyLong_Check(obj))
     number = PyLongAsT<T>(obj);
-  else return false;
+  else
+    return false;
 
   return true;
 }
 
-template <>
-bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {
+template <> bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {
   if (PyFloat_Check(obj)) {
     number = PyFloat_AsDouble(obj);
     return true;
   }
 
   return false;
 }
 
 } // namespace
 %}
 
 // these typemaps allow Python users to pass list objects
 // and have them turn into C++ arrays (this is useful, for instance
 // when creating SBData objects from lists of numbers)
 %typemap(in) (uint64_t* array, size_t array_len),
              (uint32_t* array, size_t array_len),
              (int64_t* array, size_t array_len),
              (int32_t* array, size_t array_len),
              (double* array, size_t array_len) {
   /* Check if is a list  */
   if (PyList_Check($input)) {
     int size = PyList_Size($input);
     int i = 0;
     $2 = size;
-    $1 = ($1_type) malloc(size * sizeof($*1_type));
+    $1 = ($1_type)malloc(size * sizeof($*1_type));
     for (i = 0; i < size; i++) {
-      PyObject *o = PyList_GetItem($input,i);
+      PyObject *o = PyList_GetItem($input, i);
       if (!SetNumberFromPyObject($1[i], o)) {
-        PyErr_SetString(PyExc_TypeError,"list must contain numbers");
+        PyErr_SetString(PyExc_TypeError, "list must contain numbers");
         free($1);
         return NULL;
       }
 
       if (PyErr_Occurred()) {
         free($1);
         return NULL;
       }
     }
   } else if ($input == Py_None) {
-    $1 =  NULL;
+    $1 = NULL;
     $2 = 0;
   } else {
-    PyErr_SetString(PyExc_TypeError,"not a list");
+    PyErr_SetString(PyExc_TypeError, "not a list");
     return NULL;
   }
 }
 
 %typemap(freearg) (uint64_t* array, size_t array_len),
                   (uint32_t* array, size_t array_len),
                   (int64_t* array, size_t array_len),
                   (int32_t* array, size_t array_len),
                   (double* array, size_t array_len) {
   free($1);
 }
 
 // these typemaps wrap SBModule::GetVersion() from requiring a memory buffer
 // to the more Pythonic style where a list is returned and no previous allocation
 // is necessary - this will break if more than 50 versions are ever returned
 %typemap(typecheck) (uint32_t *versions, uint32_t num_versions) {
-    $1 = ($input == Py_None ? 1 : 0);
 }
 
 %typemap(in, numinputs=0) (uint32_t *versions) {
-    $1 = (uint32_t*)malloc(sizeof(uint32_t) * 50);
+  $1 = (uint32_t *)malloc(sizeof(uint32_t) * 50);
 }
 
 %typemap(in, numinputs=0) (uint32_t num_versions) {
-    $1 = 50;
 }
 
 %typemap(argout) (uint32_t *versions, uint32_t num_versions) {
-    uint32_t count = result;
-    if (count >= $2)
-        count = $2;
-    PyObject* list = PyList_New(count);
-    for (uint32_t j = 0; j < count; j++)
-    {
-        PyObject* item = PyInt_FromLong($1[j]);
-        int ok = PyList_SetItem(list,j,item);
-        if (ok != 0)
-        {
-            $result = Py_None;
-            break;
-        }
-    }
-    $result = list;
+  PyObject *list = PyList_New(count);
+  for (uint32_t j = 0; j < count; j++) {
+    PyObject *item = PyInt_FromLong($1[j]);
+    int ok = PyList_SetItem(list, j, item);
+    if (ok != 0) {
 }
 
 %typemap(freearg) (uint32_t *versions) {
-    free($1);
 }
 
 
 // For Log::LogOutputCallback
 %typemap(in) (lldb::LogOutputCallback log_callback, void *baton) {
-  if (!($input == Py_None || PyCallable_Check(reinterpret_cast<PyObject*>($input)))) {
+  if (!($input == Py_None ||
+        PyCallable_Check(reinterpret_cast<PyObject *>($input)))) {
     PyErr_SetString(PyExc_TypeError, "Need a callable object or None!");
     return NULL;
   }
 
   // FIXME (filcab): We can't currently check if our callback is already
   // LLDBSwigPythonCallPythonLogOutputCallback (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 = LLDBSwigPythonCallPythonLogOutputCallback;
   $2 = $input;
 }
 
 %typemap(typecheck) (lldb::LogOutputCallback log_callback, void *baton) {
   $1 = $input == Py_None;
-  $1 = $1 || PyCallable_Check(reinterpret_cast<PyObject*>($input));
+  $1 = $1 || PyCallable_Check(reinterpret_cast<PyObject *>($input));
 }
 
 
 %typemap(in) lldb::FileSP {
   PythonFile py_file(PyRefType::Borrowed, $input);
   if (!py_file) {
     PyErr_SetString(PyExc_TypeError, "not a file");
     return nullptr;
   }
   auto sp = unwrapOrSetPythonException(py_file.ConvertToFile());
   if (!sp)
     return nullptr;
   $1 = sp;
 }
 
 %typemap(in) lldb::FileSP FORCE_IO_METHODS {
   PythonFile py_file(PyRefType::Borrowed, $input);
   if (!py_file) {
     PyErr_SetString(PyExc_TypeError, "not a file");
     return nullptr;
   }
-  auto sp = unwrapOrSetPythonException(py_file.ConvertToFileForcingUseOfScriptingIOMethods());
+  auto sp = unwrapOrSetPythonException(
+      py_file.ConvertToFileForcingUseOfScriptingIOMethods());
   if (!sp)
     return nullptr;
   $1 = sp;
 }
 
 %typemap(in) lldb::FileSP BORROWED {
   PythonFile py_file(PyRefType::Borrowed, $input);
   if (!py_file) {
     PyErr_SetString(PyExc_TypeError, "not a file");
     return nullptr;
   }
-  auto sp = unwrapOrSetPythonException(py_file.ConvertToFile(/*borrowed=*/true));
+  auto sp =
+      unwrapOrSetPythonException(py_file.ConvertToFile(/*borrowed=*/true));
   if (!sp)
     return nullptr;
   $1 = sp;
 }
 
 %typemap(in) lldb::FileSP BORROWED_FORCE_IO_METHODS {
   PythonFile py_file(PyRefType::Borrowed, $input);
   if (!py_file) {
     PyErr_SetString(PyExc_TypeError, "not a file");
     return nullptr;
   }
-  auto sp = unwrapOrSetPythonException(py_file.ConvertToFileForcingUseOfScriptingIOMethods(/*borrowed=*/true));
+  auto sp = unwrapOrSetPythonException(
+      py_file.ConvertToFileForcingUseOfScriptingIOMethods(/*borrowed=*/true));
   if (!sp)
     return nullptr;
   $1 = sp;
 }
 
 %typecheck(SWIG_TYPECHECK_POINTER) lldb::FileSP {
   if (PythonFile::Check($input)) {
     $1 = 1;
   } else {
     PyErr_Clear();
     $1 = 0;
   }
 }
 
 %typemap(out) lldb::FileSP {
   $result = nullptr;
   lldb::FileSP &sp = $1;
   if (sp) {
     PythonFile pyfile = unwrapOrSetPythonException(PythonFile::FromFile(*sp));
     if (!pyfile.IsValid())
       return nullptr;
     $result = pyfile.release();
   }
-  if (!$result)
-  {
-      $result = Py_None;
-      Py_INCREF(Py_None);
+  if (!$result) {
   }
 }
 
 %typemap(in) (const char* string, int len) {
-    if ($input == Py_None)
-    {
-        $1 = NULL;
-        $2 = 0;
-    }
-    else if (PythonString::Check($input))
-    {
-        PythonString py_str(PyRefType::Borrowed, $input);
-        llvm::StringRef str = py_str.GetString();
-        $1 = const_cast<char*>(str.data());
-        $2 = str.size();
-        // In Python 2, if $input is a PyUnicode object then this
-        // will trigger a Unicode -> String conversion, in which
-        // case the `PythonString` will now own the PyString.  Thus
-        // if it goes out of scope, the data will be deleted.  The
-        // only way to avoid this is to leak the Python object in
-        // that case.  Note that if there was no conversion, then
-        // releasing the string will not leak anything, since we
-        // created this as a borrowed reference.
-        py_str.release();
-    }
-    else
-    {
-        PyErr_SetString(PyExc_TypeError,"not a string-like object");
-        return NULL;
-    }
+  if ($input == Py_None) {
+  } else if (PythonString::Check($input)) {
+    $1 = const_cast<char *>(str.data());
+  } else {
+    PyErr_SetString(PyExc_TypeError, "not a string-like object");
 }
 
 // These two pybuffer macros are copied out of swig/Lib/python/pybuffer.i,
 // and fixed so they will not crash if PyObject_GetBuffer fails.
 // https://github.com/swig/swig/issues/1640
 //
 // I've also moved the call to PyBuffer_Release to the end of the SWIG wrapper,
 // doing it right away is not legal according to the python buffer protocol.
 
 %define %pybuffer_mutable_binary(TYPEMAP, SIZE)
 %typemap(in) (TYPEMAP, SIZE) (Py_buffer_RAII view) {
-  int res; Py_ssize_t size = 0; void *buf = 0;
+  int res;
+  Py_ssize_t size = 0;
+  void *buf = 0;
   res = PyObject_GetBuffer($input, &view.buffer, PyBUF_WRITABLE);
   if (res < 0) {
     PyErr_Clear();
     %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
   }
   size = view.buffer.len;
   buf = view.buffer.buf;
-  $1 = ($1_ltype) buf;
-  $2 = ($2_ltype) (size/sizeof($*1_type));
+  $1 = ($1_ltype)buf;
+  $2 = ($2_ltype)(size / sizeof($*1_type));
 }
 %enddef
 
 %define %pybuffer_binary(TYPEMAP, SIZE)
 %typemap(in) (TYPEMAP, SIZE) (Py_buffer_RAII view) {
-  int res; Py_ssize_t size = 0; const void *buf = 0;
+  int res;
+  Py_ssize_t size = 0;
+  const void *buf = 0;
   res = PyObject_GetBuffer($input, &view.buffer, PyBUF_CONTIG_RO);
   if (res < 0) {
     PyErr_Clear();
     %argument_fail(res, "(TYPEMAP, SIZE)", $symname, $argnum);
   }
   size = view.buffer.len;
   buf = view.buffer.buf;
-  $1 = ($1_ltype) buf;
-  $2 = ($2_ltype) (size / sizeof($*1_type));
+  $1 = ($1_ltype)buf;
+  $2 = ($2_ltype)(size / sizeof($*1_type));
 }
 %enddef
 
 %pybuffer_binary(const uint8_t *buf, size_t num_bytes);
 %pybuffer_mutable_binary(uint8_t *buf, size_t num_bytes);

lldb/bindings/python/python-wrapper.swig

 %header %{
 
-class PyErr_Cleaner
-{
+class PyErr_Cleaner {
 public:
-    PyErr_Cleaner(bool print=false) :
-    m_print(print)
-    {
-    }
+  PyErr_Cleaner(bool print = false) : m_print(print) {}
 
-    ~PyErr_Cleaner()
-    {
-        if (PyErr_Occurred())
-        {
-            if(m_print && !PyErr_ExceptionMatches(PyExc_SystemExit))
-                PyErr_Print();
-            PyErr_Clear();
-        }
-    }
+  ~PyErr_Cleaner() {
+    if (PyErr_Occurred()) {
+      if (m_print && !PyErr_ExceptionMatches(PyExc_SystemExit))
 
 private:
-    bool m_print;
 };
 
-llvm::Expected<bool>
-lldb_private::LLDBSwigPythonBreakpointCallbackFunction
-(
-    const char *python_function_name,
-    const char *session_dictionary_name,
-    const lldb::StackFrameSP& frame_sp,
-    const lldb::BreakpointLocationSP& bp_loc_sp,
-    const lldb_private::StructuredDataImpl &args_impl
-)
-{
-    using namespace llvm;
+llvm::Expected<bool> lldb_private::LLDBSwigPythonBreakpointCallbackFunction(
+    const char *python_function_name, const char *session_dictionary_name,
+    const lldb::StackFrameSP &frame_sp,
+    const lldb::BreakpointLocationSP &bp_loc_sp,
+    const lldb_private::StructuredDataImpl &args_impl) {
 
-    lldb::SBFrame sb_frame (frame_sp);
-    lldb::SBBreakpointLocation sb_bp_loc(bp_loc_sp);
+  lldb::SBFrame sb_frame(frame_sp);
 
-    PyErr_Cleaner py_err_cleaner(true);
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    unsigned max_positional_args;
-    if (auto arg_info = pfunc.GetArgInfo())
-        max_positional_args = arg_info.get().max_positional_args;
-    else
-        return arg_info.takeError();
 
-    PythonObject frame_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_frame));
-    PythonObject bp_loc_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_bp_loc));
 
-    auto result = [&] () -> Expected<PythonObject> {
-        // If the called function doesn't take extra_args, drop them here:
-        if (max_positional_args < 4)
-            return pfunc.Call(frame_arg, bp_loc_arg, dict);
-        return pfunc.Call(frame_arg, bp_loc_arg, ToSWIGWrapper(args_impl), dict);
-    } ();
+  auto result = [&]() -> Expected<PythonObject> {
+  }();
 
-    if (!result)
-        return result.takeError();
 
-    // Only False counts as false!
-    return result.get().get() != Py_False;
 }
 
 // resolve a dotted Python name in the form
 // foo.bar.baz.Foobar to an actual Python object
 // if pmodule is NULL, the __main__ module will be used
 // as the starting point for the search
 
+// This function is called by
+// lldb_private::ScriptInterpreterPython::BreakpointCallbackFunction(...) and is
+// used when a script command is attached to a breakpoint for execution.
+
+// This function is called by
+// lldb_private::ScriptInterpreterPython::WatchpointCallbackFunction(...) and is
+// used when a script command is attached to a watchpoint for execution.
 
-// This function is called by lldb_private::ScriptInterpreterPython::BreakpointCallbackFunction(...)
-// and is used when a script command is attached to a breakpoint for execution.
-
-// This function is called by lldb_private::ScriptInterpreterPython::WatchpointCallbackFunction(...)
-// and is used when a script command is attached to a watchpoint for execution.
-
-bool
-lldb_private::LLDBSwigPythonWatchpointCallbackFunction
-(
-    const char *python_function_name,
-    const char *session_dictionary_name,
-    const lldb::StackFrameSP& frame_sp,
-    const lldb::WatchpointSP& wp_sp
-)
-{
-    lldb::SBFrame sb_frame (frame_sp);
-    lldb::SBWatchpoint sb_wp(wp_sp);
+bool lldb_private::LLDBSwigPythonWatchpointCallbackFunction(
+    const char *python_function_name, const char *session_dictionary_name,
+    const lldb::StackFrameSP &frame_sp, const lldb::WatchpointSP &wp_sp) {
+  lldb::SBFrame sb_frame(frame_sp);
 
-    bool stop_at_watchpoint = true;
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return stop_at_watchpoint;
 
-    PythonObject frame_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_frame));
-    PythonObject wp_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_wp));
-    PythonObject result = pfunc(frame_arg, wp_arg, dict);
 
-    if (result.get() == Py_False)
-        stop_at_watchpoint = false;
 
-    return stop_at_watchpoint;
 }
 
-bool
-lldb_private::LLDBSwigPythonCallTypeScript
-(
-    const char *python_function_name,
-    const void *session_dictionary,
-    const lldb::ValueObjectSP& valobj_sp,
-    void** pyfunct_wrapper,
-    const lldb::TypeSummaryOptionsSP& options_sp,
-    std::string& retval
-)
-{
-    lldb::SBTypeSummaryOptions sb_options(options_sp.get());
+bool lldb_private::LLDBSwigPythonCallTypeScript(
+    const char *python_function_name, const void *session_dictionary,
+    const lldb::ValueObjectSP &valobj_sp, void **pyfunct_wrapper,
+    const lldb::TypeSummaryOptionsSP &options_sp, std::string &retval) {
 
-    retval.clear();
 
-    if (!python_function_name || !session_dictionary)
-        return false;
 
-    PyObject *pfunc_impl = nullptr;
 
-    if (pyfunct_wrapper && *pyfunct_wrapper && PyFunction_Check (*pyfunct_wrapper))
-    {
-        pfunc_impl = (PyObject*)(*pyfunct_wrapper);
-        if (pfunc_impl->ob_refcnt == 1)
-        {
-            Py_XDECREF(pfunc_impl);
-            pfunc_impl = NULL;
-        }
-    }
+  if (pyfunct_wrapper && *pyfunct_wrapper &&
+      PyFunction_Check(*pyfunct_wrapper)) {
+    pfunc_impl = (PyObject *)(*pyfunct_wrapper);
+    if (pfunc_impl->ob_refcnt == 1) {
 
-    PyObject *py_dict = (PyObject*)session_dictionary;
-    if (!PythonDictionary::Check(py_dict))
-        return true;
+  PyObject *py_dict = (PyObject *)session_dictionary;
 
-    PythonDictionary dict(PyRefType::Borrowed, py_dict);
 
-    PyErr_Cleaner pyerr_cleanup(true);  // show Python errors
+  PyErr_Cleaner pyerr_cleanup(true); // show Python errors
 
-    PythonCallable pfunc(PyRefType::Borrowed, pfunc_impl);
 
-    if (!pfunc.IsAllocated())
-    {
-        pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
-        if (!pfunc.IsAllocated())
-            return false;
+  if (!pfunc.IsAllocated()) {
+    pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+        python_function_name, dict);
 
-        if (pyfunct_wrapper)
-        {
-            *pyfunct_wrapper = pfunc.get();
-            Py_XINCREF(pfunc.get());
-        }
-    }
+    if (pyfunct_wrapper) {
 
-    PythonObject result;
-    auto argc = pfunc.GetArgInfo();
-    if (!argc) {
-        llvm::consumeError(argc.takeError());
-        return false;
-    }
 
-    PythonObject value_arg = ToSWIGWrapper(valobj_sp);
-    PythonObject options_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_options));
 
-    if (argc.get().max_positional_args < 3)
-        result = pfunc(value_arg,dict);
-    else
-        result = pfunc(value_arg,dict,options_arg);
+    result = pfunc(value_arg, dict);
+    result = pfunc(value_arg, dict, options_arg);
 
-    retval = result.Str().GetString().str();
 
-    return true;
 }
 
-void*
-lldb_private::LLDBSwigPythonCreateSyntheticProvider
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const lldb::ValueObjectSP& valobj_sp
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+void *lldb_private::LLDBSwigPythonCreateSyntheticProvider(
+    const char *python_class_name, const char *session_dictionary_name,
+    const lldb::ValueObjectSP &valobj_sp) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name,dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated())
-        Py_RETURN_NONE;
 
-    auto sb_value = std::make_unique<lldb::SBValue>(valobj_sp);
-    sb_value->SetPreferSyntheticValue(false);
 
-    PythonObject val_arg = ToSWIGWrapper(std::move(sb_value));
-    if (!val_arg.IsAllocated())
-        Py_RETURN_NONE;
 
-    PythonObject result = pfunc(val_arg, dict);
 
-    if (result.IsAllocated())
-        return result.release();
 
-    Py_RETURN_NONE;
 }
 
-void*
-lldb_private::LLDBSwigPythonCreateCommandObject
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const lldb::DebuggerSP debugger_sp
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+void *lldb_private::LLDBSwigPythonCreateCommandObject(
+    const char *python_class_name, const char *session_dictionary_name,
+    const lldb::DebuggerSP debugger_sp) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return nullptr;
 
-    lldb::SBDebugger debugger_sb(debugger_sp);
-    PythonObject debugger_arg(PyRefType::Owned, SBTypeToSWIGWrapper(debugger_sb));
-    PythonObject result = pfunc(debugger_arg, dict);
 
-    if (result.IsAllocated())
-        return result.release();
 
-    Py_RETURN_NONE;
 }
 
-void*
-lldb_private::LLDBSwigPythonCreateScriptedProcess
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const lldb::TargetSP& target_sp,
+void *lldb_private::LLDBSwigPythonCreateScriptedProcess(
+    const char *python_class_name, const char *session_dictionary_name,
+    const lldb::TargetSP &target_sp,
     const lldb_private::StructuredDataImpl &args_impl,
-    std::string &error_string
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+    std::string &error_string) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated()) {
-        error_string.append("could not find script class: ");
-        error_string.append(python_class_name);
-        return nullptr;
-    }
 
-    PythonObject target_arg = ToSWIGWrapper(target_sp);
 
-    llvm::Expected<PythonCallable::ArgInfo> arg_info = pfunc.GetArgInfo();
-    if (!arg_info) {
-        llvm::handleAllErrors(
-            arg_info.takeError(),
-            [&](PythonException &E) {
-                error_string.append(E.ReadBacktrace());
-            },
-            [&](const llvm::ErrorInfoBase &E) {
-                error_string.append(E.message());
-            });
-        Py_RETURN_NONE;
-    }
+        [&](PythonException &E) { error_string.append(E.ReadBacktrace()); },
 
-    PythonObject result = {};
-    if (arg_info.get().max_positional_args == 2) {
-        result = pfunc(target_arg, ToSWIGWrapper(args_impl));
-    } else {
-        error_string.assign("wrong number of arguments in __init__, should be 2 (not including self)");
-        Py_RETURN_NONE;
-    }
+    error_string.assign("wrong number of arguments in __init__, should be 2 "
+                        "(not including self)");
 
-    if (result.IsAllocated())
-        return result.release();
-    Py_RETURN_NONE;
 }
 
-void*
-lldb_private::LLDBSwigPythonCreateScriptedThread
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const lldb::ProcessSP& process_sp,
-    const StructuredDataImpl &args_impl,
-    std::string &error_string
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+void *lldb_private::LLDBSwigPythonCreateScriptedThread(
+    const char *python_class_name, const char *session_dictionary_name,
+    const lldb::ProcessSP &process_sp, const StructuredDataImpl &args_impl,
+    std::string &error_string) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated()) {
-        error_string.append("could not find script class: ");
-        error_string.append(python_class_name);
-        return nullptr;
-    }
 
-    llvm::Expected<PythonCallable::ArgInfo> arg_info = pfunc.GetArgInfo();
-    if (!arg_info) {
-        llvm::handleAllErrors(
-            arg_info.takeError(),
-            [&](PythonException &E) {
-                error_string.append(E.ReadBacktrace());
-            },
-            [&](const llvm::ErrorInfoBase &E) {
-                error_string.append(E.message());
-            });
-        Py_RETURN_NONE;
-    }
+        [&](PythonException &E) { error_string.append(E.ReadBacktrace()); },
 
-    PythonObject result = {};
-    if (arg_info.get().max_positional_args == 2) {
-        result = pfunc(ToSWIGWrapper(process_sp), ToSWIGWrapper(args_impl));
-    } else {
-        error_string.assign("wrong number of arguments in __init__, should be 2 (not including self)");
-        Py_RETURN_NONE;
-    }
+    error_string.assign("wrong number of arguments in __init__, should be 2 "
+                        "(not including self)");
 
-    if (result.IsAllocated())
-        return result.release();
-    Py_RETURN_NONE;
 }
 
-void*
-lldb_private::LLDBSwigPythonCreateScriptedThreadPlan
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
+void *lldb_private::LLDBSwigPythonCreateScriptedThreadPlan(
+    const char *python_class_name, const char *session_dictionary_name,
     const lldb_private::StructuredDataImpl &args_impl,
-    std::string &error_string,
-    const lldb::ThreadPlanSP& thread_plan_sp
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+    std::string &error_string, const lldb::ThreadPlanSP &thread_plan_sp) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated()) {
-        error_string.append("could not find script class: ");
-        error_string.append(python_class_name);
-        return nullptr;
-    }
 
-    PythonObject tp_arg = ToSWIGWrapper(thread_plan_sp);
 
-    llvm::Expected<PythonCallable::ArgInfo> arg_info = pfunc.GetArgInfo();
-    if (!arg_info) {
-        llvm::handleAllErrors(
-            arg_info.takeError(),
-            [&](PythonException &E) {
-                error_string.append(E.ReadBacktrace());
-            },
-            [&](const llvm::ErrorInfoBase &E) {
-                error_string.append(E.message());
-            });
-        Py_RETURN_NONE;
-    }
+        [&](PythonException &E) { error_string.append(E.ReadBacktrace()); },
 
-    PythonObject result = {};
-    auto args_sb = std::make_unique<lldb::SBStructuredData>(args_impl);
-    if (arg_info.get().max_positional_args == 2) {
-        if (args_sb->IsValid()) {
-           error_string.assign("args passed, but __init__ does not take an args dictionary");
-           Py_RETURN_NONE;
-        }
-        result = pfunc(tp_arg, dict);
-    } else if (arg_info.get().max_positional_args >= 3) {
-        result = pfunc(tp_arg, ToSWIGWrapper(std::move(args_sb)), dict);
-    } else {
-        error_string.assign("wrong number of arguments in __init__, should be 2 or 3 (not including self)");
-        Py_RETURN_NONE;
-    }
+      error_string.assign(
+          "args passed, but __init__ does not take an args dictionary");
+    error_string.assign("wrong number of arguments in __init__, should be 2 or "
+                        "3 (not including self)");
 
-    // FIXME: At this point we should check that the class we found supports all the methods
-    // that we need.
+  // FIXME: At this point we should check that the class we found supports all
+  // the methods that we need.
 
-    if (result.IsAllocated())
-        return result.release();
-    Py_RETURN_NONE;
 }
 
-bool
-lldb_private::LLDBSWIGPythonCallThreadPlan
-(
-    void *implementor,
-    const char *method_name,
-    lldb_private::Event *event,
-    bool &got_error
-)
-{
-    got_error = false;
+bool lldb_private::LLDBSWIGPythonCallThreadPlan(
+    void *implementor, const char *method_name, lldb_private::Event *event,
+    bool &got_error) {
 
-    PyErr_Cleaner py_err_cleaner(false);
-    PythonObject self(PyRefType::Borrowed, static_cast<PyObject*>(implementor));
-    auto pfunc = self.ResolveName<PythonCallable>(method_name);
+  PythonObject self(PyRefType::Borrowed, static_cast<PyObject *>(implementor));
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    PythonObject result;
-    if (event != nullptr)
-    {
-        lldb::SBEvent sb_event(event);
-        PythonObject event_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_event));
-        result = pfunc(event_arg);
-    }
-    else
-        result = pfunc();
+  if (event != nullptr) {
+  } else
 
-    if (PyErr_Occurred())
-    {
-        got_error = true;
-        printf ("Return value was neither false nor true for call to %s.\n", method_name);
-        PyErr_Print();
-        return false;
-    }
+  if (PyErr_Occurred()) {
+    printf("Return value was neither false nor true for call to %s.\n",
+           method_name);
 
-    if (result.get() == Py_True)
-        return true;
-    else if (result.get() == Py_False)
-        return false;
 
-    // Somebody returned the wrong thing...
-    got_error = true;
-    printf ("Wrong return value type for call to %s.\n", method_name);
-    return false;
+  printf("Wrong return value type for call to %s.\n", method_name);
 }
 
 void *lldb_private::LLDBSwigPythonCreateScriptedBreakpointResolver(
     const char *python_class_name, const char *session_dictionary_name,
     const StructuredDataImpl &args_impl,
     const lldb::BreakpointSP &breakpoint_sp) {
 
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return nullptr;
 
-    PythonObject result =
-        pfunc(ToSWIGWrapper(breakpoint_sp), ToSWIGWrapper(args_impl), dict);
-    // FIXME: At this point we should check that the class we found supports all the methods
-    // that we need.
+  // FIXME: At this point we should check that the class we found supports all
+  // the methods that we need.
 
-    if (result.IsAllocated())
-    {
-        // Check that __callback__ is defined:
-        auto callback_func = result.ResolveName<PythonCallable>("__callback__");
-        if (callback_func.IsAllocated())
-            return result.release();
-        else
-            result.release();
-    }
-    Py_RETURN_NONE;
+  if (result.IsAllocated()) {
 }
 
-unsigned int
-lldb_private::LLDBSwigPythonCallBreakpointResolver
-(
-    void *implementor,
-    const char *method_name,
-    lldb_private::SymbolContext *sym_ctx
-)
-{
-    PyErr_Cleaner py_err_cleaner(false);
-    PythonObject self(PyRefType::Borrowed, static_cast<PyObject*>(implementor));
-    auto pfunc = self.ResolveName<PythonCallable>(method_name);
+unsigned int lldb_private::LLDBSwigPythonCallBreakpointResolver(
+    void *implementor, const char *method_name,
+    lldb_private::SymbolContext *sym_ctx) {
+  PythonObject self(PyRefType::Borrowed, static_cast<PyObject *>(implementor));
 
-    if (!pfunc.IsAllocated())
-        return 0;
 
-    PythonObject result;
-    if (sym_ctx != nullptr) {
-      lldb::SBSymbolContext sb_sym_ctx(sym_ctx);
-      PythonObject sym_ctx_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_sym_ctx));
-      result = pfunc(sym_ctx_arg);
-    } else
-      result = pfunc();
 
-    if (PyErr_Occurred())
-    {
-        PyErr_Print();
-        PyErr_Clear();
-        return 0;
-    }
+  if (PyErr_Occurred()) {
 
-    // The callback will return a bool, but we're need to also return ints
-    // so we're squirrelling the bool through as an int...  And if you return
-    // nothing, we'll continue.
-    if (strcmp(method_name, "__callback__") == 0) {
-        if (result.get() == Py_False)
-          return 0;
-        else
-          return 1;
-    }
 
-    long long ret_val = unwrapOrSetPythonException(As<long long>(result));
 
-    if (PyErr_Occurred()) {
-        PyErr_Print();
-        PyErr_Clear();
-        return 0;
-    }
 
-    return ret_val;
 }
 
-void *
-lldb_private::LLDBSwigPythonCreateScriptedStopHook
-(
-    lldb::TargetSP target_sp,
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const StructuredDataImpl &args_impl,
-    Status &error
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0') {
-        error.SetErrorString("Empty class name.");
-        Py_RETURN_NONE;
-    }
-    if (!session_dictionary_name) {
-      error.SetErrorString("No session dictionary");
-      Py_RETURN_NONE;
-    }
-    
-    PyErr_Cleaner py_err_cleaner(true);
+void *lldb_private::LLDBSwigPythonCreateScriptedStopHook(
+    lldb::TargetSP target_sp, const char *python_class_name,
+    const char *session_dictionary_name, const StructuredDataImpl &args_impl,
+    Status &error) {
 
-    auto dict = 
-        PythonModule::MainModule().ResolveName<PythonDictionary>(
-            session_dictionary_name);
-    auto pfunc = 
-        PythonObject::ResolveNameWithDictionary<PythonCallable>(
-            python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
 
-    if (!pfunc.IsAllocated()) {
-        error.SetErrorStringWithFormat("Could not find class: %s.", 
-                                       python_class_name);
-        return nullptr;
-    }
+    error.SetErrorStringWithFormat("Could not find class: %s.",
 
-    PythonObject result =
-        pfunc(ToSWIGWrapper(target_sp), ToSWIGWrapper(args_impl), dict);
 
-    if (result.IsAllocated())
-    {
-        // Check that the handle_stop callback is defined:
-        auto callback_func = result.ResolveName<PythonCallable>("handle_stop");
-        if (callback_func.IsAllocated()) {
-          if (auto args_info = callback_func.GetArgInfo()) {
-            size_t num_args = (*args_info).max_positional_args; 
-            if (num_args != 2) {
-              error.SetErrorStringWithFormat("Wrong number of args for "
+  if (result.IsAllocated()) {
+        size_t num_args = (*args_info).max_positional_args;
+          error.SetErrorStringWithFormat(
+              "Wrong number of args for "
               "handle_stop callback, should be 2 (excluding self), got: %zu",
               num_args);
-              Py_RETURN_NONE;
-            } else
-              return result.release();
-          } else {
-            error.SetErrorString("Couldn't get num arguments for handle_stop "
-                                 "callback.");
-            Py_RETURN_NONE;
-          }
-          return result.release();
-        }
-        else {
-          error.SetErrorStringWithFormat("Class \"%s\" is missing the required "
-                                         "handle_stop callback.",
-                                         python_class_name);
-          result.release();
-        }
-    }
-    Py_RETURN_NONE;
+    } else {
 }
 
-bool
-lldb_private::LLDBSwigPythonStopHookCallHandleStop
-(
-    void *implementor,
-    lldb::ExecutionContextRefSP exc_ctx_sp,
-    lldb::StreamSP stream
-)
-{
-    // handle_stop will return a bool with the meaning "should_stop"...
-    // If you return nothing we'll assume we are going to stop.
-    // Also any errors should return true, since we should stop on error.
+bool lldb_private::LLDBSwigPythonStopHookCallHandleStop(
+    void *implementor, lldb::ExecutionContextRefSP exc_ctx_sp,
+    lldb::StreamSP stream) {
 
-    PyErr_Cleaner py_err_cleaner(false);
-    PythonObject self(PyRefType::Borrowed, static_cast<PyObject*>(implementor));
-    auto pfunc = self.ResolveName<PythonCallable>("handle_stop");
+  PythonObject self(PyRefType::Borrowed, static_cast<PyObject *>(implementor));
 
-    if (!pfunc.IsAllocated())
-        return true;
 
-    PythonObject result;
-    lldb::SBExecutionContext sb_exc_ctx(exc_ctx_sp);
-    PythonObject exc_ctx_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_exc_ctx));
-    lldb::SBStream sb_stream;
-    PythonObject sb_stream_arg(PyRefType::Owned, 
-                               SBTypeToSWIGWrapper(sb_stream));
-    result = pfunc(exc_ctx_arg, sb_stream_arg);
+  PythonObject sb_stream_arg(PyRefType::Owned, SBTypeToSWIGWrapper(sb_stream));
 
-    if (PyErr_Occurred())
-    {
-        stream->PutCString("Python error occurred handling stop-hook.");
-        PyErr_Print();
-        PyErr_Clear();
-        return true;
-    }
-    
-    // Now add the result to the output stream.  SBStream only
-    // makes an internally help StreamString which I can't interpose, so I 
-    // have to copy it over here.
-    stream->PutCString(sb_stream.GetData());
-    
-    if (result.get() == Py_False)
-      return false;
-    else
-      return true;
+  if (PyErr_Occurred()) {
+  // makes an internally help StreamString which I can't interpose, so I
 }
 
-// wrapper that calls an optional instance member of an object taking no arguments
-static PyObject*
-LLDBSwigPython_CallOptionalMember
-(
-    PyObject* implementor,
-    char* callee_name,
-    PyObject* ret_if_not_found = Py_None,
-    bool* was_found = NULL
-)
-{
-    PyErr_Cleaner py_err_cleaner(false);
+// wrapper that calls an optional instance member of an object taking no
+// arguments
+static PyObject *LLDBSwigPython_CallOptionalMember(
+    PyObject * implementor, char *callee_name,
+    PyObject *ret_if_not_found = Py_None, bool *was_found = NULL) {
 
-    PythonObject self(PyRefType::Borrowed, static_cast<PyObject*>(implementor));
-    auto pfunc = self.ResolveName<PythonCallable>(callee_name);
+  PythonObject self(PyRefType::Borrowed, static_cast<PyObject *>(implementor));
 
-    if (!pfunc.IsAllocated())
-    {
-        if (was_found)
-            *was_found = false;
-        Py_XINCREF(ret_if_not_found);
-        return ret_if_not_found;
-    }
+  if (!pfunc.IsAllocated()) {
 
-    if (was_found)
-        *was_found = true;
 
-    PythonObject result = pfunc();
-    return result.release();
 }
 
-size_t
-lldb_private::LLDBSwigPython_CalculateNumChildren
-(
-    PyObject *implementor,
-    uint32_t max
-)
-{
-    PythonObject self(PyRefType::Borrowed, implementor);
-    auto pfunc = self.ResolveName<PythonCallable>("num_children");
+size_t lldb_private::LLDBSwigPython_CalculateNumChildren(PyObject * implementor,
+                                                         uint32_t max) {
 
-    if (!pfunc.IsAllocated())
-        return 0;
 
-    auto arg_info = pfunc.GetArgInfo();
-    if (!arg_info) {
-        llvm::consumeError(arg_info.takeError());
-        return 0;
-    }
 
-    size_t ret_val;
-    if (arg_info.get().max_positional_args < 1)
-        ret_val = unwrapOrSetPythonException(As<long long>(pfunc.Call()));
-    else
-        ret_val = unwrapOrSetPythonException(As<long long>(pfunc.Call(PythonInteger(max))));
+    ret_val = unwrapOrSetPythonException(
+        As<long long>(pfunc.Call(PythonInteger(max))));
 
-    if (PyErr_Occurred())
-    {
-        PyErr_Print();
-        PyErr_Clear();
-        return 0;
-    }
+  if (PyErr_Occurred()) {
 
-    if (arg_info.get().max_positional_args < 1)
-        ret_val = std::min(ret_val, static_cast<size_t>(max));
 
-    return ret_val;
 }
 
-PyObject*
-lldb_private::LLDBSwigPython_GetChildAtIndex
-(
-    PyObject *implementor,
-    uint32_t idx
-)
-{
-    PyErr_Cleaner py_err_cleaner(true);
+PyObject *lldb_private::LLDBSwigPython_GetChildAtIndex(PyObject * implementor,
+                                                       uint32_t idx) {
 
-    PythonObject self(PyRefType::Borrowed, implementor);
-    auto pfunc = self.ResolveName<PythonCallable>("get_child_at_index");
 
-    if (!pfunc.IsAllocated())
-        return nullptr;
 
-    PythonObject result = pfunc(PythonInteger(idx));
 
-    if (!result.IsAllocated())
-        return nullptr;
 
-    lldb::SBValue* sbvalue_ptr = nullptr;
-    if (SWIG_ConvertPtr(result.get(), (void**)&sbvalue_ptr, SWIGTYPE_p_lldb__SBValue, 0) == -1)
-        return nullptr;
+  lldb::SBValue *sbvalue_ptr = nullptr;
+  if (SWIG_ConvertPtr(result.get(), (void **)&sbvalue_ptr,
+                      SWIGTYPE_p_lldb__SBValue, 0) == -1)
 
-    if (sbvalue_ptr == nullptr)
-        return nullptr;
 
-    return result.release();
 }
 
-int
-lldb_private::LLDBSwigPython_GetIndexOfChildWithName
-(
-    PyObject *implementor,
-    const char* child_name
-)
-{
-    PyErr_Cleaner py_err_cleaner(true);
+int lldb_private::LLDBSwigPython_GetIndexOfChildWithName(
+    PyObject * implementor, const char *child_name) {
 
-    PythonObject self(PyRefType::Borrowed, implementor);
-    auto pfunc = self.ResolveName<PythonCallable>("get_child_index");
 
-    if (!pfunc.IsAllocated())
-        return UINT32_MAX;
 
-    llvm::Expected<PythonObject> result = pfunc.Call(PythonString(child_name));
 
-    long long retval = unwrapOrSetPythonException(As<long long>(std::move(result)));
+  long long retval =
+      unwrapOrSetPythonException(As<long long>(std::move(result)));
 
-    if (PyErr_Occurred()) { 
-        PyErr_Clear(); // FIXME print this? do something else
-        return UINT32_MAX;
-    }
+  if (PyErr_Occurred()) {
 
-    if (retval >= 0)
-        return (uint32_t)retval;
 
-    return UINT32_MAX;
 }
 
-bool
-lldb_private::LLDBSwigPython_UpdateSynthProviderInstance
-(
-    PyObject *implementor
-)
-{
-    bool ret_val = false;
+bool lldb_private::LLDBSwigPython_UpdateSynthProviderInstance(PyObject *
+                                                              implementor) {
 
-    static char callee_name[] = "update";
 
-    PyObject* py_return = LLDBSwigPython_CallOptionalMember(implementor,callee_name);
+  PyObject *py_return =
+      LLDBSwigPython_CallOptionalMember(implementor, callee_name);
 
-    if (py_return == Py_True)
-        ret_val = true;
 
-    Py_XDECREF(py_return);
 
-    return ret_val;
 }
 
-bool
-lldb_private::LLDBSwigPython_MightHaveChildrenSynthProviderInstance
-(
-    PyObject *implementor
-)
-{
-    bool ret_val = false;
+bool lldb_private::LLDBSwigPython_MightHaveChildrenSynthProviderInstance(
+    PyObject * implementor) {
 
-    static char callee_name[] = "has_children";
 
-    PyObject* py_return = LLDBSwigPython_CallOptionalMember(implementor,callee_name, Py_True);
+  PyObject *py_return =
+      LLDBSwigPython_CallOptionalMember(implementor, callee_name, Py_True);
 
-    if (py_return == Py_True)
-        ret_val = true;
 
-    Py_XDECREF(py_return);
 
-    return ret_val;
 }
 
-PyObject*
-lldb_private::LLDBSwigPython_GetValueSynthProviderInstance
-(
-    PyObject *implementor
-)
-{
-    PyObject* ret_val = nullptr;
+PyObject *lldb_private::LLDBSwigPython_GetValueSynthProviderInstance(
+    PyObject * implementor) {
+  PyObject *ret_val = nullptr;
 
-    static char callee_name[] = "get_value";
 
-    PyObject* py_return = LLDBSwigPython_CallOptionalMember(implementor,callee_name, Py_None);
+  PyObject *py_return =
+      LLDBSwigPython_CallOptionalMember(implementor, callee_name, Py_None);
 
-    if (py_return == Py_None || py_return == nullptr)
-        ret_val = nullptr;
 
-    lldb::SBValue* sbvalue_ptr = NULL;
+  lldb::SBValue *sbvalue_ptr = NULL;
 
-    if (SWIG_ConvertPtr(py_return, (void**)&sbvalue_ptr, SWIGTYPE_p_lldb__SBValue, 0) == -1)
-        ret_val = nullptr;
-    else if (sbvalue_ptr == NULL)
-        ret_val = nullptr;
-    else
-        ret_val = py_return;
+  if (SWIG_ConvertPtr(py_return, (void **)&sbvalue_ptr,
+                      SWIGTYPE_p_lldb__SBValue, 0) == -1)
 
-    Py_XDECREF(py_return);
-    return ret_val;
 }
 
-void*
-lldb_private::LLDBSWIGPython_CastPyObjectToSBData
-(
-    PyObject* data
-)
-{
-    lldb::SBData* sb_ptr = nullptr;
+void *lldb_private::LLDBSWIGPython_CastPyObjectToSBData(PyObject * data) {
+  lldb::SBData *sb_ptr = nullptr;
 
-    int valid_cast = SWIG_ConvertPtr(data, (void**)&sb_ptr, SWIGTYPE_p_lldb__SBData, 0);
+  int valid_cast =
+      SWIG_ConvertPtr(data, (void **)&sb_ptr, SWIGTYPE_p_lldb__SBData, 0);
 
-    if (valid_cast == -1)
-        return NULL;
 
-    return sb_ptr;
 }
 
-
-void*
-lldb_private::LLDBSWIGPython_CastPyObjectToSBError
-(
-    PyObject* data
-)
-{
-    lldb::SBError* sb_ptr = nullptr;
+void *lldb_private::LLDBSWIGPython_CastPyObjectToSBError(PyObject * data) {
+  lldb::SBError *sb_ptr = nullptr;
 
-    int valid_cast = SWIG_ConvertPtr(data, (void**)&sb_ptr, SWIGTYPE_p_lldb__SBError, 0);
+  int valid_cast =
+      SWIG_ConvertPtr(data, (void **)&sb_ptr, SWIGTYPE_p_lldb__SBError, 0);
 
-    if (valid_cast == -1)
-        return NULL;
 
-    return sb_ptr;
 }
 
-
-void*
-lldb_private::LLDBSWIGPython_CastPyObjectToSBValue
-(
-    PyObject* data
-)
-{
-    lldb::SBValue* sb_ptr = NULL;
+void *lldb_private::LLDBSWIGPython_CastPyObjectToSBValue(PyObject * data) {
+  lldb::SBValue *sb_ptr = NULL;
 
-    int valid_cast = SWIG_ConvertPtr(data, (void**)&sb_ptr, SWIGTYPE_p_lldb__SBValue, 0);
+  int valid_cast =
+      SWIG_ConvertPtr(data, (void **)&sb_ptr, SWIGTYPE_p_lldb__SBValue, 0);
 
-    if (valid_cast == -1)
-        return NULL;
 
-    return sb_ptr;
 }
 
-void*
-lldb_private::LLDBSWIGPython_CastPyObjectToSBMemoryRegionInfo
-(
-    PyObject* data
-)
-{
-    lldb::SBMemoryRegionInfo* sb_ptr = NULL;
+void *lldb_private::LLDBSWIGPython_CastPyObjectToSBMemoryRegionInfo(PyObject *
+                                                                    data) {
+  lldb::SBMemoryRegionInfo *sb_ptr = NULL;
 
-    int valid_cast = SWIG_ConvertPtr(data, (void**)&sb_ptr, SWIGTYPE_p_lldb__SBMemoryRegionInfo, 0);
+  int valid_cast = SWIG_ConvertPtr(data, (void **)&sb_ptr,
+                                   SWIGTYPE_p_lldb__SBMemoryRegionInfo, 0);
 
-    if (valid_cast == -1)
-        return NULL;
 
-    return sb_ptr;
 }
 
-bool
-lldb_private::LLDBSwigPythonCallCommand
-(
-    const char *python_function_name,
-    const char *session_dictionary_name,
-    lldb::DebuggerSP& debugger,
-    const char* args,
-    lldb_private::CommandReturnObject& cmd_retobj,
-    lldb::ExecutionContextRefSP exe_ctx_ref_sp
-)
-{
-    lldb::SBCommandReturnObject cmd_retobj_sb(cmd_retobj);
-    lldb::SBDebugger debugger_sb(debugger);
-    lldb::SBExecutionContext exe_ctx_sb(exe_ctx_ref_sp);
+bool lldb_private::LLDBSwigPythonCallCommand(
+    const char *python_function_name, const char *session_dictionary_name,
+    lldb::DebuggerSP &debugger, const char *args,
+    lldb_private::CommandReturnObject &cmd_retobj,
+    lldb::ExecutionContextRefSP exe_ctx_ref_sp) {
 
-    PyErr_Cleaner py_err_cleaner(true);
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    auto argc = pfunc.GetArgInfo();
-    if (!argc) {
-        llvm::consumeError(argc.takeError());
-        return false;
-    }
-    PythonObject debugger_arg(PyRefType::Owned, SBTypeToSWIGWrapper(debugger_sb));
-    PythonObject exe_ctx_arg(PyRefType::Owned, SBTypeToSWIGWrapper(exe_ctx_sb));
-    PythonObject cmd_retobj_arg(PyRefType::Owned, SBTypeToSWIGWrapper(cmd_retobj_sb));
+  PythonObject cmd_retobj_arg(PyRefType::Owned,
+                              SBTypeToSWIGWrapper(cmd_retobj_sb));
 
-    if (argc.get().max_positional_args < 5u)
-        pfunc(debugger_arg, PythonString(args), cmd_retobj_arg, dict);
-    else
-        pfunc(debugger_arg, PythonString(args), exe_ctx_arg, cmd_retobj_arg, dict);
 
-    return true;
 }
 
-bool
-lldb_private::LLDBSwigPythonCallCommandObject
-(
-    PyObject *implementor,
-    lldb::DebuggerSP& debugger,
-    const char* args,
-    lldb_private::CommandReturnObject& cmd_retobj,
-    lldb::ExecutionContextRefSP exe_ctx_ref_sp
-)
-{
-    lldb::SBCommandReturnObject cmd_retobj_sb(cmd_retobj);
-    lldb::SBDebugger debugger_sb(debugger);
-    lldb::SBExecutionContext exe_ctx_sb(exe_ctx_ref_sp);
+bool lldb_private::LLDBSwigPythonCallCommandObject(
+    PyObject * implementor, lldb::DebuggerSP & debugger, const char *args,
+    lldb_private::CommandReturnObject &cmd_retobj,
+    lldb::ExecutionContextRefSP exe_ctx_ref_sp) {
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    PythonObject self(PyRefType::Borrowed, implementor);
-    auto pfunc = self.ResolveName<PythonCallable>("__call__");
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    PythonObject debugger_arg(PyRefType::Owned, SBTypeToSWIGWrapper(debugger_sb));
-    PythonObject exe_ctx_arg(PyRefType::Owned, SBTypeToSWIGWrapper(exe_ctx_sb));
-    PythonObject cmd_retobj_arg(PyRefType::Owned, SBTypeToSWIGWrapper(cmd_retobj_sb));
+  PythonObject cmd_retobj_arg(PyRefType::Owned,
+                              SBTypeToSWIGWrapper(cmd_retobj_sb));
 
-    pfunc(debugger_arg, PythonString(args), exe_ctx_arg, cmd_retobj_arg);
 
-    return true;
 }
 
-void*
-lldb_private::LLDBSWIGPythonCreateOSPlugin
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const lldb::ProcessSP& process_sp
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+void *lldb_private::LLDBSWIGPythonCreateOSPlugin(
+    const char *python_class_name, const char *session_dictionary_name,
+    const lldb::ProcessSP &process_sp) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated())
-        Py_RETURN_NONE;
 
-    auto result = pfunc(ToSWIGWrapper(process_sp));
 
-    if (result.IsAllocated())
-        return result.release();
 
-    Py_RETURN_NONE;
 }
 
-void*
-lldb_private::LLDBSWIGPython_CreateFrameRecognizer
-(
-    const char *python_class_name,
-    const char *session_dictionary_name
-)
-{
-    if (python_class_name == NULL || python_class_name[0] == '\0' || !session_dictionary_name)
-        Py_RETURN_NONE;
+void *lldb_private::LLDBSWIGPython_CreateFrameRecognizer(
+    const char *python_class_name, const char *session_dictionary_name) {
+  if (python_class_name == NULL || python_class_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_class_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_class_name, dict);
 
-    if (!pfunc.IsAllocated())
-        Py_RETURN_NONE;
 
-    auto result = pfunc();
 
-    if (result.IsAllocated())
-        return result.release();
 
-    Py_RETURN_NONE;
 }
 
-PyObject*
-lldb_private::LLDBSwigPython_GetRecognizedArguments
-(
-    PyObject *implementor,
-    const lldb::StackFrameSP& frame_sp
-)
-{
-    static char callee_name[] = "get_recognized_arguments";
+PyObject *lldb_private::LLDBSwigPython_GetRecognizedArguments(
+    PyObject * implementor, const lldb::StackFrameSP &frame_sp) {
 
-    lldb::SBFrame frame_sb(frame_sp);
-    PyObject *arg = SBTypeToSWIGWrapper(frame_sb);
 
-    PythonString str(callee_name);
-    PyObject* result = PyObject_CallMethodObjArgs(implementor, str.get(), arg,
-                                                  NULL);
-    return result;
+  PyObject *result =
+      PyObject_CallMethodObjArgs(implementor, str.get(), arg, NULL);
 }
 
-void*
-lldb_private::LLDBSWIGPython_GetDynamicSetting (void* module, const char* setting, const lldb::TargetSP& target_sp)
-{
-    if (!module || !setting)
-        Py_RETURN_NONE;
+void *lldb_private::LLDBSWIGPython_GetDynamicSetting(
+    void *module, const char *setting, const lldb::TargetSP &target_sp) {
 
-    PyErr_Cleaner py_err_cleaner(true);
-    PythonObject py_module(PyRefType::Borrowed, (PyObject *)module);
-    auto pfunc = py_module.ResolveName<PythonCallable>("get_dynamic_setting");
 
-    if (!pfunc.IsAllocated())
-        Py_RETURN_NONE;
 
-    auto result = pfunc(ToSWIGWrapper(target_sp), PythonString(setting));
 
-    return result.release();
 }
 
 bool lldb_private::LLDBSWIGPythonRunScriptKeywordProcess(
     const char *python_function_name, const char *session_dictionary_name,
     const lldb::ProcessSP &process, std::string &output) {
 
-    if (python_function_name == NULL || python_function_name[0] == '\0' || !session_dictionary_name)
-        return false;
+  if (python_function_name == NULL || python_function_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    auto result = pfunc(ToSWIGWrapper(process), dict);
 
-    output = result.Str().GetString().str();
 
-    return true;
 }
 
-bool
-lldb_private::LLDBSWIGPythonRunScriptKeywordThread
-(const char* python_function_name,
-const char* session_dictionary_name,
-lldb::ThreadSP& thread,
-std::string& output)
+bool lldb_private::LLDBSWIGPythonRunScriptKeywordThread(
+    const char *python_function_name, const char *session_dictionary_name,
+    lldb::ThreadSP &thread, std::string &output)
 
 {
-    if (python_function_name == NULL || python_function_name[0] == '\0' || !session_dictionary_name)
-        return false;
+  if (python_function_name == NULL || python_function_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    lldb::SBThread thread_sb(thread);
-    PythonObject thread_arg(PyRefType::Owned, SBTypeToSWIGWrapper(thread_sb));
-    auto result = pfunc(thread_arg, dict);
 
-    output = result.Str().GetString().str();
 
-    return true;
 }
 
 bool lldb_private::LLDBSWIGPythonRunScriptKeywordTarget(
     const char *python_function_name, const char *session_dictionary_name,
     const lldb::TargetSP &target, std::string &output) {
 
-    if (python_function_name == NULL || python_function_name[0] == '\0' || !session_dictionary_name)
-        return false;
+  if (python_function_name == NULL || python_function_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name,dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    auto result = pfunc(ToSWIGWrapper(target), dict);
 
-    output = result.Str().GetString().str();
 
-    return true;
 }
 
-bool
-lldb_private::LLDBSWIGPythonRunScriptKeywordFrame
-(const char* python_function_name,
-const char* session_dictionary_name,
-lldb::StackFrameSP& frame,
-std::string& output)
+bool lldb_private::LLDBSWIGPythonRunScriptKeywordFrame(
+    const char *python_function_name, const char *session_dictionary_name,
+    lldb::StackFrameSP &frame, std::string &output)
 
 {
-    if (python_function_name == NULL || python_function_name[0] == '\0' || !session_dictionary_name)
-        return false;
+  if (python_function_name == NULL || python_function_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name,dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    lldb::SBFrame frame_sb(frame);
-    PythonObject frame_arg(PyRefType::Owned, SBTypeToSWIGWrapper(frame_sb));
-    auto result = pfunc(frame_arg, dict);
 
-    output = result.Str().GetString().str();
 
-    return true;
 }
 
 bool lldb_private::LLDBSWIGPythonRunScriptKeywordValue(
     const char *python_function_name, const char *session_dictionary_name,
     const lldb::ValueObjectSP &value, std::string &output) {
 
-    if (python_function_name == NULL || python_function_name[0] == '\0' || !session_dictionary_name)
-        return false;
+  if (python_function_name == NULL || python_function_name[0] == '\0' ||
+      !session_dictionary_name)
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    if (!pfunc.IsAllocated())
-        return false;
 
-    auto result = pfunc(ToSWIGWrapper(value), dict);
 
-    output = result.Str().GetString().str();
 
-    return true;
 }
 
-bool
-lldb_private::LLDBSwigPythonCallModuleInit
-(
-    const char *python_module_name,
-    const char *session_dictionary_name,
-    lldb::DebuggerSP& debugger
-)
-{
-    std::string python_function_name_string = python_module_name;
-    python_function_name_string += ".__lldb_init_module";
-    const char* python_function_name = python_function_name_string.c_str();
+bool lldb_private::LLDBSwigPythonCallModuleInit(
+    const char *python_module_name, const char *session_dictionary_name,
+    lldb::DebuggerSP &debugger) {
+  const char *python_function_name = python_function_name_string.c_str();
 
-    PyErr_Cleaner py_err_cleaner(true);
 
-    auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(session_dictionary_name);
-    auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(python_function_name, dict);
+  auto dict = PythonModule::MainModule().ResolveName<PythonDictionary>(
+      session_dictionary_name);
+  auto pfunc = PythonObject::ResolveNameWithDictionary<PythonCallable>(
+      python_function_name, dict);
 
-    // This method is optional and need not exist.  So if we don't find it,
-    // it's actually a success, not a failure.
-    if (!pfunc.IsAllocated())
-        return true;
 
-    lldb::SBDebugger debugger_sb(debugger);
-    PythonObject debugger_arg(PyRefType::Owned, SBTypeToSWIGWrapper(debugger_sb));
-    pfunc(debugger_arg, dict);
 
-    return true;
 }
 
-lldb::ValueObjectSP
-lldb_private::LLDBSWIGPython_GetValueObjectSPFromSBValue (void* data)
-{
-    lldb::ValueObjectSP valobj_sp;
-    if (data)
-    {
-        lldb::SBValue* sb_ptr = (lldb::SBValue *)data;
-        valobj_sp = sb_ptr->GetSP();
-    }
-    return valobj_sp;
+lldb::ValueObjectSP lldb_private::LLDBSWIGPython_GetValueObjectSPFromSBValue(
+    void *data) {
+  if (data) {
+    lldb::SBValue *sb_ptr = (lldb::SBValue *)data;
 }
 
 // For the LogOutputCallback functions
-static void LLDBSwigPythonCallPythonLogOutputCallback(const char *str, void *baton) {
-    if (baton != Py_None) {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-      PyObject *result = PyObject_CallFunction(reinterpret_cast<PyObject*>(baton), const_cast<char*>("s"), str);
-    Py_XDECREF(result);
-      SWIG_PYTHON_THREAD_END_BLOCK;
-    }
+static void LLDBSwigPythonCallPythonLogOutputCallback(const char *str,
+                                                      void *baton) {
+    PyObject *result = PyObject_CallFunction(
+        reinterpret_cast<PyObject *>(baton), const_cast<char *>("s"), str);
+    Py_XDECREF(result);
 }
 %}