Skip to content

Commit cd0c2d4

Browse files
remove unused API
1 parent af00dd9 commit cd0c2d4

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
@@ -482,11 +482,11 @@ class Context {
482482
///
483483
/// \param MangledName The mangled symbol string, which start a mangling
484484
/// prefix: _T, _T0, $S, _$S.
485-
/// \param printer The NodePrinter that will be used to demangle the symbol.
485+
/// \param Printer The NodePrinter that will be used to demangle the symbol.
486486
///
487487
/// \returns The demangled string.
488488
void demangleSymbolAsString(llvm::StringRef MangledName,
489-
NodePrinter *printer);
489+
NodePrinter &Printer);
490490

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

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

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

775763
/// Transforms a mangled key path accessor thunk helper
776764
/// 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
@@ -3884,7 +3884,7 @@ std::string Demangle::keyPathSourceString(const char *MangledName,
38843884
/// Converts a demangled node to a string.
38853885
///
38863886
/// \param root The root of the AST to demangle.
3887-
/// @param options The `DemangleOptions` which will be used to create the
3887+
/// \param options The `DemangleOptions` which will be used to create the
38883888
/// NodePrinter.
38893889
///
38903890
/// \return The demangled node as a string.
@@ -3894,19 +3894,19 @@ std::string Demangle::nodeToString(NodePointer root,
38943894
return "";
38953895

38963896
NodePrinter printer = NodePrinter(options);
3897-
nodeToString(root, &printer);
3897+
nodeToString(root, printer);
38983898
return printer.takeString();
38993899
}
39003900

39013901
/// Converts a demangled node to a string, which is stored in the `printer`.
39023902
///
39033903
/// \param root The root of the AST to demangle.
3904-
/// @param printer The `NodePrinter` which will be used to print the AST to a
3904+
/// \param printer The `NodePrinter` which will be used to print the AST to a
39053905
/// string.
3906-
void Demangle::nodeToString(NodePointer root, NodePrinter *printer) {
3906+
void Demangle::nodeToString(NodePointer root, NodePrinter &printer) {
39073907
if (!root)
39083908
return;
3909-
printer->printRoot(root);
3909+
printer.printRoot(root);
39103910
}
39113911

39123912
#endif

0 commit comments

Comments
 (0)