*** 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

2 files changed, 46 insertions, 20 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
index 483697789c3..d0f41393075 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
+++ b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
@@ -6,13 +6,13 @@ Test lldb ability to unwind a stack with a function containing a call to the
 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 BuiltinTrapTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -23,8 +23,14 @@ class BuiltinTrapTestCase(TestBase):
         # Find the line number to break at.
         self.line = line_number('main.cpp', '// Set break point at this line.')
 
-    @expectedFailureAll("llvm.org/pr15936", compiler="gcc", compiler_version=["<=","4.6"])
-    @expectedFailureAll(archs="arm", compiler="gcc", triple=".*-android") # gcc generates incorrect linetable
+    @expectedFailureAll(
+        "llvm.org/pr15936",
+        compiler="gcc",
+        compiler_version=[
+            "<=",
+            "4.6"])
+    # gcc generates incorrect linetable
+    @expectedFailureAll(archs="arm", compiler="gcc", triple=".*-android")
     @expectedFailureAll(oslist=['linux'], archs=['arm'])
     @skipIfWindows
     def test_with_run_command(self):
@@ -32,22 +38,22 @@ class BuiltinTrapTestCase(TestBase):
         self.build()
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
-        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("run", RUN_SUCCEEDED)
 
         # The stop reason of the thread should be breakpoint.
         self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-            substrs = ['stopped',
-                       'stop reason = breakpoint'])
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
 
         # print backtrace, expect both 'bar' and 'main' functions to be listed
-        self.expect('bt', substrs = ['bar', 'main'])
+        self.expect('bt', substrs=['bar', 'main'])
 
         # go up one frame
         self.runCmd("up", RUN_SUCCEEDED)
 
         # evaluate a local
-        self.expect('p foo', substrs = ['= 5'])
+        self.expect('p foo', substrs=['= 5'])
diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 8421a8d473e..82ed362ff60 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
@@ -6,13 +6,13 @@ over a thread creation instruction.
 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 CreateDuringInstructionStepTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -23,7 +23,10 @@ class CreateDuringInstructionStepTestCase(TestBase):
 
     @skipUnlessPlatform(['linux'])
     @expectedFailureAndroid('llvm.org/pr24737', archs=['arm'])
-    @expectedFailureAll(oslist=["linux"], archs=["arm"], bugnumber="llvm.org/pr24737")
+    @expectedFailureAll(
+        oslist=["linux"],
+        archs=["arm"],
+        bugnumber="llvm.org/pr24737")
     def test_step_inst(self):
         self.build(dictionary=self.getBuildFlags())
         exe = os.path.join(os.getcwd(), "a.out")
@@ -32,36 +35,53 @@ class CreateDuringInstructionStepTestCase(TestBase):
 
         # This should create a breakpoint in the stepping thread.
         breakpoint = target.BreakpointCreateByName("main")
-        self.assertTrue(breakpoint and breakpoint.IsValid(), "Breakpoint is valid")
+        self.assertTrue(
+            breakpoint and breakpoint.IsValid(),
+            "Breakpoint is valid")
 
         # Run the program.
-        process = target.LaunchSimple(None, None, self.get_process_working_directory())
+        process = target.LaunchSimple(
+            None, None, self.get_process_working_directory())
         self.assertTrue(process and process.IsValid(), PROCESS_IS_VALID)
 
         # The stop reason of the thread should be breakpoint.
-        self.assertEqual(process.GetState(), lldb.eStateStopped, PROCESS_STOPPED)
+        self.assertEqual(
+            process.GetState(),
+            lldb.eStateStopped,
+            PROCESS_STOPPED)
 
-        threads = lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint)
+        threads = lldbutil.get_threads_stopped_at_breakpoint(
+            process, breakpoint)
         self.assertEqual(len(threads), 1, STOPPED_DUE_TO_BREAKPOINT)
 
         thread = threads[0]
         self.assertTrue(thread and thread.IsValid(), "Thread is valid")
 
         # Make sure we see only one threads
-        self.assertEqual(process.GetNumThreads(), 1, 'Number of expected threads and actual threads do not match.')
+        self.assertEqual(
+            process.GetNumThreads(),
+            1,
+            'Number of expected threads and actual threads do not match.')
 
         # Keep stepping until we see the thread creation
         while process.GetNumThreads() < 2:
             thread.StepInstruction(False)
-            self.assertEqual(process.GetState(), lldb.eStateStopped, PROCESS_STOPPED)
-            self.assertEqual(thread.GetStopReason(), lldb.eStopReasonPlanComplete, "Step operation succeeded")
+            self.assertEqual(
+                process.GetState(),
+                lldb.eStateStopped,
+                PROCESS_STOPPED)
+            self.assertEqual(
+                thread.GetStopReason(),
+                lldb.eStopReasonPlanComplete,
+                "Step operation succeeded")
             if self.TraceOn():
                 self.runCmd("disassemble --pc")
 
         if self.TraceOn():
             self.runCmd("thread list")
 
-        # We have successfully caught thread creation. Now just run to completion
+        # We have successfully caught thread creation. Now just run to
+        # completion
         process.Continue()
 
         # At this point, the inferior process should have exited.