Skip to content

Commit 9abe314

Browse files
fix incorrect enum value used in function call
1 parent b392009 commit 9abe314

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lldb/source/Core/Mangled.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ GetSwiftDemangledStr(ConstString m_mangled, const SymbolContext *sc,
157157
Log *log = GetLog(LLDBLog::Demangle);
158158
LLDB_LOGF(log, "demangle swift: %s", mangled_name);
159159
auto [demangled, info] = SwiftLanguageRuntime::TrackedDemangleSymbolAsString(
160-
mangled_name, SwiftLanguageRuntime::eSimplified, sc);
160+
mangled_name, SwiftLanguageRuntime::eTypeName, sc);
161161
info.PrefixRange.second =
162162
std::min(info.BasenameRange.first, info.ArgumentsRange.first);
163163
info.SuffixRange.first =

lldb/source/Plugins/Language/Swift/SwiftMangled.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,17 @@ class TrackingNodePrinter : public NodePrinter {
4444
}
4545

4646
void startParameters(unsigned depth) {
47-
if (parametersDepth || !info.hasBasename() || info.hasArguments()) {
47+
if (parametersDepth || !info.hasBasename() ||
48+
info.ArgumentsRange.first < info.ArgumentsRange.second) {
4849
return;
4950
}
5051
info.ArgumentsRange.first = getStreamLength();
5152
parametersDepth = depth;
5253
}
5354

5455
void endParameters(unsigned depth) {
55-
if (!parametersDepth || *parametersDepth != depth || info.hasArguments()) {
56+
if (!parametersDepth || *parametersDepth != depth ||
57+
info.ArgumentsRange.first < info.ArgumentsRange.second) {
5658
return;
5759
}
5860
info.ArgumentsRange.second = getStreamLength();

0 commit comments

Comments
 (0)