Skip to content

Commit 7fc812f

Browse files
committed
formatting
1 parent aafaaa4 commit 7fc812f

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
925925
std::vector<Address> addresses;
926926

927927
ConstString current_name =
928-
current_symbol->GetMangled().GetName(Mangled::ePreferMangled);
928+
current_symbol->GetMangled().GetName(Mangled::ePreferMangled);
929929
if (current_symbol->IsTrampoline()) {
930930

931931
if (current_name) {
@@ -946,8 +946,8 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
946946
}
947947

948948
SymbolContextList reexported_symbols;
949-
images.FindSymbolsWithNameAndType(
950-
current_name, eSymbolTypeReExported, reexported_symbols);
949+
images.FindSymbolsWithNameAndType(current_name, eSymbolTypeReExported,
950+
reexported_symbols);
951951
for (const SymbolContext &context : reexported_symbols) {
952952
if (context.symbol) {
953953
Symbol *actual_symbol =
@@ -1003,7 +1003,7 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
10031003
}
10041004
}
10051005
}
1006-
1006+
10071007
if (addresses.size() > 0) {
10081008
// First check whether any of the addresses point to Indirect symbols,
10091009
// and if they do, resolve them:
@@ -1031,15 +1031,15 @@ DynamicLoaderDarwin::GetStepThroughTrampolinePlan(Thread &thread,
10311031
}
10321032
// One more case we have to consider is "branch islands". These are regular
10331033
// TEXT symbols but their names end in .island. They are to allow arm64
1034-
// code to branch further than the size of the address slot allows. We
1034+
// code to branch further than the size of the address slot allows. We
10351035
// just need to single-instruction step in that case.
10361036
if (!thread_plan_sp && current_name.GetStringRef().ends_with(".island")) {
1037-
thread_plan_sp = std::make_shared<ThreadPlanStepInstruction>(thread,
1038-
/* step_over= */ false, /* stop_others */ false, eVoteNoOpinion,
1037+
thread_plan_sp = std::make_shared<ThreadPlanStepInstruction>(
1038+
thread,
1039+
/* step_over= */ false, /* stop_others */ false, eVoteNoOpinion,
10391040
eVoteNoOpinion);
1040-
LLDB_LOG(log,
1041-
"Stepping one instruction over branch island: '{0}'.",
1042-
current_name);
1041+
LLDB_LOG(log, "Stepping one instruction over branch island: '{0}'.",
1042+
current_name);
10431043
}
10441044
} else {
10451045
LLDB_LOGF(log, "Could not find symbol for step through.");

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from lldbsuite.test.lldbtest import *
99
from lldbsuite.test.decorators import *
1010

11+
1112
class TestBranchIslandStepping(TestBase):
1213
NO_DEBUG_INFO_TESTCASE = True
1314

@@ -26,7 +27,7 @@ def do_test(self):
2627
# Make sure that we did manage to generate a branch island for foo:
2728
syms = target.FindSymbols("foo.island", lldb.eSymbolTypeCode)
2829
self.assertEqual(len(syms), 1, "We did generate an island for foo")
29-
30+
3031
thread.StepInto()
3132
stop_frame = thread.frames[0]
3233
self.assertIn("foo", stop_frame.name, "Stepped into foo")
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include <stdio.h>
22

3-
void
4-
foo()
5-
{
3+
void foo() {
64
int a_variable_in_foo = 10;
75
printf("I am foo: %d.\n", a_variable_in_foo);
86
}

0 commit comments

Comments
 (0)