*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

3 files changed, 109 insertions, 53 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
index 93f846a0687..3d23f644554 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -5,13 +5,13 @@ Test lldb target stop-hook command.
 from __future__ import print_function
 
 
-
 import os
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class StopHookCmdTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -20,9 +20,15 @@ class StopHookCmdTestCase(TestBase):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line numbers inside main.cpp.
-        self.begl = line_number('main.cpp', '// Set breakpoint here to test target stop-hook.')
-        self.endl = line_number('main.cpp', '// End of the line range for which stop-hook is to be run.')
-        self.line = line_number('main.cpp', '// Another breakpoint which is outside of the stop-hook range.')
+        self.begl = line_number(
+            'main.cpp',
+            '// Set breakpoint here to test target stop-hook.')
+        self.endl = line_number(
+            'main.cpp',
+            '// End of the line range for which stop-hook is to be run.')
+        self.line = line_number(
+            'main.cpp',
+            '// Another breakpoint which is outside of the stop-hook range.')
 
     @no_debug_info_test
     def test_not_crashing_if_no_target(self):
@@ -35,32 +41,37 @@ class StopHookCmdTestCase(TestBase):
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.begl, num_expected_locations=1, loc_exact=True)
+        lldbutil.run_break_set_by_file_and_line(
+            self, "main.cpp", self.begl, num_expected_locations=1, loc_exact=True)
 
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+        lldbutil.run_break_set_by_file_and_line(
+            self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
 
-        self.runCmd("target stop-hook add -f main.cpp -l %d -e %d -o 'expr ptr'" % (self.begl, self.endl))
+        self.runCmd(
+            "target stop-hook add -f main.cpp -l %d -e %d -o 'expr ptr'" %
+            (self.begl, self.endl))
 
         self.expect('target stop-hook list', 'Stop Hook added successfully',
-            substrs = ['State: enabled',
-                       'expr ptr'])
+                    substrs=['State: enabled',
+                             'expr ptr'])
 
         self.runCmd('target stop-hook disable')
 
         self.expect('target stop-hook list', 'Stop Hook disabled successfully',
-            substrs = ['State: disabled',
-                       'expr ptr'])
+                    substrs=['State: disabled',
+                             'expr ptr'])
 
         self.runCmd('target stop-hook enable')
 
         self.expect('target stop-hook list', 'Stop Hook enabled successfully',
-            substrs = ['State: enabled',
-                       'expr ptr'])
+                    substrs=['State: enabled',
+                             'expr ptr'])
 
         self.runCmd("settings set auto-confirm true")
-        self.addTearDownHook(lambda: self.runCmd("settings clear auto-confirm"))
+        self.addTearDownHook(
+            lambda: self.runCmd("settings clear auto-confirm"))
 
         self.runCmd('target stop-hook delete')
 
         self.expect('target stop-hook list', 'Stop Hook deleted successfully',
-            substrs = ['No stop hooks.'])
+                    substrs=['No stop hooks.'])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
index c42c1e56388..fa5c6de0565 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
@@ -5,7 +5,6 @@ Test lldb target stop-hook mechanism to see whether it fires off correctly .
 from __future__ import print_function
 
 
-
 import os
 import lldb
 from lldbsuite.test.decorators import *
@@ -13,6 +12,7 @@ from lldbsuite.test.lldbtest import *
 from lldbsuite.test import configuration
 from lldbsuite.test import lldbutil
 
+
 class StopHookMechanismTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -21,14 +21,24 @@ class StopHookMechanismTestCase(TestBase):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line numbers inside main.cpp.
-        self.begl = line_number('main.cpp', '// Set breakpoint here to test target stop-hook.')
-        self.endl = line_number('main.cpp', '// End of the line range for which stop-hook is to be run.')
-        self.correct_step_line = line_number ('main.cpp', '// We should stop here after stepping.')
-        self.line = line_number('main.cpp', '// Another breakpoint which is outside of the stop-hook range.')
+        self.begl = line_number(
+            'main.cpp',
+            '// Set breakpoint here to test target stop-hook.')
+        self.endl = line_number(
+            'main.cpp',
+            '// End of the line range for which stop-hook is to be run.')
+        self.correct_step_line = line_number(
+            'main.cpp', '// We should stop here after stepping.')
+        self.line = line_number(
+            'main.cpp',
+            '// Another breakpoint which is outside of the stop-hook range.')
 
-    @skipIfFreeBSD # llvm.org/pr15037
-    @expectedFlakeyLinux('llvm.org/pr15037') # stop-hooks sometimes fail to fire on Linux
-    @expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+    @skipIfFreeBSD  # llvm.org/pr15037
+    # stop-hooks sometimes fail to fire on Linux
+    @expectedFlakeyLinux('llvm.org/pr15037')
+    @expectedFailureAll(
+        hostoslist=["windows"],
+        bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
     def test(self):
         """Test the stop-hook mechanism."""
         self.build()
@@ -40,7 +50,8 @@ class StopHookMechanismTestCase(TestBase):
         add_prompt1 = "> "
 
         # So that the child gets torn down after the test.
-        self.child = pexpect.spawn('%s %s' % (lldbtest_config.lldbExec, self.lldbOption))
+        self.child = pexpect.spawn('%s %s' %
+                                   (lldbtest_config.lldbExec, self.lldbOption))
         child = self.child
         # Turn on logging for what the child sends back.
         if self.TraceOn():
@@ -48,11 +59,17 @@ class StopHookMechanismTestCase(TestBase):
 
         if lldb.remote_platform:
             child.expect_exact(prompt)
-            child.sendline('platform select %s' % lldb.remote_platform.GetName())
+            child.sendline(
+                'platform select %s' %
+                lldb.remote_platform.GetName())
             child.expect_exact(prompt)
-            child.sendline('platform connect %s' % configuration.lldb_platform_url)
+            child.sendline(
+                'platform connect %s' %
+                configuration.lldb_platform_url)
             child.expect_exact(prompt)
-            child.sendline('platform settings -w %s' % configuration.lldb_platform_working_dir)
+            child.sendline(
+                'platform settings -w %s' %
+                configuration.lldb_platform_working_dir)
 
         child.expect_exact(prompt)
         child.sendline('target create %s' % exe)
@@ -63,7 +80,9 @@ class StopHookMechanismTestCase(TestBase):
         child.expect_exact(prompt)
         child.sendline('breakpoint set -f main.cpp -l %d' % self.line)
         child.expect_exact(prompt)
-        child.sendline('target stop-hook add -f main.cpp -l %d -e %d' % (self.begl, self.endl))
+        child.sendline(
+            'target stop-hook add -f main.cpp -l %d -e %d' %
+            (self.begl, self.endl))
         child.expect_exact(add_prompt)
         child.expect_exact(add_prompt1)
         child.sendline('expr ptr')
@@ -72,10 +91,12 @@ class StopHookMechanismTestCase(TestBase):
         child.expect_exact(prompt)
         child.sendline('target stop-hook list')
 
-        # Now run the program, expect to stop at the first breakpoint which is within the stop-hook range.
+        # Now run the program, expect to stop at the first breakpoint which is
+        # within the stop-hook range.
         child.expect_exact(prompt)
         child.sendline('run')
-        # Make sure we see the stop hook text from the stop of the process from the run hitting the first breakpoint
+        # Make sure we see the stop hook text from the stop of the process from
+        # the run hitting the first breakpoint
         child.expect_exact('(void *) $')
         child.expect_exact(prompt)
         child.sendline('thread step-over')
@@ -91,13 +112,16 @@ class StopHookMechanismTestCase(TestBase):
         print('expecting "%s"' % at_line)
         child.expect_exact(at_line)
 
-        # Now continue the inferior, we'll stop at another breakpoint which is outside the stop-hook range.
+        # Now continue the inferior, we'll stop at another breakpoint which is
+        # outside the stop-hook range.
         child.sendline('process continue')
-        child.expect_exact('// Another breakpoint which is outside of the stop-hook range.')
-        #self.DebugPExpect(child)
+        child.expect_exact(
+            '// Another breakpoint which is outside of the stop-hook range.')
+        # self.DebugPExpect(child)
         child.sendline('thread step-over')
-        child.expect_exact('// Another breakpoint which is outside of the stop-hook range.')
-        #self.DebugPExpect(child)
+        child.expect_exact(
+            '// Another breakpoint which is outside of the stop-hook range.')
+        # self.DebugPExpect(child)
         # Verify that the 'Stop Hooks' mechanism is NOT BEING fired off.
         self.expect(child.before, exe=False, matching=False,
-            substrs = ['(void *) $'])
+                    substrs=['(void *) $'])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
index 57395832dc2..3a18877ef2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
@@ -5,14 +5,15 @@ Test that lldb stop-hook works for multiple threads.
 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 configuration
 from lldbsuite.test import lldbutil
 
+
 class StopHookForMultipleThreadsTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -23,15 +24,22 @@ class StopHookForMultipleThreadsTestCase(TestBase):
         # Our simple source filename.
         self.source = 'main.cpp'
         # Find the line number to break inside main().
-        self.first_stop = line_number(self.source, '// Set break point at this line, and add a stop-hook.')
-        self.thread_function = line_number(self.source, '// Break here to test that the stop-hook mechanism works for multiple threads.')
-        # Build dictionary to have unique executable names for each test method.
+        self.first_stop = line_number(
+            self.source, '// Set break point at this line, and add a stop-hook.')
+        self.thread_function = line_number(
+            self.source,
+            '// Break here to test that the stop-hook mechanism works for multiple threads.')
+        # Build dictionary to have unique executable names for each test
+        # method.
         self.exe_name = self.testMethodName
         self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name}
 
     @expectedFlakeyFreeBSD("llvm.org/pr15037")
-    @expectedFlakeyLinux("llvm.org/pr15037") # stop hooks sometimes fail to fire on Linux
-    @expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+    # stop hooks sometimes fail to fire on Linux
+    @expectedFlakeyLinux("llvm.org/pr15037")
+    @expectedFailureAll(
+        hostoslist=["windows"],
+        bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
     def test_stop_hook_multiple_threads(self):
         """Test that lldb stop-hook works for multiple threads."""
         self.build(dictionary=self.d)
@@ -42,7 +50,8 @@ class StopHookForMultipleThreadsTestCase(TestBase):
         prompt = "(lldb) "
 
         # So that the child gets torn down after the test.
-        self.child = pexpect.spawn('%s %s' % (lldbtest_config.lldbExec, self.lldbOption))
+        self.child = pexpect.spawn('%s %s' %
+                                   (lldbtest_config.lldbExec, self.lldbOption))
         child = self.child
         # Turn on logging for what the child sends back.
         if self.TraceOn():
@@ -50,11 +59,17 @@ class StopHookForMultipleThreadsTestCase(TestBase):
 
         if lldb.remote_platform:
             child.expect_exact(prompt)
-            child.sendline('platform select %s' % lldb.remote_platform.GetName())
+            child.sendline(
+                'platform select %s' %
+                lldb.remote_platform.GetName())
             child.expect_exact(prompt)
-            child.sendline('platform connect %s' % configuration.lldb_platform_url)
+            child.sendline(
+                'platform connect %s' %
+                configuration.lldb_platform_url)
             child.expect_exact(prompt)
-            child.sendline('platform settings -w %s' % configuration.lldb_platform_working_dir)
+            child.sendline(
+                'platform settings -w %s' %
+                configuration.lldb_platform_working_dir)
 
         child.expect_exact(prompt)
         child.sendline('target create %s' % exe)
@@ -63,17 +78,23 @@ class StopHookForMultipleThreadsTestCase(TestBase):
         child.expect_exact(prompt)
         child.sendline('breakpoint set -f main.cpp -l %d' % self.first_stop)
         child.expect_exact(prompt)
-        child.sendline('breakpoint set -f main.cpp -l %d' % self.thread_function)
+        child.sendline(
+            'breakpoint set -f main.cpp -l %d' %
+            self.thread_function)
         child.expect_exact(prompt)
 
-        # Now run the program, expect to stop at the first breakpoint which is within the stop-hook range.
+        # Now run the program, expect to stop at the first breakpoint which is
+        # within the stop-hook range.
         child.sendline('run')
-        child.expect_exact("Process")   # 'Process 2415 launched', 'Process 2415 stopped'
+        # 'Process 2415 launched', 'Process 2415 stopped'
+        child.expect_exact("Process")
         child.expect_exact(prompt)
-        child.sendline('target stop-hook add -o "frame variable --show-globals g_val"')
-        child.expect_exact("Stop hook") # 'Stop hook #1 added.'
+        child.sendline(
+            'target stop-hook add -o "frame variable --show-globals g_val"')
+        child.expect_exact("Stop hook")  # 'Stop hook #1 added.'
         child.expect_exact(prompt)
 
-        # Continue and expect to find the output emitted by the firing of our stop hook.
+        # Continue and expect to find the output emitted by the firing of our
+        # stop hook.
         child.sendline('continue')
         child.expect_exact('(uint32_t) ::g_val = ')