vendor/lldb/lldb-trunk-r290819

2 files changed, 65 insertions, 55 deletions

diff --git a/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py b/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
index 2d0b23b4e5ba..afb497e04b5b 100644
--- a/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
+++ b/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
@@ -7,13 +7,14 @@ expected in a SyntheticChildrenProvider
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class Issue11581TestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -25,54 +26,61 @@ class Issue11581TestCase(TestBase):
         def cleanup():
             self.runCmd('type synthetic clear', check=False)
 
-
         # Execute the cleanup function during test case tear down.
         self.addTearDownHook(cleanup)
 
         """valobj.AddressOf() should return correct values."""
         self.build()
-        
+
         exe = os.path.join(os.getcwd(), "a.out")
-        
+
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
 
-        breakpoint = target.BreakpointCreateBySourceRegex('Set breakpoint here.',lldb.SBFileSpec ("main.cpp", False))
-        
-        process = target.LaunchSimple (None, None, self.get_process_working_directory())
-        self.assertTrue (process, "Created a process.")
-        self.assertTrue (process.GetState() == lldb.eStateStopped, "Stopped it too.")
+        breakpoint = target.BreakpointCreateBySourceRegex(
+            'Set breakpoint here.', lldb.SBFileSpec("main.cpp", False))
+
+        process = target.LaunchSimple(
+            None, None, self.get_process_working_directory())
+        self.assertTrue(process, "Created a process.")
+        self.assertTrue(
+            process.GetState() == lldb.eStateStopped,
+            "Stopped it too.")
 
-        thread_list = lldbutil.get_threads_stopped_at_breakpoint (process, breakpoint)
-        self.assertTrue (len(thread_list) == 1)
+        thread_list = lldbutil.get_threads_stopped_at_breakpoint(
+            process, breakpoint)
+        self.assertTrue(len(thread_list) == 1)
         thread = thread_list[0]
 
         self.runCmd("command script import --allow-reload s11588.py")
-        self.runCmd("type synthetic add --python-class s11588.Issue11581SyntheticProvider StgClosure")
+        self.runCmd(
+            "type synthetic add --python-class s11588.Issue11581SyntheticProvider StgClosure")
 
         self.expect("expr --show-types -- *((StgClosure*)(r14-1))",
-            substrs = ["(StgClosure) $",
-            "(StgClosure *) &$","0x",
-            "addr = ",
-            "load_address = "])
+                    substrs=["(StgClosure) $",
+                             "(StgClosure *) &$", "0x",
+                             "addr = ",
+                             "load_address = "])
 
         # register r14 is an x86_64 extension let's skip this part of the test
         # if we are on a different architecture
         if self.getArchitecture() == 'x86_64':
-                target = lldb.debugger.GetSelectedTarget()
-                process = target.GetProcess()
-                frame = process.GetSelectedThread().GetSelectedFrame()
-                pointer = frame.FindVariable("r14")
-                addr = pointer.GetValueAsUnsigned(0)
-                self.assertTrue(addr != 0, "could not read pointer to StgClosure")
-                addr = addr - 1
-                self.runCmd("register write r14 %d" % addr)
-                self.expect("register read r14",
-                    substrs = ["0x",hex(addr)[2:].rstrip("L")])  # Remove trailing 'L' if it exists
-                self.expect("expr --show-types -- *(StgClosure*)$r14",
-                    substrs = ["(StgClosure) $",
-                    "(StgClosure *) &$","0x",
-                    "addr = ",
-                    "load_address = ",
-                    hex(addr)[2:].rstrip("L"),
-                    str(addr)])
+            target = lldb.debugger.GetSelectedTarget()
+            process = target.GetProcess()
+            frame = process.GetSelectedThread().GetSelectedFrame()
+            pointer = frame.FindVariable("r14")
+            addr = pointer.GetValueAsUnsigned(0)
+            self.assertTrue(addr != 0, "could not read pointer to StgClosure")
+            addr = addr - 1
+            self.runCmd("register write r14 %d" % addr)
+            self.expect(
+                "register read r14", substrs=[
+                    "0x", hex(addr)[
+                        2:].rstrip("L")])  # Remove trailing 'L' if it exists
+            self.expect("expr --show-types -- *(StgClosure*)$r14",
+                        substrs=["(StgClosure) $",
+                                 "(StgClosure *) &$", "0x",
+                                 "addr = ",
+                                 "load_address = ",
+                                 hex(addr)[2:].rstrip("L"),
+                                 str(addr)])
diff --git a/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py b/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py
index 01bb09a1b0d6..51c20423ed36 100644
--- a/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py
+++ b/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py
@@ -1,26 +1,28 @@
 class Issue11581SyntheticProvider(object):
-	def __init__(self, valobj, dict):
-		self.valobj = valobj
-		self.addrOf = valobj.AddressOf()
-		self.addr = valobj.GetAddress()
-		self.load_address = valobj.GetLoadAddress()
 
-	def num_children(self):
-		return 3;
+    def __init__(self, valobj, dict):
+        self.valobj = valobj
+        self.addrOf = valobj.AddressOf()
+        self.addr = valobj.GetAddress()
+        self.load_address = valobj.GetLoadAddress()
 
-	def get_child_at_index(self, index):
-		if index == 0:
-			return self.addrOf
-		if index == 1:
-			return self.valobj.CreateValueFromExpression("addr", str(self.addr))
-		if index == 2:
-			return self.valobj.CreateValueFromExpression("load_address", str(self.load_address))
+    def num_children(self):
+        return 3
 
-	def get_child_index(self, name):
-		if name == "addrOf":
-			return 0
-		if name == "addr":
-			return 1
-		if name == "load_address":
-			return 2
+    def get_child_at_index(self, index):
+        if index == 0:
+            return self.addrOf
+        if index == 1:
+            return self.valobj.CreateValueFromExpression(
+                "addr", str(self.addr))
+        if index == 2:
+            return self.valobj.CreateValueFromExpression(
+                "load_address", str(self.load_address))
 
+    def get_child_index(self, name):
+        if name == "addrOf":
+            return 0
+        if name == "addr":
+            return 1
+        if name == "load_address":
+            return 2