Skip to content

Commit a825c45

Browse files
Merge pull request #82767 from charles-zablit/charles-zablit/demangling/use-printFunctionName-to-6.2
[NFC][demangling] switch to using NodePrinter::printFunctionName
2 parents 1d96eca + da7764e commit a825c45

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

lib/Demangling/NodePrinter.cpp

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3493,35 +3493,9 @@ NodePointer NodePrinter::printEntity(NodePointer Entity, unsigned depth,
34933493
}
34943494
}
34953495

3496-
if (hasName || !OverwriteName.empty()) {
3497-
if (!ExtraName.empty() && MultiWordName) {
3498-
Printer << ExtraName;
3499-
if (ExtraIndex >= 0)
3500-
Printer << ExtraIndex;
3501-
3502-
Printer << " of ";
3503-
ExtraName = "";
3504-
ExtraIndex = -1;
3505-
}
3506-
size_t CurrentPos = Printer.getStringRef().size();
3507-
if (!OverwriteName.empty()) {
3508-
Printer << OverwriteName;
3509-
} else {
3510-
auto Name = Entity->getChild(1);
3511-
if (Name->getKind() != Node::Kind::PrivateDeclName)
3512-
print(Name, depth + 1);
3496+
printFunctionName(hasName, OverwriteName, ExtraName, MultiWordName,
3497+
ExtraIndex, Entity, depth);
35133498

3514-
if (auto PrivateName = getChildIf(Entity, Node::Kind::PrivateDeclName))
3515-
print(PrivateName, depth + 1);
3516-
}
3517-
if (Printer.getStringRef().size() != CurrentPos && !ExtraName.empty())
3518-
Printer << '.';
3519-
}
3520-
if (!ExtraName.empty()) {
3521-
Printer << ExtraName;
3522-
if (ExtraIndex >= 0)
3523-
Printer << ExtraIndex;
3524-
}
35253499
if (TypePr != TypePrinting::NoType) {
35263500
NodePointer type = getChildIf(Entity, Node::Kind::Type);
35273501
assert(type && "malformed entity");

0 commit comments

Comments
 (0)