Skip to content

Commit e1a1609

Browse files
remove unused API
1 parent 80fe2dc commit e1a1609

File tree

3 files changed

+12
-31
lines changed

3 files changed

+12
-31
lines changed

include/swift/Demangling/Demangle.h

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,11 @@ class Context {
483483
///
484484
/// \param MangledName The mangled symbol string, which start a mangling
485485
/// prefix: _T, _T0, $S, _$S.
486-
/// \param printer The NodePrinter that will be used to demangle the symbol.
486+
/// \param Printer The NodePrinter that will be used to demangle the symbol.
487487
///
488488
/// \returns The demangled string.
489489
void demangleSymbolAsString(llvm::StringRef MangledName,
490-
NodePrinter *printer);
490+
NodePrinter &Printer);
491491

492492
/// Demangle the given type and return the readable name.
493493
///
@@ -550,12 +550,11 @@ demangleSymbolAsString(const char *mangledName, size_t mangledNameLength,
550550
/// demangled string is stored in the `printer`.
551551
///
552552
/// If performance is an issue when demangling multiple symbols,
553-
/// `Context::demangleSymbolAsString` should be used instead.
554553
/// \param mangledName The mangled name string pointer.
555554
/// \param mangledNameLength The length of the mangledName string.
556555
/// \param printer The NodePrinter that will be used to demangle the symbol.
557-
void demangleSymbolAsString(const char *mangledName, size_t mangledNameLength,
558-
NodePrinter *printer);
556+
void demangleSymbolAsString(const llvm::StringRef mangledName,
557+
NodePrinter &printer);
559558

560559
/// Standalone utility function to demangle the given symbol as string.
561560
///
@@ -583,17 +582,6 @@ demangleSymbolAsString(llvm::StringRef MangledName,
583582
MangledName.size(), Options);
584583
}
585584

586-
/// Standalone utility function to demangle the given symbol as string. The
587-
/// result is stored in the `printer`.
588-
///
589-
/// If performance is an issue when demangling multiple symbols,
590-
/// Context::demangleSymbolAsString should be used instead.
591-
/// \param MangledName The mangled name string.
592-
inline void demangleSymbolAsString(llvm::StringRef MangledName,
593-
NodePrinter *printer) {
594-
demangleSymbolAsString(MangledName.data(), MangledName.size(), printer);
595-
}
596-
597585
/// Standalone utility function to demangle the given type as string.
598586
///
599587
/// If performance is an issue when demangling multiple symbols,
@@ -771,7 +759,7 @@ std::string nodeToString(NodePointer Root,
771759
///
772760
/// \param Root A pointer to a parse tree generated by the demangler.
773761
/// \param Printer A NodePrinter used to pretty print the demangled Node.
774-
void nodeToString(NodePointer Root, NodePrinter *Printer);
762+
void nodeToString(NodePointer Root, NodePrinter &Printer);
775763

776764
/// Transforms a mangled key path accessor thunk helper
777765
/// into the identfier/subscript that would be used to invoke it in swift code.

lib/Demangling/Context.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ std::string Context::demangleSymbolAsString(llvm::StringRef MangledName,
6767
}
6868

6969
void Context::demangleSymbolAsString(llvm::StringRef MangledName,
70-
NodePrinter *printer) {
70+
NodePrinter &Printer) {
7171
NodePointer root = demangleSymbolAsNode(MangledName);
72-
nodeToString(root, printer);
72+
nodeToString(root, Printer);
7373
}
7474

7575
std::string Context::demangleTypeAsString(llvm::StringRef MangledName,
@@ -281,13 +281,6 @@ std::string demangleSymbolAsString(const char *MangledName,
281281
Options);
282282
}
283283

284-
void demangleSymbolAsString(const char *MangledName, size_t MangledNameLength,
285-
NodePrinter *printer) {
286-
Context Ctx;
287-
return Ctx.demangleSymbolAsString(StringRef(MangledName, MangledNameLength),
288-
printer);
289-
}
290-
291284
std::string demangleTypeAsString(const char *MangledName,
292285
size_t MangledNameLength,
293286
const DemangleOptions &Options) {

lib/Demangling/NodePrinter.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3787,7 +3787,7 @@ std::string Demangle::keyPathSourceString(const char *MangledName,
37873787
/// Converts a demangled node to a string.
37883788
///
37893789
/// \param root The root of the AST to demangle.
3790-
/// @param options The `DemangleOptions` which will be used to create the
3790+
/// \param options The `DemangleOptions` which will be used to create the
37913791
/// NodePrinter.
37923792
///
37933793
/// \return The demangled node as a string.
@@ -3797,19 +3797,19 @@ std::string Demangle::nodeToString(NodePointer root,
37973797
return "";
37983798

37993799
NodePrinter printer = NodePrinter(options);
3800-
nodeToString(root, &printer);
3800+
nodeToString(root, printer);
38013801
return printer.takeString();
38023802
}
38033803

38043804
/// Converts a demangled node to a string, which is stored in the `printer`.
38053805
///
38063806
/// \param root The root of the AST to demangle.
3807-
/// @param printer The `NodePrinter` which will be used to print the AST to a
3807+
/// \param printer The `NodePrinter` which will be used to print the AST to a
38083808
/// string.
3809-
void Demangle::nodeToString(NodePointer root, NodePrinter *printer) {
3809+
void Demangle::nodeToString(NodePointer root, NodePrinter &printer) {
38103810
if (!root)
38113811
return;
3812-
printer->printRoot(root);
3812+
printer.printRoot(root);
38133813
}
38143814

38153815
#endif

0 commit comments

Comments
 (0)