fixup! use unique_ptr instead of PointerStorage

Author: charles-zablit

lib/Demangling/Context.cpp

@@ -55,9 +55,10 @@ NodePointer Context::demangleTypeAsNode(llvm::StringRef MangledName) {
 
 #if SWIFT_STDLIB_HAS_TYPE_PRINTING
 
-std::string Context::demangleSymbolAsString(llvm::StringRef MangledName,
-                                            const DemangleOptions &Options,
-                                            std::unique_ptr<DemanglerPrinter> printer) {
+std::string
+Context::demangleSymbolAsString(llvm::StringRef MangledName,
+                                const DemangleOptions &Options,
+                                std::unique_ptr<DemanglerPrinter> printer) {
   NodePointer root = demangleSymbolAsNode(MangledName);
   if (!root) return MangledName.str();
 

lib/Demangling/NodePrinter.cpp

@@ -168,8 +168,8 @@ static StringRef toString(ValueWitnessKind k) {
 }
 
 template <typename T>
-auto operator<<(const std::unique_ptr<DemanglerPrinter> &printer,
-                const T &n) -> decltype((*printer) << n) {
+auto operator<<(const std::unique_ptr<DemanglerPrinter> &printer, const T &n)
+    -> decltype((*printer) << n) {
   return (*printer) << n;
 }
 
@@ -181,8 +181,10 @@ class NodePrinter {
   bool isValid = true;
 
 public:
-  NodePrinter(DemangleOptions options, std::unique_ptr<DemanglerPrinter> printer = nullptr)
-      : Printer(printer ? std::move(printer) : std::make_unique<DemanglerPrinter>()),
+  NodePrinter(DemangleOptions options,
+              std::unique_ptr<DemanglerPrinter> printer = nullptr)
+      : Printer(printer ? std::move(printer)
+                        : std::make_unique<DemanglerPrinter>()),
         Options(options) {}
 
   std::string printRoot(NodePointer root) {

tools/swift-demangle/swift-demangle.cpp

@@ -290,7 +290,8 @@ static void demangle(llvm::raw_ostream &os, llvm::StringRef name,
         os << printer->getNameStart() << "," << printer->getNameEnd();
       os << ") - (";
       if (printer->hasParameters())
-        os << printer->getParametersStart() << "," << printer->getParametersEnd();
+        os << printer->getParametersStart() << ","
+           << printer->getParametersEnd();
       os << ")}";
     }
   }