[llvm] c354167 - [demangler] Add support for C++20 modules
Nathan Sidwell via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 22 09:43:04 PDT 2022
Author: Nathan Sidwell
Date: 2022-03-22T09:42:52-07:00
New Revision: c354167ae217f90399bff9a644fffb3e9a6b4334
URL: https://github.com/llvm/llvm-project/commit/c354167ae217f90399bff9a644fffb3e9a6b4334
DIFF: https://github.com/llvm/llvm-project/commit/c354167ae217f90399bff9a644fffb3e9a6b4334.diff
LOG: [demangler] Add support for C++20 modules
Add support for module name demangling. We have two new demangler
nodes -- ModuleName and ModuleEntity. The former represents a module
name in a hierarchical fashion. The latter is the combination of a
(name) node and a module name. Because module names and entity
identities use the same substitution encoding, we have to adjust the
flow of how substitutions are handled, and examine the substituted
node to know how to deal with it.
Reviewed By: dblaikie
Differential Revision: https://reviews.llvm.org/D119933
Added:
Modified:
libcxxabi/src/demangle/ItaniumDemangle.h
libcxxabi/test/test_demangle.pass.cpp
llvm/include/llvm/Demangle/ItaniumDemangle.h
llvm/lib/Demangle/ItaniumDemangle.cpp
Removed:
################################################################################
diff --git a/libcxxabi/src/demangle/ItaniumDemangle.h b/libcxxabi/src/demangle/ItaniumDemangle.h
index a3693b524f96c..e084cbfc7b803 100644
--- a/libcxxabi/src/demangle/ItaniumDemangle.h
+++ b/libcxxabi/src/demangle/ItaniumDemangle.h
@@ -16,10 +16,6 @@
#ifndef DEMANGLE_ITANIUMDEMANGLE_H
#define DEMANGLE_ITANIUMDEMANGLE_H
-// FIXME: (possibly) incomplete list of features that clang mangles that this
-// file does not yet support:
-// - C++ modules TS
-
#include "DemangleConfig.h"
#include "StringView.h"
#include "Utility.h"
@@ -58,6 +54,8 @@
X(QualifiedName) \
X(NestedName) \
X(LocalName) \
+ X(ModuleName) \
+ X(ModuleEntity) \
X(VectorType) \
X(PixelVectorType) \
X(BinaryFPType) \
@@ -1000,6 +998,44 @@ struct NestedName : Node {
}
};
+struct ModuleName : Node {
+ ModuleName *Parent;
+ Node *Name;
+ bool IsPartition;
+
+ ModuleName(ModuleName *Parent_, Node *Name_, bool IsPartition_ = false)
+ : Node(KModuleName), Parent(Parent_), Name(Name_),
+ IsPartition(IsPartition_) {}
+
+ template <typename Fn> void match(Fn F) const { F(Parent, Name); }
+
+ void printLeft(OutputBuffer &OB) const override {
+ if (Parent)
+ Parent->print(OB);
+ if (Parent || IsPartition)
+ OB += IsPartition ? ':' : '.';
+ Name->print(OB);
+ }
+};
+
+struct ModuleEntity : Node {
+ ModuleName *Module;
+ Node *Name;
+
+ ModuleEntity(ModuleName *Module_, Node *Name_)
+ : Node(KModuleEntity), Module(Module_), Name(Name_) {}
+
+ template <typename Fn> void match(Fn F) const { F(Module, Name); }
+
+ StringView getBaseName() const override { return Name->getBaseName(); }
+
+ void printLeft(OutputBuffer &OB) const override {
+ Name->print(OB);
+ OB += '@';
+ Module->print(OB);
+ }
+};
+
struct LocalName : Node {
Node *Encoding;
Node *Entity;
@@ -2547,10 +2583,11 @@ template <typename Derived, typename Alloc> struct AbstractManglingParser {
Node *parseName(NameState *State = nullptr);
Node *parseLocalName(NameState *State);
Node *parseOperatorName(NameState *State);
- Node *parseUnqualifiedName(NameState *State, Node *Scope);
+ bool parseModuleNameOpt(ModuleName *&Module);
+ Node *parseUnqualifiedName(NameState *State, Node *Scope, ModuleName *Module);
Node *parseUnnamedTypeName(NameState *State);
Node *parseSourceName(NameState *State);
- Node *parseUnscopedName(NameState *State);
+ Node *parseUnscopedName(NameState *State, bool *isSubstName);
Node *parseNestedName(NameState *State);
Node *parseCtorDtorName(Node *&SoFar, NameState *State);
@@ -2641,18 +2678,10 @@ Node *AbstractManglingParser<Derived, Alloc>::parseName(NameState *State) {
return getDerived().parseLocalName(State);
Node *Result = nullptr;
- bool IsSubst = look() == 'S' && look(1) != 't';
- if (IsSubst) {
- // A substitution must lead to:
- // ::= <unscoped-template-name> <template-args>
- Result = getDerived().parseSubstitution();
- } else {
- // An unscoped name can be one of:
- // ::= <unscoped-name>
- // ::= <unscoped-template-name> <template-args>
- Result = getDerived().parseUnscopedName(State);
- }
- if (Result == nullptr)
+ bool IsSubst = false;
+
+ Result = getDerived().parseUnscopedName(State, &IsSubst);
+ if (!Result)
return nullptr;
if (look() == 'I') {
@@ -2715,7 +2744,9 @@ Node *AbstractManglingParser<Derived, Alloc>::parseLocalName(NameState *State) {
// [*] extension
template <typename Derived, typename Alloc>
Node *
-AbstractManglingParser<Derived, Alloc>::parseUnscopedName(NameState *State) {
+AbstractManglingParser<Derived, Alloc>::parseUnscopedName(NameState *State,
+ bool *IsSubst) {
+
Node *Std = nullptr;
if (consumeIf("St")) {
Std = make<NameType>("std");
@@ -2724,24 +2755,46 @@ AbstractManglingParser<Derived, Alloc>::parseUnscopedName(NameState *State) {
}
consumeIf('L');
- return getDerived().parseUnqualifiedName(State, Std);
+ Node *Res = nullptr;
+ ModuleName *Module = nullptr;
+ if (look() == 'S') {
+ Node *S = getDerived().parseSubstitution();
+ if (!S)
+ return nullptr;
+ if (S->getKind() == Node::KModuleName)
+ Module = static_cast<ModuleName *>(S);
+ else if (IsSubst && Std == nullptr) {
+ Res = S;
+ *IsSubst = true;
+ } else {
+ return nullptr;
+ }
+ }
+
+ if (Res == nullptr)
+ Res = getDerived().parseUnqualifiedName(State, Std, Module);
+
+ return Res;
}
-// <unqualified-name> ::= <operator-name> [abi-tags]
-// ::= <ctor-dtor-name> [<abi-tags>]
-// ::= <source-name> [<abi-tags>]
-// ::= <unnamed-type-name> [<abi-tags>]
-// ::= DC <source-name>+ E # structured binding declaration
+// <unqualified-name> ::= [<module-name>] <operator-name> [<abi-tags>]
+// ::= [<module-name>] <ctor-dtor-name> [<abi-tags>]
+// ::= [<module-name>] <source-name> [<abi-tags>]
+// ::= [<module-name>] <unnamed-type-name> [<abi-tags>]
+// # structured binding declaration
+// ::= [<module-name>] DC <source-name>+ E
template <typename Derived, typename Alloc>
-Node *
-AbstractManglingParser<Derived, Alloc>::parseUnqualifiedName(NameState *State,
- Node *Scope) {
+Node *AbstractManglingParser<Derived, Alloc>::parseUnqualifiedName(
+ NameState *State, Node *Scope, ModuleName *Module) {
+ if (getDerived().parseModuleNameOpt(Module))
+ return nullptr;
+
Node *Result;
- if (look() == 'U')
+ if (look() == 'U') {
Result = getDerived().parseUnnamedTypeName(State);
- else if (look() >= '1' && look() <= '9')
+ } else if (look() >= '1' && look() <= '9') {
Result = getDerived().parseSourceName(State);
- else if (consumeIf("DC")) {
+ } else if (consumeIf("DC")) {
// Structured binding
size_t BindingsBegin = Names.size();
do {
@@ -2753,19 +2806,44 @@ AbstractManglingParser<Derived, Alloc>::parseUnqualifiedName(NameState *State,
Result = make<StructuredBindingName>(popTrailingNodeArray(BindingsBegin));
} else if (look() == 'C' || look() == 'D') {
// A <ctor-dtor-name>.
- if (Scope == nullptr)
+ if (Scope == nullptr || Module != nullptr)
return nullptr;
Result = getDerived().parseCtorDtorName(Scope, State);
} else {
Result = getDerived().parseOperatorName(State);
}
+
+ if (Module)
+ Result = make<ModuleEntity>(Module, Result);
if (Result != nullptr)
Result = getDerived().parseAbiTags(Result);
if (Result != nullptr && Scope != nullptr)
Result = make<NestedName>(Scope, Result);
+
return Result;
}
+// <module-name> ::= <module-subname>
+// ::= <module-name> <module-subname>
+// ::= <substitution> # passed in by caller
+// <module-subname> ::= W <source-name>
+// ::= W P <source-name>
+template <typename Derived, typename Alloc>
+bool AbstractManglingParser<Derived, Alloc>::parseModuleNameOpt(
+ ModuleName *&Module) {
+ while (consumeIf('W')) {
+ bool IsPartition = consumeIf('P');
+ Node *Sub = getDerived().parseSourceName(nullptr);
+ if (!Sub)
+ return true;
+ Module =
+ static_cast<ModuleName *>(make<ModuleName>(Module, Sub, IsPartition));
+ Subs.push_back(Module);
+ }
+
+ return false;
+}
+
// <unnamed-type-name> ::= Ut [<nonnegative number>] _
// ::= <closure-type-name>
//
@@ -3139,25 +3217,35 @@ AbstractManglingParser<Derived, Alloc>::parseNestedName(NameState *State) {
if (SoFar != nullptr)
return nullptr; // Cannot have a prefix.
SoFar = getDerived().parseDecltype();
- } else if (look() == 'S') {
- // ::= <substitution>
- if (SoFar != nullptr)
- return nullptr; // Cannot have a prefix.
- if (look(1) == 't') {
- // parseSubstition does not handle 'St'.
- First += 2;
- SoFar = make<NameType>("std");
- } else {
- SoFar = getDerived().parseSubstitution();
- }
- if (SoFar == nullptr)
- return nullptr;
- continue; // Do not push a new substitution.
} else {
- consumeIf('L'); // extension
+ ModuleName *Module = nullptr;
+ bool IsLocal = consumeIf('L'); // extension
+
+ if (look() == 'S') {
+ // ::= <substitution>
+ Node *S = nullptr;
+ if (look(1) == 't') {
+ First += 2;
+ S = make<NameType>("std");
+ } else {
+ S = getDerived().parseSubstitution();
+ }
+ if (!S)
+ return nullptr;
+ if (S->getKind() == Node::KModuleName) {
+ Module = static_cast<ModuleName *>(S);
+ } else if (SoFar != nullptr || IsLocal) {
+ return nullptr; // Cannot have a prefix.
+ } else {
+ SoFar = S;
+ continue; // Do not push a new substitution.
+ }
+ }
+
// ::= [<prefix>] <unqualified-name>
- SoFar = getDerived().parseUnqualifiedName(State, SoFar);
+ SoFar = getDerived().parseUnqualifiedName(State, SoFar, Module);
}
+
if (SoFar == nullptr)
return nullptr;
Subs.push_back(SoFar);
@@ -3970,8 +4058,9 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
// ::= <substitution> # See Compression below
case 'S': {
if (look(1) != 't') {
- Result = getDerived().parseSubstitution();
- if (Result == nullptr)
+ bool IsSubst = false;
+ Result = getDerived().parseUnscopedName(nullptr, &IsSubst);
+ if (!Result)
return nullptr;
// Sub could be either of:
@@ -3984,12 +4073,14 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
// If this is followed by some <template-args>, and we're permitted to
// parse them, take the second production.
- if (TryToParseTemplateArgs && look() == 'I') {
+ if (look() == 'I' && (!IsSubst || TryToParseTemplateArgs)) {
+ if (!IsSubst)
+ Subs.push_back(Result);
Node *TA = getDerived().parseTemplateArgs();
if (TA == nullptr)
return nullptr;
Result = make<NameWithTemplateArgs>(Result, TA);
- } else {
+ } else if (IsSubst) {
// If all we parsed was a substitution, don't re-insert into the
// substitution table.
return Result;
@@ -4738,14 +4829,17 @@ bool AbstractManglingParser<Alloc, Derived>::parseCallOffset() {
// # second call-offset is result adjustment
// ::= T <call-offset> <base encoding>
// # base is the nominal target function of thunk
-// ::= GV <object name> # Guard variable for one-time initialization
+// # Guard variable for one-time initialization
+// ::= GV <object name>
// # No <type>
// ::= TW <object name> # Thread-local wrapper
// ::= TH <object name> # Thread-local initialization
// ::= GR <object name> _ # First temporary
// ::= GR <object name> <seq-id> _ # Subsequent temporaries
-// extension ::= TC <first type> <number> _ <second type> # construction vtable for second-in-first
+// # construction vtable for second-in-first
+// extension ::= TC <first type> <number> _ <second type>
// extension ::= GR <object name> # reference temporary for object
+// extension ::= GI <module name> # module global initializer
template <typename Derived, typename Alloc>
Node *AbstractManglingParser<Derived, Alloc>::parseSpecialName() {
switch (look()) {
@@ -4872,6 +4966,16 @@ Node *AbstractManglingParser<Derived, Alloc>::parseSpecialName() {
return nullptr;
return make<SpecialName>("reference temporary for ", Name);
}
+ // GI <module-name> v
+ case 'I': {
+ First += 2;
+ ModuleName *Module = nullptr;
+ if (getDerived().parseModuleNameOpt(Module))
+ return nullptr;
+ if (Module == nullptr)
+ return nullptr;
+ return make<SpecialName>("initializer for module ", Module);
+ }
}
}
return nullptr;
diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp
index 9ad692973a00f..258bf1adc4f87 100644
--- a/libcxxabi/test/test_demangle.pass.cpp
+++ b/libcxxabi/test/test_demangle.pass.cpp
@@ -29867,6 +29867,31 @@ const char* cases[][2] =
{"_Z3TPLIiET_S0_", "int TPL<int>(int)"},
{"_ZN1XawEv", "X::operator co_await()"},
+
+ // C++20 modules
+ {"_ZN5Outer5InnerW3FOO2FnERNS0_1XE", "Outer::Inner::Fn at FOO(Outer::Inner::X&)"},
+ {"_ZN5OuterW3FOO5Inner2FnERNS1_1XE", "Outer::Inner at FOO::Fn(Outer::Inner at FOO::X&)"},
+ {"_ZN4Quux4TotoW3FooW3Bar3BazEPNS0_S2_5PlughE", "Quux::Toto::Baz at Foo.Bar(Quux::Toto::Plugh at Foo.Bar*)"},
+ {"_ZW6Module1fNS_1a1bENS0_1cE", "f at Module(a at Module::b, a at Module::c)"},
+ {"_ZN3BobW3FOOW3BAR3BarEPS1_1APNS_S1_1BE", "Bob::Bar at FOO.BAR(A at FOO.BAR*, Bob::B at FOO.BAR*)"},
+ {"_ZW3FOOW3BAR3FooPS0_1APN3BobS0_1BE", "Foo at FOO.BAR(A at FOO.BAR*, Bob::B at FOO.BAR*)"},
+ {"_ZN3BobW3FOOW3BAZ3FooEPS0_W3BAR1APNS_S2_1BE", "Bob::Foo at FOO.BAZ(A at FOO.BAR*, Bob::B at FOO.BAR*)"},
+ {"_ZW3FOOW3BAZ3BarPS_W3BAR1APN3BobS1_1BE", "Bar at FOO.BAZ(A at FOO.BAR*, Bob::B at FOO.BAR*)"},
+ {"_ZNW3FOO3TPLIS_3OneE1MEPS1_", "TPL at FOO<One at FOO>::M(One at FOO*)"},
+ {"_ZNW3FOO3TPLIS_3OneE1NIS_3TwoEEvPS1_PT_", "void TPL at FOO<One at FOO>::N<Two at FOO>(One at FOO*, Two at FOO*)"},
+ {"_ZN3NMSW3FOO3TPLINS_S0_3OneEE1MEPS2_", "NMS::TPL at FOO<NMS::One at FOO>::M(NMS::One at FOO*)"},
+ {"_ZN3NMSW3FOO3TPLINS_S0_3OneEE1NINS_S0_3TwoEEEvPS2_PT_",
+ "void NMS::TPL at FOO<NMS::One at FOO>::N<NMS::Two at FOO>(NMS::One at FOO*, NMS::Two at FOO*)"},
+ {"_ZNStW3STD9allocatorIiE1MEPi", "std::allocator at STD<int>::M(int*)"},
+ {"_ZNStW3STD9allocatorIiE1NIfEEPT_Pi", "float* std::allocator at STD<int>::N<float>(int*)"},
+ {"_ZNStW3STD9allocatorI4PoohE1MEPS1_", "std::allocator at STD<Pooh>::M(Pooh*)"},
+ {"_ZNStW3STD9allocatorI4PoohE1NI6PigletEEPT_PS1_", "Piglet* std::allocator at STD<Pooh>::N<Piglet>(Pooh*)"},
+ {"_ZW3FooDC1a1bE", "[a, b]@Foo"},
+ {"_ZN1NW3FooDC1a1bEE", "N::[a, b]@Foo"},
+ {"_ZN3NMSW3MOD3FooB3ABIEv", "NMS::Foo at MOD[abi:ABI]()"},
+ {"_ZGIW3Foo", "initializer for module Foo"},
+ {"_ZGIW3FooW3Bar", "initializer for module Foo.Bar"},
+ {"_ZGIW3FooWP3BarW3Baz", "initializer for module Foo:Bar.Baz"},
};
const unsigned N = sizeof(cases) / sizeof(cases[0]);
@@ -29954,6 +29979,11 @@ const char* invalid_cases[] =
"_ZNDTUt_Ev",
"_ZN1fIXawLi0EEEEvv",
+
+ "_ZNWUt_3FOOEv",
+ "_ZWDC3FOOEv",
+ "_ZGI3Foo",
+ "_ZGIW3Foov",
};
const unsigned NI = sizeof(invalid_cases) / sizeof(invalid_cases[0]);
@@ -30006,8 +30036,6 @@ void test_invalid_cases()
}
const char *xfail_cases[] = {
- "_ZW6FooBarE2f3v", // C++ modules TS
-
// FIXME: Why does clang generate the "cp" expr?
"_ZN5test11bIsEEDTcp3foocvT__EEES1_",
};
diff --git a/llvm/include/llvm/Demangle/ItaniumDemangle.h b/llvm/include/llvm/Demangle/ItaniumDemangle.h
index ad5c7da544656..f65d7504ad55d 100644
--- a/llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ b/llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -16,10 +16,6 @@
#ifndef DEMANGLE_ITANIUMDEMANGLE_H
#define DEMANGLE_ITANIUMDEMANGLE_H
-// FIXME: (possibly) incomplete list of features that clang mangles that this
-// file does not yet support:
-// - C++ modules TS
-
#include "DemangleConfig.h"
#include "StringView.h"
#include "Utility.h"
@@ -58,6 +54,8 @@
X(QualifiedName) \
X(NestedName) \
X(LocalName) \
+ X(ModuleName) \
+ X(ModuleEntity) \
X(VectorType) \
X(PixelVectorType) \
X(BinaryFPType) \
@@ -1000,6 +998,44 @@ struct NestedName : Node {
}
};
+struct ModuleName : Node {
+ ModuleName *Parent;
+ Node *Name;
+ bool IsPartition;
+
+ ModuleName(ModuleName *Parent_, Node *Name_, bool IsPartition_ = false)
+ : Node(KModuleName), Parent(Parent_), Name(Name_),
+ IsPartition(IsPartition_) {}
+
+ template <typename Fn> void match(Fn F) const { F(Parent, Name); }
+
+ void printLeft(OutputBuffer &OB) const override {
+ if (Parent)
+ Parent->print(OB);
+ if (Parent || IsPartition)
+ OB += IsPartition ? ':' : '.';
+ Name->print(OB);
+ }
+};
+
+struct ModuleEntity : Node {
+ ModuleName *Module;
+ Node *Name;
+
+ ModuleEntity(ModuleName *Module_, Node *Name_)
+ : Node(KModuleEntity), Module(Module_), Name(Name_) {}
+
+ template <typename Fn> void match(Fn F) const { F(Module, Name); }
+
+ StringView getBaseName() const override { return Name->getBaseName(); }
+
+ void printLeft(OutputBuffer &OB) const override {
+ Name->print(OB);
+ OB += '@';
+ Module->print(OB);
+ }
+};
+
struct LocalName : Node {
Node *Encoding;
Node *Entity;
@@ -2547,10 +2583,11 @@ template <typename Derived, typename Alloc> struct AbstractManglingParser {
Node *parseName(NameState *State = nullptr);
Node *parseLocalName(NameState *State);
Node *parseOperatorName(NameState *State);
- Node *parseUnqualifiedName(NameState *State, Node *Scope);
+ bool parseModuleNameOpt(ModuleName *&Module);
+ Node *parseUnqualifiedName(NameState *State, Node *Scope, ModuleName *Module);
Node *parseUnnamedTypeName(NameState *State);
Node *parseSourceName(NameState *State);
- Node *parseUnscopedName(NameState *State);
+ Node *parseUnscopedName(NameState *State, bool *isSubstName);
Node *parseNestedName(NameState *State);
Node *parseCtorDtorName(Node *&SoFar, NameState *State);
@@ -2641,18 +2678,10 @@ Node *AbstractManglingParser<Derived, Alloc>::parseName(NameState *State) {
return getDerived().parseLocalName(State);
Node *Result = nullptr;
- bool IsSubst = look() == 'S' && look(1) != 't';
- if (IsSubst) {
- // A substitution must lead to:
- // ::= <unscoped-template-name> <template-args>
- Result = getDerived().parseSubstitution();
- } else {
- // An unscoped name can be one of:
- // ::= <unscoped-name>
- // ::= <unscoped-template-name> <template-args>
- Result = getDerived().parseUnscopedName(State);
- }
- if (Result == nullptr)
+ bool IsSubst = false;
+
+ Result = getDerived().parseUnscopedName(State, &IsSubst);
+ if (!Result)
return nullptr;
if (look() == 'I') {
@@ -2715,7 +2744,9 @@ Node *AbstractManglingParser<Derived, Alloc>::parseLocalName(NameState *State) {
// [*] extension
template <typename Derived, typename Alloc>
Node *
-AbstractManglingParser<Derived, Alloc>::parseUnscopedName(NameState *State) {
+AbstractManglingParser<Derived, Alloc>::parseUnscopedName(NameState *State,
+ bool *IsSubst) {
+
Node *Std = nullptr;
if (consumeIf("St")) {
Std = make<NameType>("std");
@@ -2724,24 +2755,46 @@ AbstractManglingParser<Derived, Alloc>::parseUnscopedName(NameState *State) {
}
consumeIf('L');
- return getDerived().parseUnqualifiedName(State, Std);
+ Node *Res = nullptr;
+ ModuleName *Module = nullptr;
+ if (look() == 'S') {
+ Node *S = getDerived().parseSubstitution();
+ if (!S)
+ return nullptr;
+ if (S->getKind() == Node::KModuleName)
+ Module = static_cast<ModuleName *>(S);
+ else if (IsSubst && Std == nullptr) {
+ Res = S;
+ *IsSubst = true;
+ } else {
+ return nullptr;
+ }
+ }
+
+ if (Res == nullptr)
+ Res = getDerived().parseUnqualifiedName(State, Std, Module);
+
+ return Res;
}
-// <unqualified-name> ::= <operator-name> [abi-tags]
-// ::= <ctor-dtor-name> [<abi-tags>]
-// ::= <source-name> [<abi-tags>]
-// ::= <unnamed-type-name> [<abi-tags>]
-// ::= DC <source-name>+ E # structured binding declaration
+// <unqualified-name> ::= [<module-name>] <operator-name> [<abi-tags>]
+// ::= [<module-name>] <ctor-dtor-name> [<abi-tags>]
+// ::= [<module-name>] <source-name> [<abi-tags>]
+// ::= [<module-name>] <unnamed-type-name> [<abi-tags>]
+// # structured binding declaration
+// ::= [<module-name>] DC <source-name>+ E
template <typename Derived, typename Alloc>
-Node *
-AbstractManglingParser<Derived, Alloc>::parseUnqualifiedName(NameState *State,
- Node *Scope) {
+Node *AbstractManglingParser<Derived, Alloc>::parseUnqualifiedName(
+ NameState *State, Node *Scope, ModuleName *Module) {
+ if (getDerived().parseModuleNameOpt(Module))
+ return nullptr;
+
Node *Result;
- if (look() == 'U')
+ if (look() == 'U') {
Result = getDerived().parseUnnamedTypeName(State);
- else if (look() >= '1' && look() <= '9')
+ } else if (look() >= '1' && look() <= '9') {
Result = getDerived().parseSourceName(State);
- else if (consumeIf("DC")) {
+ } else if (consumeIf("DC")) {
// Structured binding
size_t BindingsBegin = Names.size();
do {
@@ -2753,19 +2806,44 @@ AbstractManglingParser<Derived, Alloc>::parseUnqualifiedName(NameState *State,
Result = make<StructuredBindingName>(popTrailingNodeArray(BindingsBegin));
} else if (look() == 'C' || look() == 'D') {
// A <ctor-dtor-name>.
- if (Scope == nullptr)
+ if (Scope == nullptr || Module != nullptr)
return nullptr;
Result = getDerived().parseCtorDtorName(Scope, State);
} else {
Result = getDerived().parseOperatorName(State);
}
+
+ if (Module)
+ Result = make<ModuleEntity>(Module, Result);
if (Result != nullptr)
Result = getDerived().parseAbiTags(Result);
if (Result != nullptr && Scope != nullptr)
Result = make<NestedName>(Scope, Result);
+
return Result;
}
+// <module-name> ::= <module-subname>
+// ::= <module-name> <module-subname>
+// ::= <substitution> # passed in by caller
+// <module-subname> ::= W <source-name>
+// ::= W P <source-name>
+template <typename Derived, typename Alloc>
+bool AbstractManglingParser<Derived, Alloc>::parseModuleNameOpt(
+ ModuleName *&Module) {
+ while (consumeIf('W')) {
+ bool IsPartition = consumeIf('P');
+ Node *Sub = getDerived().parseSourceName(nullptr);
+ if (!Sub)
+ return true;
+ Module =
+ static_cast<ModuleName *>(make<ModuleName>(Module, Sub, IsPartition));
+ Subs.push_back(Module);
+ }
+
+ return false;
+}
+
// <unnamed-type-name> ::= Ut [<nonnegative number>] _
// ::= <closure-type-name>
//
@@ -3139,25 +3217,35 @@ AbstractManglingParser<Derived, Alloc>::parseNestedName(NameState *State) {
if (SoFar != nullptr)
return nullptr; // Cannot have a prefix.
SoFar = getDerived().parseDecltype();
- } else if (look() == 'S') {
- // ::= <substitution>
- if (SoFar != nullptr)
- return nullptr; // Cannot have a prefix.
- if (look(1) == 't') {
- // parseSubstition does not handle 'St'.
- First += 2;
- SoFar = make<NameType>("std");
- } else {
- SoFar = getDerived().parseSubstitution();
- }
- if (SoFar == nullptr)
- return nullptr;
- continue; // Do not push a new substitution.
} else {
- consumeIf('L'); // extension
+ ModuleName *Module = nullptr;
+ bool IsLocal = consumeIf('L'); // extension
+
+ if (look() == 'S') {
+ // ::= <substitution>
+ Node *S = nullptr;
+ if (look(1) == 't') {
+ First += 2;
+ S = make<NameType>("std");
+ } else {
+ S = getDerived().parseSubstitution();
+ }
+ if (!S)
+ return nullptr;
+ if (S->getKind() == Node::KModuleName) {
+ Module = static_cast<ModuleName *>(S);
+ } else if (SoFar != nullptr || IsLocal) {
+ return nullptr; // Cannot have a prefix.
+ } else {
+ SoFar = S;
+ continue; // Do not push a new substitution.
+ }
+ }
+
// ::= [<prefix>] <unqualified-name>
- SoFar = getDerived().parseUnqualifiedName(State, SoFar);
+ SoFar = getDerived().parseUnqualifiedName(State, SoFar, Module);
}
+
if (SoFar == nullptr)
return nullptr;
Subs.push_back(SoFar);
@@ -3970,8 +4058,9 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
// ::= <substitution> # See Compression below
case 'S': {
if (look(1) != 't') {
- Result = getDerived().parseSubstitution();
- if (Result == nullptr)
+ bool IsSubst = false;
+ Result = getDerived().parseUnscopedName(nullptr, &IsSubst);
+ if (!Result)
return nullptr;
// Sub could be either of:
@@ -3984,12 +4073,14 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
// If this is followed by some <template-args>, and we're permitted to
// parse them, take the second production.
- if (TryToParseTemplateArgs && look() == 'I') {
+ if (look() == 'I' && (!IsSubst || TryToParseTemplateArgs)) {
+ if (!IsSubst)
+ Subs.push_back(Result);
Node *TA = getDerived().parseTemplateArgs();
if (TA == nullptr)
return nullptr;
Result = make<NameWithTemplateArgs>(Result, TA);
- } else {
+ } else if (IsSubst) {
// If all we parsed was a substitution, don't re-insert into the
// substitution table.
return Result;
@@ -4738,14 +4829,17 @@ bool AbstractManglingParser<Alloc, Derived>::parseCallOffset() {
// # second call-offset is result adjustment
// ::= T <call-offset> <base encoding>
// # base is the nominal target function of thunk
-// ::= GV <object name> # Guard variable for one-time initialization
+// # Guard variable for one-time initialization
+// ::= GV <object name>
// # No <type>
// ::= TW <object name> # Thread-local wrapper
// ::= TH <object name> # Thread-local initialization
// ::= GR <object name> _ # First temporary
// ::= GR <object name> <seq-id> _ # Subsequent temporaries
-// extension ::= TC <first type> <number> _ <second type> # construction vtable for second-in-first
+// # construction vtable for second-in-first
+// extension ::= TC <first type> <number> _ <second type>
// extension ::= GR <object name> # reference temporary for object
+// extension ::= GI <module name> # module global initializer
template <typename Derived, typename Alloc>
Node *AbstractManglingParser<Derived, Alloc>::parseSpecialName() {
switch (look()) {
@@ -4872,6 +4966,16 @@ Node *AbstractManglingParser<Derived, Alloc>::parseSpecialName() {
return nullptr;
return make<SpecialName>("reference temporary for ", Name);
}
+ // GI <module-name> v
+ case 'I': {
+ First += 2;
+ ModuleName *Module = nullptr;
+ if (getDerived().parseModuleNameOpt(Module))
+ return nullptr;
+ if (Module == nullptr)
+ return nullptr;
+ return make<SpecialName>("initializer for module ", Module);
+ }
}
}
return nullptr;
diff --git a/llvm/lib/Demangle/ItaniumDemangle.cpp b/llvm/lib/Demangle/ItaniumDemangle.cpp
index 06a74c12316cd..5d2fb2b18ab8d 100644
--- a/llvm/lib/Demangle/ItaniumDemangle.cpp
+++ b/llvm/lib/Demangle/ItaniumDemangle.cpp
@@ -404,6 +404,9 @@ char *ItaniumPartialDemangler::getFunctionBaseName(char *Buf, size_t *N) const {
case Node::KAbiTagAttr:
Name = static_cast<const AbiTagAttr *>(Name)->Base;
continue;
+ case Node::KModuleEntity:
+ Name = static_cast<const ModuleEntity *>(Name)->Name;
+ continue;
case Node::KNestedName:
Name = static_cast<const NestedName *>(Name)->Name;
continue;
@@ -442,6 +445,9 @@ char *ItaniumPartialDemangler::getFunctionDeclContextName(char *Buf,
break;
}
+ if (Name->getKind() == Node::KModuleEntity)
+ Name = static_cast<const ModuleEntity *>(Name)->Name;
+
switch (Name->getKind()) {
case Node::KNestedName:
static_cast<const NestedName *>(Name)->Qual->print(OB);
@@ -544,6 +550,9 @@ bool ItaniumPartialDemangler::isCtorOrDtor() const {
case Node::KNestedName:
N = static_cast<const NestedName *>(N)->Name;
break;
+ case Node::KModuleEntity:
+ N = static_cast<const ModuleEntity *>(N)->Name;
+ break;
}
}
return false;
More information about the llvm-commits
mailing list