*** 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, 110 insertions, 56 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
index 6416bccc483..29e75f86308 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
@@ -5,25 +5,28 @@ Test that ASan memory history provider returns correct stack traces
 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 lldbplatform
 from lldbsuite.test import lldbutil
 
+
 class AsanTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @expectedFailureAll(oslist=["linux"], bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
-    @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
+    @expectedFailureAll(
+        oslist=["linux"],
+        bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
+    @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
     @skipUnlessCompilerRt
-    def test (self):
-        self.build ()
-        self.asan_tests ()
+    def test(self):
+        self.build()
+        self.asan_tests()
 
     def setUp(self):
         # Call super's setUp().
@@ -33,68 +36,99 @@ class AsanTestCase(TestBase):
         self.line_free = line_number('main.c', '// free line')
         self.line_breakpoint = line_number('main.c', '// break line')
 
-    def asan_tests (self):
-        exe = os.path.join (os.getcwd(), "a.out")
-        self.expect("file " + exe, patterns = [ "Current executable set to .*a.out" ])
+    def asan_tests(self):
+        exe = os.path.join(os.getcwd(), "a.out")
+        self.expect(
+            "file " + exe,
+            patterns=["Current executable set to .*a.out"])
 
         self.runCmd("breakpoint set -f main.c -l %d" % self.line_breakpoint)
 
         # "memory history" command should not work without a process
         self.expect("memory history 0",
-            error = True,
-            substrs = ["invalid process"])
+                    error=True,
+                    substrs=["invalid process"])
 
         self.runCmd("run")
 
         stop_reason = self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason()
         if stop_reason == lldb.eStopReasonExec:
-            # On OS X 10.10 and older, we need to re-exec to enable interceptors.
+            # On OS X 10.10 and older, we need to re-exec to enable
+            # interceptors.
             self.runCmd("continue")
 
         # 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'])
 
         # test that the ASan dylib is present
-        self.expect("image lookup -n __asan_describe_address", "__asan_describe_address should be present",
-            substrs = ['1 match found'])
+        self.expect(
+            "image lookup -n __asan_describe_address",
+            "__asan_describe_address should be present",
+            substrs=['1 match found'])
 
         # test the 'memory history' command
-        self.expect("memory history 'pointer'",
-            substrs = [
-                'Memory allocated by Thread', 'a.out`f1', 'main.c:%d' % self.line_malloc,
-                'Memory deallocated by Thread', 'a.out`f2', 'main.c:%d' % self.line_free])
+        self.expect(
+            "memory history 'pointer'",
+            substrs=[
+                'Memory allocated by Thread',
+                'a.out`f1',
+                'main.c:%d' %
+                self.line_malloc,
+                'Memory deallocated by Thread',
+                'a.out`f2',
+                'main.c:%d' %
+                self.line_free])
 
         # do the same using SB API
         process = self.dbg.GetSelectedTarget().process
         val = process.GetSelectedThread().GetSelectedFrame().EvaluateExpression("pointer")
         addr = val.GetValueAsUnsigned()
-        threads = process.GetHistoryThreads(addr);
+        threads = process.GetHistoryThreads(addr)
         self.assertEqual(threads.GetSize(), 2)
-        
+
         history_thread = threads.GetThreadAtIndex(0)
         self.assertTrue(history_thread.num_frames >= 2)
-        self.assertEqual(history_thread.frames[1].GetLineEntry().GetFileSpec().GetFilename(), "main.c")
-        self.assertEqual(history_thread.frames[1].GetLineEntry().GetLine(), self.line_free)
-        
+        self.assertEqual(history_thread.frames[1].GetLineEntry(
+        ).GetFileSpec().GetFilename(), "main.c")
+        self.assertEqual(
+            history_thread.frames[1].GetLineEntry().GetLine(),
+            self.line_free)
+
         history_thread = threads.GetThreadAtIndex(1)
         self.assertTrue(history_thread.num_frames >= 2)
-        self.assertEqual(history_thread.frames[1].GetLineEntry().GetFileSpec().GetFilename(), "main.c")
-        self.assertEqual(history_thread.frames[1].GetLineEntry().GetLine(), self.line_malloc)
-
-        # let's free the container (SBThreadCollection) and see if the SBThreads still live
+        self.assertEqual(history_thread.frames[1].GetLineEntry(
+        ).GetFileSpec().GetFilename(), "main.c")
+        self.assertEqual(
+            history_thread.frames[1].GetLineEntry().GetLine(),
+            self.line_malloc)
+
+        # let's free the container (SBThreadCollection) and see if the
+        # SBThreads still live
         threads = None
         self.assertTrue(history_thread.num_frames >= 2)
-        self.assertEqual(history_thread.frames[1].GetLineEntry().GetFileSpec().GetFilename(), "main.c")
-        self.assertEqual(history_thread.frames[1].GetLineEntry().GetLine(), self.line_malloc)
-        
+        self.assertEqual(history_thread.frames[1].GetLineEntry(
+        ).GetFileSpec().GetFilename(), "main.c")
+        self.assertEqual(
+            history_thread.frames[1].GetLineEntry().GetLine(),
+            self.line_malloc)
+
         # ASan will break when a report occurs and we'll try the API then
         self.runCmd("continue")
 
-        self.expect("thread list", "Process should be stopped due to ASan report",
-            substrs = ['stopped', 'stop reason = Use of deallocated memory detected'])
-
-        # make sure the 'memory history' command still works even when we're generating a report now
-        self.expect("memory history 'another_pointer'",
-            substrs = [
-                'Memory allocated by Thread', 'a.out`f1', 'main.c:%d' % self.line_malloc2])
+        self.expect(
+            "thread list",
+            "Process should be stopped due to ASan report",
+            substrs=[
+                'stopped',
+                'stop reason = Use of deallocated memory detected'])
+
+        # make sure the 'memory history' command still works even when we're
+        # generating a report now
+        self.expect(
+            "memory history 'another_pointer'",
+            substrs=[
+                'Memory allocated by Thread',
+                'a.out`f1',
+                'main.c:%d' %
+                self.line_malloc2])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
index b02732ddedd..b89572dc4ef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
@@ -5,25 +5,28 @@ Test the AddressSanitizer runtime support for report breakpoint and data extract
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import json
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class AsanTestReportDataCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @expectedFailureAll(oslist=["linux"], bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
-    @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
+    @expectedFailureAll(
+        oslist=["linux"],
+        bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
+    @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
     @skipUnlessCompilerRt
     def test(self):
-        self.build ()
-        self.asan_tests ()
+        self.build()
+        self.asan_tests()
 
     def setUp(self):
         # Call super's setUp().
@@ -34,26 +37,43 @@ class AsanTestReportDataCase(TestBase):
         self.line_breakpoint = line_number('main.c', '// break line')
         self.line_crash = line_number('main.c', '// BOOM line')
 
-    def asan_tests (self):
-        exe = os.path.join (os.getcwd(), "a.out")
-        self.expect("file " + exe, patterns = [ "Current executable set to .*a.out" ])
+    def asan_tests(self):
+        exe = os.path.join(os.getcwd(), "a.out")
+        self.expect(
+            "file " + exe,
+            patterns=["Current executable set to .*a.out"])
         self.runCmd("run")
 
         stop_reason = self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason()
         if stop_reason == lldb.eStopReasonExec:
-            # On OS X 10.10 and older, we need to re-exec to enable interceptors.
+            # On OS X 10.10 and older, we need to re-exec to enable
+            # interceptors.
             self.runCmd("continue")
 
-        self.expect("thread list", "Process should be stopped due to ASan report",
-            substrs = ['stopped', 'stop reason = Use of deallocated memory detected'])
+        self.expect(
+            "thread list",
+            "Process should be stopped due to ASan report",
+            substrs=[
+                'stopped',
+                'stop reason = Use of deallocated memory detected'])
 
-        self.assertEqual(self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason(), lldb.eStopReasonInstrumentation)
+        self.assertEqual(
+            self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason(),
+            lldb.eStopReasonInstrumentation)
 
         self.expect("bt", "The backtrace should show the crashing line",
-            substrs = ['main.c:%d' % self.line_crash])
-
-        self.expect("thread info -s", "The extended stop info should contain the ASan provided fields",
-            substrs = ["access_size", "access_type", "address", "pc", "description", "heap-use-after-free"])
+                    substrs=['main.c:%d' % self.line_crash])
+
+        self.expect(
+            "thread info -s",
+            "The extended stop info should contain the ASan provided fields",
+            substrs=[
+                "access_size",
+                "access_type",
+                "address",
+                "pc",
+                "description",
+                "heap-use-after-free"])
 
         output_lines = self.res.GetOutput().split('\n')
         json_line = '\n'.join(output_lines[2:])