Skip to content

Commit aa95464

Browse files
sync with new API
1 parent 7d3bad1 commit aa95464

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
@@ -773,10 +773,9 @@ SwiftLanguageRuntime::DemangleSymbolAsString(llvm::StringRef symbol,
773773
}
774774
if (tracking) {
775775
TrackingNodePrinter printer = TrackingNodePrinter(options);
776-
std::string demangled =
777-
swift::Demangle::demangleSymbolAsString(symbol, options, &printer);
776+
swift::Demangle::demangleSymbolAsString(symbol, &printer);
778777
return std::pair<std::string, std::optional<DemangledNameInfo>>(
779-
demangled, printer.takeInfo());
778+
printer.takeString(), printer.takeInfo());
780779
}
781780
return std::pair<std::string, std::optional<DemangledNameInfo>>(
782781
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)