Merge pull request #6722 from medismailben/swift/release/5.9

Author: medismailben

lldb/bindings/interface/SBAttachInfo.i

@@ -113,6 +113,12 @@ public:
     void
     SetListener (lldb::SBListener &listener);
 
+    SBListener
+    GetShadowListener();
+
+    void
+    SetShadowListener(SBListener &listener);
+
     const char *
     GetScriptedProcessClassName() const;
 

lldb/bindings/interface/SBError.i

@@ -59,6 +59,8 @@ class SBError {
 public:
     SBError ();
 
+    SBError(const char *message);
+
     SBError (const lldb::SBError &rhs);
 
     ~SBError();

lldb/bindings/interface/SBLaunchInfo.i

@@ -49,6 +49,12 @@ public:
     void
     SetListener (lldb::SBListener &listener);
 
+    SBListener
+    GetShadowListener();
+
+    void
+    SetShadowListener(SBListener &listener);
+
     uint32_t
     GetNumArguments ();
 

lldb/bindings/interface/SBProcess.i

@@ -241,6 +241,9 @@ public:
     void
     SendAsyncInterrupt();
 
+    void
+    ForceScriptedState(StateType new_state);
+
     %feature("autodoc", "
     Reads memory from the current process's address space and removes any
     traps that may have been inserted into the memory. It returns the byte
@@ -341,6 +344,9 @@ public:
     lldb::SBBroadcaster
     GetBroadcaster () const;
 
+    static const char *
+    GetBroadcasterClass();
+
     bool
     GetDescription (lldb::SBStream &description);
 

lldb/bindings/interface/SBTarget.i

@@ -1049,7 +1049,7 @@ public:
 
         def get_modules_access_object(self):
             '''An accessor function that returns a modules_access() object which allows lazy module access from a lldb.SBTarget object.'''
-            return self.modules_access (self)
+            return self.modules_access(self)
 
         def get_modules_array(self):
             '''An accessor function that returns a list() that contains all modules in a lldb.SBTarget object.'''
@@ -1068,18 +1068,81 @@ public:
             object.'''
             return lldb_iter(self, 'GetNumBreakpoints', 'GetBreakpointAtIndex')
 
+        class bkpts_access(object):
+            '''A helper object that will lazily hand out bkpts for a target when supplied an index.'''
+            def __init__(self, sbtarget):
+                self.sbtarget = sbtarget
+
+            def __len__(self):
+                if self.sbtarget:
+                    return int(self.sbtarget.GetNumBreakpoints())
+                return 0
+
+            def __getitem__(self, key):
+                if isinstance(key, int):
+                    count = len(self)
+                    if -count <= key < count:
+                        key %= count
+                        return self.sbtarget.GetBreakpointAtIndex(key)
+                return None
+
+        def get_bkpts_access_object(self):
+            '''An accessor function that returns a bkpts_access() object which allows lazy bkpt access from a lldb.SBtarget object.'''
+            return self.bkpts_access(self)
+
+        def get_target_bkpts(self):
+            '''An accessor function that returns a list() that contains all bkpts in a lldb.SBtarget object.'''
+            bkpts = []
+            for idx in range(self.GetNumBreakpoints()):
+                bkpts.append(self.GetBreakpointAtIndex(idx))
+            return bkpts
+
         def watchpoint_iter(self):
             '''Returns an iterator over all watchpoints in a lldb.SBTarget
             object.'''
             return lldb_iter(self, 'GetNumWatchpoints', 'GetWatchpointAtIndex')
 
+        class watchpoints_access(object):
+            '''A helper object that will lazily hand out watchpoints for a target when supplied an index.'''
+            def __init__(self, sbtarget):
+                self.sbtarget = sbtarget
+
+            def __len__(self):
+                if self.sbtarget:
+                    return int(self.sbtarget.GetNumWatchpoints())
+                return 0
+
+            def __getitem__(self, key):
+                if isinstance(key, int):
+                    count = len(self)
+                    if -count <= key < count:
+                        key %= count
+                        return self.sbtarget.GetWatchpointAtIndex(key)
+                return None
+
+        def get_watchpoints_access_object(self):
+            '''An accessor function that returns a watchpoints_access() object which allows lazy watchpoint access from a lldb.SBtarget object.'''
+            return self.watchpoints_access(self)
+
+        def get_target_watchpoints(self):
+            '''An accessor function that returns a list() that contains all watchpoints in a lldb.SBtarget object.'''
+            watchpoints = []
+            for idx in range(self.GetNumWatchpoints()):
+                bkpts.append(self.GetWatchpointAtIndex(idx))
+            return watchpoints
+
+
         modules = property(get_modules_array, None, doc='''A read only property that returns a list() of lldb.SBModule objects contained in this target. This list is a list all modules that the target currently is tracking (the main executable and all dependent shared libraries).''')
         module = property(get_modules_access_object, None, doc=r'''A read only property that returns an object that implements python operator overloading with the square brackets().\n    target.module[<int>] allows array access to any modules.\n    target.module[<str>] allows access to modules by basename, full path, or uuid string value.\n    target.module[uuid.UUID()] allows module access by UUID.\n    target.module[re] allows module access using a regular expression that matches the module full path.''')
         process = property(GetProcess, None, doc='''A read only property that returns an lldb object that represents the process (lldb.SBProcess) that this target owns.''')
         executable = property(GetExecutable, None, doc='''A read only property that returns an lldb object that represents the main executable module (lldb.SBModule) for this target.''')
         debugger = property(GetDebugger, None, doc='''A read only property that returns an lldb object that represents the debugger (lldb.SBDebugger) that owns this target.''')
         num_breakpoints = property(GetNumBreakpoints, None, doc='''A read only property that returns the number of breakpoints that this target has as an integer.''')
+        breakpoints = property(get_target_bkpts, None, doc='''A read only property that returns a list() of lldb.SBBreakpoint objects for all breakpoints in this target.''')
+        breakpoint = property(get_bkpts_access_object, None, doc='''A read only property that returns an object that can be used to access breakpoints as an array ("bkpt_12 = lldb.target.bkpt[12]").''')
         num_watchpoints = property(GetNumWatchpoints, None, doc='''A read only property that returns the number of watchpoints that this target has as an integer.''')
+        watchpoints = property(get_target_watchpoints, None, doc='''A read only property that returns a list() of lldb.SBwatchpoint objects for all watchpoints in this target.''')
+        watchpoint = property(get_watchpoints_access_object, None, doc='''A read only property that returns an object that can be used to access watchpoints as an array ("watchpoint_12 = lldb.target.watchpoint[12]").''')
         broadcaster = property(GetBroadcaster, None, doc='''A read only property that an lldb object that represents the broadcaster (lldb.SBBroadcaster) for this target.''')
         byte_order = property(GetByteOrder, None, doc='''A read only property that returns an lldb enumeration value (lldb.eByteOrderLittle, lldb.eByteOrderBig, lldb.eByteOrderInvalid) that represents the byte order for this target.''')
         addr_size = property(GetAddressByteSize, None, doc='''A read only property that returns the size in bytes of an address for this target.''')

lldb/bindings/python/python-wrapper.swig

@@ -690,6 +690,18 @@ void *lldb_private::LLDBSWIGPython_CastPyObjectToSBData(PyObject * data) {
   return sb_ptr;
 }
 
+void *lldb_private::LLDBSWIGPython_CastPyObjectToSBBreakpoint(PyObject * data) {
+  lldb::SBBreakpoint *sb_ptr = nullptr;
+
+  int valid_cast =
+      SWIG_ConvertPtr(data, (void **)&sb_ptr, SWIGTYPE_p_lldb__SBBreakpoint, 0);
+
+  if (valid_cast == -1)
+    return NULL;
+
+  return sb_ptr;
+}
+
 void *lldb_private::LLDBSWIGPython_CastPyObjectToSBAttachInfo(PyObject * data) {
   lldb::SBAttachInfo *sb_ptr = nullptr;