Skip to content

[MsDemangle] Use NodeList over SmallVector for target names #166586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

[MsDemangle] Use NodeList over SmallVector for target names #166586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions llvm/lib/Demangle/MicrosoftDemangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

#include "llvm/Demangle/MicrosoftDemangle.h"

#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Demangle/Demangle.h"
#include "llvm/Demangle/DemangleConfig.h"
#include "llvm/Demangle/MicrosoftDemangleNodes.h"
Expand Down Expand Up @@ -279,13 +277,16 @@ demanglePointerCVQualifiers(std::string_view &MangledName) {
DEMANGLE_UNREACHABLE;
}

static NodeArrayNode *smallVecToNodeArray(ArenaAllocator &Arena,
ArrayRef<Node *> Vec) {
NodeArrayNode *Arr = Arena.alloc<NodeArrayNode>();
Arr->Count = Vec.size();
Arr->Nodes = Arena.allocArray<Node *>(Vec.size());
std::memcpy(Arr->Nodes, Vec.data(), Vec.size() * sizeof(Node *));
return Arr;
static NodeArrayNode *nodeListToNodeArray(ArenaAllocator &Arena, NodeList *Head,
size_t Count) {
NodeArrayNode *N = Arena.alloc<NodeArrayNode>();
N->Count = Count;
N->Nodes = Arena.allocArray<Node *>(Count);
for (size_t I = 0; I < Count; ++I) {
N->Nodes[I] = Head->N;
Head = Head->Next;
}
return N;
}

std::string_view Demangler::copyString(std::string_view Borrowed) {
Expand Down Expand Up @@ -335,17 +336,28 @@ Demangler::demangleSpecialTableSymbolNode(std::string_view &MangledName,

std::tie(STSN->Quals, IsMember) = demangleQualifiers(MangledName);

SmallVector<Node *, 1> TargetNames;
NodeList *TargetCurrent = nullptr;
NodeList *TargetHead = nullptr;
size_t Count = 0;
while (!consumeFront(MangledName, '@')) {
++Count;

NodeList *Next = Arena.alloc<NodeList>();
if (TargetCurrent)
TargetCurrent->Next = Next;
else
TargetHead = Next;

TargetCurrent = Next;
QualifiedNameNode *QN = demangleFullyQualifiedTypeName(MangledName);
if (Error)
return nullptr;
assert(QN);
TargetNames.push_back(QN);
TargetCurrent->N = QN;
}

if (!TargetNames.empty())
STSN->TargetNames = smallVecToNodeArray(Arena, TargetNames);
if (Count > 0)
STSN->TargetNames = nodeListToNodeArray(Arena, TargetHead, Count);

return STSN;
}
Expand Down Expand Up @@ -1627,18 +1639,6 @@ Demangler::demangleNameScopePiece(std::string_view &MangledName) {
return demangleSimpleName(MangledName, /*Memorize=*/true);
}

static NodeArrayNode *nodeListToNodeArray(ArenaAllocator &Arena, NodeList *Head,
size_t Count) {
NodeArrayNode *N = Arena.alloc<NodeArrayNode>();
N->Count = Count;
N->Nodes = Arena.allocArray<Node *>(Count);
for (size_t I = 0; I < Count; ++I) {
N->Nodes[I] = Head->N;
Head = Head->Next;
}
return N;
}

QualifiedNameNode *
Demangler::demangleNameScopeChain(std::string_view &MangledName,
IdentifierNode *UnqualifiedName) {
Expand Down
Loading