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

1 files changed, 55 insertions, 36 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
index c2aa597214e..adec9fa5ddd 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
@@ -5,60 +5,64 @@ Test lldb breakpoint ids.
 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 TestCPPBreakpointLocations(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
-    def test (self):
-        self.build ()
-        self.breakpoint_id_tests ()
+    def test(self):
+        self.build()
+        self.breakpoint_id_tests()
 
     def verify_breakpoint_locations(self, target, bp_dict):
-        
+
         name = bp_dict['name']
         names = bp_dict['loc_names']
-        bp = target.BreakpointCreateByName (name)
-        self.assertEquals(bp.GetNumLocations(), len(names), "Make sure we find the right number of breakpoint locations")
-        
+        bp = target.BreakpointCreateByName(name)
+        self.assertEquals(
+            bp.GetNumLocations(),
+            len(names),
+            "Make sure we find the right number of breakpoint locations")
+
         bp_loc_names = list()
         for bp_loc in bp:
             bp_loc_names.append(bp_loc.GetAddress().GetFunction().GetName())
-            
+
         for name in names:
             found = name in bp_loc_names
             if not found:
                 print("Didn't find '%s' in: %s" % (name, bp_loc_names))
-            self.assertTrue (found, "Make sure we find all required locations")
-        
-    def breakpoint_id_tests (self):
-        
+            self.assertTrue(found, "Make sure we find all required locations")
+
+    def breakpoint_id_tests(self):
+
         # Create a target by the debugger.
         exe = os.path.join(os.getcwd(), "a.out")
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
         bp_dicts = [
-            { 'name' : 'func1', 'loc_names' : [ 'a::c::func1()', 'b::c::func1()'] },
-            { 'name' : 'func2', 'loc_names' : [ 'a::c::func2()', 'c::d::func2()'] },
-            { 'name' : 'func3', 'loc_names' : [ 'a::c::func3()', 'b::c::func3()', 'c::d::func3()'] },
-            { 'name' : 'c::func1', 'loc_names' : [ 'a::c::func1()', 'b::c::func1()'] },
-            { 'name' : 'c::func2', 'loc_names' : [ 'a::c::func2()'] },
-            { 'name' : 'c::func3', 'loc_names' : [ 'a::c::func3()', 'b::c::func3()'] },
-            { 'name' : 'a::c::func1', 'loc_names' : [ 'a::c::func1()'] },
-            { 'name' : 'b::c::func1', 'loc_names' : [ 'b::c::func1()'] },
-            { 'name' : 'c::d::func2', 'loc_names' : [ 'c::d::func2()'] },
-            { 'name' : 'a::c::func1()', 'loc_names' : [ 'a::c::func1()'] },
-            { 'name' : 'b::c::func1()', 'loc_names' : [ 'b::c::func1()'] },
-            { 'name' : 'c::d::func2()', 'loc_names' : [ 'c::d::func2()'] },
+            {'name': 'func1', 'loc_names': ['a::c::func1()', 'b::c::func1()']},
+            {'name': 'func2', 'loc_names': ['a::c::func2()', 'c::d::func2()']},
+            {'name': 'func3', 'loc_names': ['a::c::func3()', 'b::c::func3()', 'c::d::func3()']},
+            {'name': 'c::func1', 'loc_names': ['a::c::func1()', 'b::c::func1()']},
+            {'name': 'c::func2', 'loc_names': ['a::c::func2()']},
+            {'name': 'c::func3', 'loc_names': ['a::c::func3()', 'b::c::func3()']},
+            {'name': 'a::c::func1', 'loc_names': ['a::c::func1()']},
+            {'name': 'b::c::func1', 'loc_names': ['b::c::func1()']},
+            {'name': 'c::d::func2', 'loc_names': ['c::d::func2()']},
+            {'name': 'a::c::func1()', 'loc_names': ['a::c::func1()']},
+            {'name': 'b::c::func1()', 'loc_names': ['b::c::func1()']},
+            {'name': 'c::d::func2()', 'loc_names': ['c::d::func2()']},
         ]
-        
+
         for bp_dict in bp_dicts:
             self.verify_breakpoint_locations(target, bp_dict)
 
@@ -68,28 +72,43 @@ class TestCPPBreakpointLocations(TestBase):
         exe = os.path.join(os.getcwd(), "a.out")
         target = self.dbg.CreateTarget(exe)
 
-        # Don't skip prologue, so we can check the breakpoint address more easily
+        # Don't skip prologue, so we can check the breakpoint address more
+        # easily
         self.runCmd("settings set target.skip-prologue false")
         try:
             names = ['~c', 'c::~c', 'c::~c()']
             loc_names = {'a::c::~c()', 'b::c::~c()'}
-            # TODO: For windows targets we should put windows mangled names here
-            symbols = ['_ZN1a1cD1Ev', '_ZN1a1cD2Ev', '_ZN1b1cD1Ev', '_ZN1b1cD2Ev']
+            # TODO: For windows targets we should put windows mangled names
+            # here
+            symbols = [
+                '_ZN1a1cD1Ev',
+                '_ZN1a1cD2Ev',
+                '_ZN1b1cD1Ev',
+                '_ZN1b1cD2Ev']
 
             for name in names:
                 bp = target.BreakpointCreateByName(name)
 
-                bp_loc_names = { bp_loc.GetAddress().GetFunction().GetName() for bp_loc in bp }
-                self.assertEquals(bp_loc_names, loc_names, "Breakpoint set on the correct symbol")
+                bp_loc_names = {bp_loc.GetAddress().GetFunction().GetName()
+                                for bp_loc in bp}
+                self.assertEquals(
+                    bp_loc_names,
+                    loc_names,
+                    "Breakpoint set on the correct symbol")
 
-                bp_addresses = { bp_loc.GetLoadAddress() for bp_loc in bp }
+                bp_addresses = {bp_loc.GetLoadAddress() for bp_loc in bp}
                 symbol_addresses = set()
                 for symbol in symbols:
                     sc_list = target.FindSymbols(symbol, lldb.eSymbolTypeCode)
-                    self.assertEquals(sc_list.GetSize(), 1, "Found symbol " + symbol)
+                    self.assertEquals(
+                        sc_list.GetSize(), 1, "Found symbol " + symbol)
                     symbol = sc_list.GetContextAtIndex(0).GetSymbol()
-                    symbol_addresses.add(symbol.GetStartAddress().GetLoadAddress(target))
+                    symbol_addresses.add(
+                        symbol.GetStartAddress().GetLoadAddress(target))
 
-                self.assertEquals(symbol_addresses, bp_addresses, "Breakpoint set on correct address")
+                self.assertEquals(
+                    symbol_addresses,
+                    bp_addresses,
+                    "Breakpoint set on correct address")
         finally:
             self.runCmd("settings clear target.skip-prologue")