address comment

Author: charles-zablit

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

@@ -27,7 +27,7 @@ class TrackingNodePrinter : public NodePrinter {
 public:
   TrackingNodePrinter(DemangleOptions options) : NodePrinter(options) {}
 
-  lldb_private::DemangledNameInfo takeInfo() { return std::move(info); }
+  lldb_private::DemangledNameInfo getInfo() { return info; }
 
 private:
   lldb_private::DemangledNameInfo info;
@@ -59,6 +59,7 @@ class TrackingNodePrinter : public NodePrinter {
   }
 
   bool shouldTrackNameRange(NodePointer Node) const {
+    assert(Node);
     switch (Node->getKind()) {
     case Node::Kind::Function:
     case Node::Kind::Constructor:

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

@@ -878,10 +878,10 @@ SwiftLanguageRuntime::DemangleSymbolAsString(llvm::StringRef symbol,
     };
   }
   if (tracking) {
-    TrackingNodePrinter printer = TrackingNodePrinter(options);
+    TrackingNodePrinter printer{options};
     swift::Demangle::demangleSymbolAsString(symbol, printer);
     return std::pair<std::string, std::optional<DemangledNameInfo>>(
-        printer.takeString(), printer.takeInfo());
+        printer.takeString(), printer.getInfo());
   }
   return std::pair<std::string, std::optional<DemangledNameInfo>>(
       swift::Demangle::demangleSymbolAsString(symbol, options), std::nullopt);
@@ -897,9 +897,9 @@ std::pair<std::string, DemangledNameInfo>
 SwiftLanguageRuntime::TrackedDemangleSymbolAsString(
     llvm::StringRef symbol, DemangleMode mode, const SymbolContext *sc,
     const ExecutionContext *exe_ctx) {
-  auto demangledData = DemangleSymbolAsString(symbol, mode, true, sc, exe_ctx);
-  return std::pair<std::string, DemangledNameInfo>(demangledData.first,
-                                                   *demangledData.second);
+  auto [name, info] = DemangleSymbolAsString(symbol, mode, true, sc, exe_ctx);
+  return std::pair<std::string, DemangledNameInfo>(std::move(name),
+                                                   std::move(*info));
 }
 
 swift::Demangle::NodePointer

lldb/unittests/Core/SwiftDemanglingPartsTest.cpp

@@ -1236,7 +1236,7 @@ TEST_P(SwiftDemanglingPartsTestFixture, SwiftDemanglingParts) {
       TrackingNodePrinter(swift::Demangle::DemangleOptions());
   swift::Demangle::demangleSymbolAsString(std::string(mangled), printer);
   std::string demangled = printer.takeString();
-  DemangledNameInfo nameInfo = printer.takeInfo();
+  DemangledNameInfo nameInfo = printer.getInfo();
   nameInfo.PrefixRange.second =
       std::min(info.BasenameRange.first, info.ArgumentsRange.first);
   nameInfo.SuffixRange.first =