Fix the test so that the linker can't overlap the padding and branch island symbols.

Author: jimingham

lldb/test/API/macosx/branch-islands/TestBranchIslands.py

@@ -28,38 +28,8 @@ def do_test(self):
         syms = target.FindSymbols("foo.island", lldb.eSymbolTypeCode)
         self.assertEqual(len(syms), 1, "We did generate an island for foo")
 
-        # Gathering some info to dump in case of failure:
-        trace_before = lldbutil.print_stacktrace(thread, True)
-        func_before = thread.frames[0].function
-
         thread.StepInto()
         stop_frame = thread.frames[0]
-        # This is failing on the bot, but I can't reproduce the failure
-        # locally.  Let's see if we can dump some more info here to help
-        # figure out what went wrong...
-        if stop_frame.name.find("foo") == -1:
-            stream = lldb.SBStream()
-            print("Branch island symbols: ")
-            syms[0].GetDescription(stream)
-            for i in range(0, 6):
-                for sep in ["", "."]:
-                    syms = target.FindSymbols(
-                        f"foo.island{sep}{i}", lldb.eSymbolTypeCode
-                    )
-                    if len(syms) > 0:
-                        stream.Print("\n")
-                        syms[0].GetDescription(stream)
-
-            print(stream.GetData())
-            print(f"Start backtrace:")
-            print(trace_before)
-            print(f"\n'main' disassembly:\n{lldbutil.disassemble(target, func_before)}")
-            print("\nEnd backtrace:\n")
-            lldbutil.print_stacktrace(thread)
-            print(
-                f"\nStop disassembly:\n {lldbutil.disassemble(target, stop_frame.function)}"
-            )
-
         self.assertIn("foo", stop_frame.name, "Stepped into foo")
         var = stop_frame.FindVariable("a_variable_in_foo")
         self.assertTrue(var.IsValid(), "Found the variable in foo")

lldb/test/API/macosx/branch-islands/padding1.s

@@ -1,3 +1,5 @@
 .text
 _padding1:
+.p2align 2
+.byte 0x10        
 .space 120*1024*1024

lldb/test/API/macosx/branch-islands/padding2.s

@@ -1,3 +1,5 @@
 .text
 _padding2:
+.p2align 2
+.byte 0x10
 .space 120*1024*1024

lldb/test/API/macosx/branch-islands/padding3.s

@@ -1,3 +1,5 @@
 .text
 _padding3:
+.p2align 2
+.byte 0x10
 .space 120*1024*1024

lldb/test/API/macosx/branch-islands/padding4.s

@@ -1,3 +1,5 @@
 .text
 _padding4:
+.p2align 2
+.byte 0x10        
 .space 120*1024*1024