Skip to content

Commit 554852f

Browse files
sync with new API
1 parent 1a1468e commit 554852f

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -876,10 +876,9 @@ SwiftLanguageRuntime::DemangleSymbolAsString(llvm::StringRef symbol,
876876
}
877877
if (tracking) {
878878
TrackingNodePrinter printer = TrackingNodePrinter(options);
879-
std::string demangled =
880-
swift::Demangle::demangleSymbolAsString(symbol, options, &printer);
879+
swift::Demangle::demangleSymbolAsString(symbol, &printer);
881880
return std::pair<std::string, std::optional<DemangledNameInfo>>(
882-
demangled, printer.takeInfo());
881+
printer.takeString(), printer.takeInfo());
883882
}
884883
return std::pair<std::string, std::optional<DemangledNameInfo>>(
885884
swift::Demangle::demangleSymbolAsString(symbol, options), std::nullopt);

lldb/unittests/Core/SwiftDemanglingPartsTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,8 +1234,8 @@ TEST_P(SwiftDemanglingPartsTestFixture, SwiftDemanglingParts) {
12341234

12351235
TrackingNodePrinter printer =
12361236
TrackingNodePrinter(swift::Demangle::DemangleOptions());
1237-
std::string demangled = swift::Demangle::demangleSymbolAsString(
1238-
std::string(mangled), swift::Demangle::DemangleOptions(), &printer);
1237+
swift::Demangle::demangleSymbolAsString(std::string(mangled), &printer);
1238+
std::string demangled = printer.takeString();
12391239
DemangledNameInfo nameInfo = printer.takeInfo();
12401240
nameInfo.PrefixRange.second =
12411241
std::min(info.BasenameRange.first, info.ArgumentsRange.first);

0 commit comments

Comments
 (0)