Skip to content

Commit f31ba45

Browse files
authored
Merge pull request llvm#11177 from augusto2112/fix-log-lldb
[lldb] Fix wrong log format string in SwiftLanguageRuntime
2 parents 6801c93 + 513108d commit f31ba45

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,7 @@ void SwiftLanguageRuntime::WillStartExecutingUserExpression(
17561756
Log *log(GetLog(LLDBLog::Expressions));
17571757
LLDB_LOG(log,
17581758
"SwiftLanguageRuntime: starting user expression. "
1759-
"Number active: %u",
1759+
"Number active: {0}",
17601760
m_active_user_expr_count + 1);
17611761
if (m_active_user_expr_count++ > 0)
17621762
return;
@@ -1798,7 +1798,7 @@ void SwiftLanguageRuntime::WillStartExecutingUserExpression(
17981798
if (error.Fail()) {
17991799
LLDB_LOG(log,
18001800
"SwiftLanguageRuntime: Unable to read disableExclusivityChecking "
1801-
"flag state: %s",
1801+
"flag state: {0}",
18021802
error.AsCString());
18031803
return;
18041804
}
@@ -1809,14 +1809,14 @@ void SwiftLanguageRuntime::WillStartExecutingUserExpression(
18091809
if (error.Fail()) {
18101810
LLDB_LOG(log,
18111811
"SwiftLanguageRuntime: Unable to set disableExclusivityChecking "
1812-
"flag state: %s",
1812+
"flag state: {0}",
18131813
error.AsCString());
18141814
return;
18151815
}
18161816

18171817
LLDB_LOG(log,
18181818
"SwiftLanguageRuntime: Changed disableExclusivityChecking flag "
1819-
"state from %u to 1",
1819+
"state from {0} to 1",
18201820
m_original_dynamic_exclusivity_flag_state);
18211821
}
18221822

@@ -1831,7 +1831,7 @@ void SwiftLanguageRuntime::DidFinishExecutingUserExpression(
18311831
--m_active_user_expr_count;
18321832
LLDB_LOG(log,
18331833
"SwiftLanguageRuntime: finished user expression. "
1834-
"Number active: %u",
1834+
"Number active: {0}",
18351835
m_active_user_expr_count);
18361836

18371837
if (m_active_user_expr_count > 0)
@@ -1871,14 +1871,14 @@ void SwiftLanguageRuntime::DidFinishExecutingUserExpression(
18711871
if (error.Fail()) {
18721872
LLDB_LOG(log,
18731873
"SwiftLanguageRuntime: Unable to reset "
1874-
"disableExclusivityChecking flag state: %s",
1874+
"disableExclusivityChecking flag state: {0}",
18751875
error.AsCString());
18761876
return;
18771877
}
18781878
if (log)
18791879
LLDB_LOG(log,
18801880
"SwiftLanguageRuntime: Changed "
1881-
"disableExclusivityChecking flag state back to %u",
1881+
"disableExclusivityChecking flag state back to {0}",
18821882
m_original_dynamic_exclusivity_flag_state);
18831883
}
18841884

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3368,7 +3368,7 @@ SwiftLanguageRuntime::GetTypeRef(CompilerType type,
33683368
type_ref_or_err->dump(ss);
33693369
LLDB_LOG(log,
33703370
"[SwiftLanguageRuntime::GetTypeRef] Found typeref for "
3371-
"type: {0}:\n{0}",
3371+
"type: {0}:\n{1}",
33723372
type.GetMangledTypeName(), ss.str());
33733373
}
33743374
return type_ref_or_err;

0 commit comments

Comments
 (0)