Skip to content

Commit a1e9fcb

Browse files
committed
[rebranch][lldb] Fix compile errors in SwiftLanguage function
1457b7d implemented `GetDemangledFunctionNameWithoutArguments` for `SwiftLanguage`, but it contained a few errors.
1 parent 78caaa5 commit a1e9fcb

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,22 +1485,23 @@ void SwiftLanguage::GetExceptionResolverDescription(bool catch_on,
14851485
}
14861486

14871487
ConstString SwiftLanguage::GetDemangledFunctionNameWithoutArguments(Mangled mangled) const {
1488-
const char *mangled_name_cstr = mangled.GetMangledName().GetCString();
1488+
ConstString mangled_name = mangled.GetMangledName();
14891489
ConstString demangled_name = mangled.GetDemangledName();
1490-
if (demangled_name && mangled_name_cstr && mangled_name_cstr[0]) {
1491-
if (SwiftLanguageRuntime::IsSwiftMangledName(demangled.GetStringRef())) {
1490+
if (demangled_name && mangled_name) {
1491+
if (SwiftLanguageRuntime::IsSwiftMangledName(
1492+
demangled_name.GetStringRef())) {
14921493
lldb_private::ConstString basename;
14931494
bool is_method = false;
14941495
if (SwiftLanguageRuntime::MethodName::ExtractFunctionBasenameFromMangled(
1495-
mangled, basename, is_method)) {
1496-
if (basename && basename != mangled)
1496+
mangled_name, basename, is_method)) {
1497+
if (basename && basename != mangled_name)
14971498
return basename;
14981499
}
14991500
}
15001501
}
15011502
if (demangled_name)
15021503
return demangled_name;
1503-
return mangled.GetMangledName();
1504+
return mangled_name;
15041505
}
15051506

15061507
//------------------------------------------------------------------

0 commit comments

Comments
 (0)