Skip to content

Commit 0e9262d

Browse files
refactor GetFunctionName
1 parent 30384c0 commit 0e9262d

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,14 +1768,12 @@ std::string SwiftLanguage::GetFunctionName(const SymbolContext &sc,
17681768
SwiftLanguageRuntime::eSimplified, &sc, exe_ctx);
17691769
if (name.empty())
17701770
return {};
1771-
const char *cstr = name.data();
1772-
const char *open_paren = strchr(cstr, '(');
1773-
const char *generic = strchr(cstr, '<');
1774-
if (open_paren && generic && generic < open_paren)
1775-
return std::string(cstr, generic);
1776-
if (open_paren)
1777-
return std::string(cstr, open_paren);
1778-
return name;
1771+
size_t open_paren = name.find('(');
1772+
size_t generic = name.find('<');
1773+
size_t name_end = std::min(open_paren, generic);
1774+
if (name_end == std::string::npos)
1775+
return name;
1776+
return name.substr(0, name_end);
17791777
}
17801778

17811779
std::string SwiftLanguage::GetFunctionDisplayArgs(

0 commit comments

Comments
 (0)