[lldb] Revert ScriptedProcess patches

This patch reverts the following commits:
- 5a9c349
- 4679676
- 2cff3de
- 182f0d1
- d62a53a

Signed-off-by: Med Ismail Bennani <[email protected]>

Author: medismailben

lldb/bindings/interface/SBLaunchInfo.i

@@ -135,16 +135,6 @@ public:
 
     void
     SetDetachOnError(bool enable);
-
-    const char *
-    GetScriptedProcessClassName() const;
-
-    void SetScriptedProcessClassName(const char *class_name);
-
-    lldb::SBStructuredData
-    GetScriptedProcessDictionary() const;
-
-    void SetScriptedProcessDictionary(lldb::SBStructuredData dict);
 };
 
 } // namespace lldb

lldb/bindings/python/CMakeLists.txt

@@ -104,20 +104,6 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
     FILES "${LLDB_SOURCE_DIR}/examples/python/in_call_stack.py"
           "${LLDB_SOURCE_DIR}/examples/python/symbolication.py")
 
-  create_python_package(
-    ${swig_target}
-    ${lldb_python_target_dir}
-    "plugins"
-    FILES
-    "${LLDB_SOURCE_DIR}/examples/python/scripted_process/scripted_process.py")
-
-  create_python_package(
-    ${swig_target}
-    ${lldb_python_target_dir}
-    "plugins"
-    FILES
-    "${LLDB_SOURCE_DIR}/examples/python/scripted_process/scripted_process.py")
-
   if(APPLE)
     create_python_package(
       ${swig_target}

lldb/bindings/python/python-wrapper.swig

@@ -258,72 +258,6 @@ LLDBSwigPythonCreateCommandObject
     Py_RETURN_NONE;
 }
 
-SWIGEXPORT void*
-LLDBSwigPythonCreateScriptedProcess
-(
-    const char *python_class_name,
-    const char *session_dictionary_name,
-    const lldb::TargetSP& target_sp,
-    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;
-
-
-    PyErr_Cleaner py_err_cleaner(true);
-
-    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;
-    }
-
-    // I do not want the SBTarget to be deallocated when going out of scope
-    // because python has ownership of it and will manage memory for this
-    // object by itself
-    PythonObject target_arg(PyRefType::Owned, SBTypeToSWIGWrapper(new lldb::SBTarget(target_sp)));
-
-    if (!target_arg.IsAllocated())
-        Py_RETURN_NONE;
-
-    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;
-    }
-
-    PythonObject result = {};
-    if (arg_info.get().max_positional_args == 2) {
-        if (args_impl != nullptr) {
-           error_string.assign("args passed, but __init__ does not take an args dictionary");
-           Py_RETURN_NONE;
-        }
-        result = pfunc(target_arg, dict);
-    } else if (arg_info.get().max_positional_args >= 3) {
-        PythonObject args_arg(PyRefType::Owned, SBTypeToSWIGWrapper(new lldb::SBStructuredData(args_impl)));
-        result = pfunc(target_arg, args_arg, dict);
-    } else {
-        error_string.assign("wrong number of arguments in __init__, should be 2 or 3 (not including self)");
-        Py_RETURN_NONE;
-    }
-
-    if (result.IsAllocated())
-        return result.release();
-    Py_RETURN_NONE;
-}
-
 SWIGEXPORT void*
 LLDBSwigPythonCreateScriptedThreadPlan
 (
@@ -851,40 +785,6 @@ LLDBSwigPython_GetValueSynthProviderInstance
     return ret_val;
 }
 
-SWIGEXPORT void*
-LLDBSWIGPython_CastPyObjectToSBData
-(
-    PyObject* data
-)
-{
-    lldb::SBData* sb_ptr = nullptr;
-
-    int valid_cast = SWIG_ConvertPtr(data, (void**)&sb_ptr, SWIGTYPE_p_lldb__SBData, 0);
-
-    if (valid_cast == -1)
-        return NULL;
-
-    return sb_ptr;
-}
-
-
-SWIGEXPORT void*
-LLDBSWIGPython_CastPyObjectToSBError
-(
-    PyObject* data
-)
-{
-    lldb::SBError* sb_ptr = nullptr;
-
-    int valid_cast = SWIG_ConvertPtr(data, (void**)&sb_ptr, SWIGTYPE_p_lldb__SBError, 0);
-
-    if (valid_cast == -1)
-        return NULL;
-
-    return sb_ptr;
-}
-
-
 SWIGEXPORT void*
 LLDBSWIGPython_CastPyObjectToSBValue
 (

lldb/examples/python/scripted_process/my_scripted_process.py

@@ -11,10 +11,6 @@
 
 #include "lldb/API/SBDefines.h"
 
-namespace lldb_private {
-class ScriptInterpreter;
-} // namespace lldb_private
-
 namespace lldb {
 
 class LLDB_API SBData {
@@ -151,8 +147,6 @@ class LLDB_API SBData {
   friend class SBTarget;
   friend class SBValue;
 
-  friend class lldb_private::ScriptInterpreter;
-
   lldb::DataExtractorSP m_opaque_sp;
 };
 

lldb/examples/python/scripted_process/scripted_process.py

@@ -11,10 +11,6 @@
 
 #include "lldb/API/SBDefines.h"
 
-namespace lldb_private {
-class ScriptInterpreter;
-} // namespace lldb_private
-
 namespace lldb {
 
 class LLDB_API SBError {
@@ -76,8 +72,6 @@ class LLDB_API SBError {
   friend class SBWatchpoint;
   friend class SBFile;
 
-  friend class lldb_private::ScriptInterpreter;
-
   lldb_private::Status *get();
 
   lldb_private::Status *operator->();

lldb/include/lldb/API/SBData.h

@@ -171,14 +171,6 @@ class LLDB_API SBLaunchInfo {
 
   void SetDetachOnError(bool enable);
 
-  const char *GetScriptedProcessClassName() const;
-
-  void SetScriptedProcessClassName(const char *class_name);
-
-  lldb::SBStructuredData GetScriptedProcessDictionary() const;
-
-  void SetScriptedProcessDictionary(lldb::SBStructuredData dict);
-
 protected:
   friend class SBPlatform;
   friend class SBTarget;