Skip to content

Commit af11f41

Browse files
epilkepilk
committed
[demangle] NFC: get rid of NodeOrString
This class was a bit overengineered, and was triggering some PVS warnings. Instead, put strings into a NameType and let clients unconditionally treat it as a Node.
1 parent efad56b commit af11f41

File tree

5 files changed

+38
-137
lines changed

5 files changed

+38
-137
lines changed

‎libcxxabi/src/cxa_demangle.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ struct DumpVisitor {
8686
else
8787
printStr("<null>");
8888
}
89-
void print(NodeOrString NS) {
90-
if (NS.isNode())
91-
print(NS.asNode());
92-
else if (NS.isString())
93-
print(NS.asString());
94-
else
95-
printStr("NodeOrString()");
96-
}
9789
void print(NodeArray A) {
9890
++Depth;
9991
printStr("{");

‎libcxxabi/src/demangle/ItaniumDemangle.h‎

Lines changed: 19 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -607,48 +607,12 @@ class PointerToMemberType final : public Node {
607607
}
608608
};
609609

610-
class NodeOrString {
611-
const void *First;
612-
const void *Second;
613-
614-
public:
615-
/* implicit */ NodeOrString(StringView Str) {
616-
const char *FirstChar = Str.begin();
617-
const char *SecondChar = Str.end();
618-
if (SecondChar == nullptr) {
619-
assert(FirstChar == SecondChar);
620-
++FirstChar, ++SecondChar;
621-
}
622-
First = static_cast<const void *>(FirstChar);
623-
Second = static_cast<const void *>(SecondChar);
624-
}
625-
626-
/* implicit */ NodeOrString(Node *N)
627-
: First(static_cast<const void *>(N)), Second(nullptr) {}
628-
NodeOrString() : First(nullptr), Second(nullptr) {}
629-
630-
bool isString() const { return Second && First; }
631-
bool isNode() const { return First && !Second; }
632-
bool isEmpty() const { return !First && !Second; }
633-
634-
StringView asString() const {
635-
assert(isString());
636-
return StringView(static_cast<const char *>(First),
637-
static_cast<const char *>(Second));
638-
}
639-
640-
const Node *asNode() const {
641-
assert(isNode());
642-
return static_cast<const Node *>(First);
643-
}
644-
};
645-
646610
class ArrayType final : public Node {
647611
const Node *Base;
648-
NodeOrString Dimension;
612+
Node *Dimension;
649613

650614
public:
651-
ArrayType(const Node *Base_, NodeOrString Dimension_)
615+
ArrayType(const Node *Base_, Node *Dimension_)
652616
: Node(KArrayType,
653617
/*RHSComponentCache=*/Cache::Yes,
654618
/*ArrayCache=*/Cache::Yes),
@@ -665,10 +629,8 @@ class ArrayType final : public Node {
665629
if (S.back() != ']')
666630
S += " ";
667631
S += "[";
668-
if (Dimension.isString())
669-
S += Dimension.asString();
670-
else if (Dimension.isNode())
671-
Dimension.asNode()->print(S);
632+
if (Dimension)
633+
Dimension->print(S);
672634
S += "]";
673635
Base->printRight(S);
674636
}
@@ -934,10 +896,10 @@ class QualifiedName final : public Node {
934896

935897
class VectorType final : public Node {
936898
const Node *BaseType;
937-
const NodeOrString Dimension;
899+
const Node *Dimension;
938900

939901
public:
940-
VectorType(const Node *BaseType_, NodeOrString Dimension_)
902+
VectorType(const Node *BaseType_, Node *Dimension_)
941903
: Node(KVectorType), BaseType(BaseType_),
942904
Dimension(Dimension_) {}
943905

@@ -946,27 +908,25 @@ class VectorType final : public Node {
946908
void printLeft(OutputStream &S) const override {
947909
BaseType->print(S);
948910
S += " vector[";
949-
if (Dimension.isNode())
950-
Dimension.asNode()->print(S);
951-
else if (Dimension.isString())
952-
S += Dimension.asString();
911+
if (Dimension)
912+
Dimension->print(S);
953913
S += "]";
954914
}
955915
};
956916

957917
class PixelVectorType final : public Node {
958-
const NodeOrString Dimension;
918+
const Node *Dimension;
959919

960920
public:
961-
PixelVectorType(NodeOrString Dimension_)
921+
PixelVectorType(const Node *Dimension_)
962922
: Node(KPixelVectorType), Dimension(Dimension_) {}
963923

964924
template<typename Fn> void match(Fn F) const { F(Dimension); }
965925

966926
void printLeft(OutputStream &S) const override {
967927
// FIXME: This should demangle as "vector pixel".
968928
S += "pixel vector[";
969-
S += Dimension.asString();
929+
Dimension->print(S);
970930
S += "]";
971931
}
972932
};
@@ -3548,7 +3508,9 @@ Node *AbstractManglingParser<Derived, Alloc>::parseVectorType() {
35483508
if (!consumeIf("Dv"))
35493509
return nullptr;
35503510
if (look() >= '1' && look() <= '9') {
3551-
StringView DimensionNumber = parseNumber();
3511+
Node *DimensionNumber = make<NameType>(parseNumber());
3512+
if (!DimensionNumber)
3513+
return nullptr;
35523514
if (!consumeIf('_'))
35533515
return nullptr;
35543516
if (consumeIf('p'))
@@ -3573,7 +3535,7 @@ Node *AbstractManglingParser<Derived, Alloc>::parseVectorType() {
35733535
Node *ElemType = getDerived().parseType();
35743536
if (!ElemType)
35753537
return nullptr;
3576-
return make<VectorType>(ElemType, StringView());
3538+
return make<VectorType>(ElemType, /*Dimension=*/nullptr);
35773539
}
35783540

35793541
// <decltype> ::= Dt <expression> E # decltype of an id-expression or class member access (C++0x)
@@ -3599,10 +3561,12 @@ Node *AbstractManglingParser<Derived, Alloc>::parseArrayType() {
35993561
if (!consumeIf('A'))
36003562
return nullptr;
36013563

3602-
NodeOrString Dimension;
3564+
Node *Dimension = nullptr;
36033565

36043566
if (std::isdigit(look())) {
3605-
Dimension = parseNumber();
3567+
Dimension = make<NameType>(parseNumber());
3568+
if (!Dimension)
3569+
return nullptr;
36063570
if (!consumeIf('_'))
36073571
return nullptr;
36083572
} else if (!consumeIf('_')) {

‎llvm/include/llvm/Demangle/ItaniumDemangle.h‎

Lines changed: 19 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -607,48 +607,12 @@ class PointerToMemberType final : public Node {
607607
}
608608
};
609609

610-
class NodeOrString {
611-
const void *First;
612-
const void *Second;
613-
614-
public:
615-
/* implicit */ NodeOrString(StringView Str) {
616-
const char *FirstChar = Str.begin();
617-
const char *SecondChar = Str.end();
618-
if (SecondChar == nullptr) {
619-
assert(FirstChar == SecondChar);
620-
++FirstChar, ++SecondChar;
621-
}
622-
First = static_cast<const void *>(FirstChar);
623-
Second = static_cast<const void *>(SecondChar);
624-
}
625-
626-
/* implicit */ NodeOrString(Node *N)
627-
: First(static_cast<const void *>(N)), Second(nullptr) {}
628-
NodeOrString() : First(nullptr), Second(nullptr) {}
629-
630-
bool isString() const { return Second && First; }
631-
bool isNode() const { return First && !Second; }
632-
bool isEmpty() const { return !First && !Second; }
633-
634-
StringView asString() const {
635-
assert(isString());
636-
return StringView(static_cast<const char *>(First),
637-
static_cast<const char *>(Second));
638-
}
639-
640-
const Node *asNode() const {
641-
assert(isNode());
642-
return static_cast<const Node *>(First);
643-
}
644-
};
645-
646610
class ArrayType final : public Node {
647611
const Node *Base;
648-
NodeOrString Dimension;
612+
Node *Dimension;
649613

650614
public:
651-
ArrayType(const Node *Base_, NodeOrString Dimension_)
615+
ArrayType(const Node *Base_, Node *Dimension_)
652616
: Node(KArrayType,
653617
/*RHSComponentCache=*/Cache::Yes,
654618
/*ArrayCache=*/Cache::Yes),
@@ -665,10 +629,8 @@ class ArrayType final : public Node {
665629
if (S.back() != ']')
666630
S += " ";
667631
S += "[";
668-
if (Dimension.isString())
669-
S += Dimension.asString();
670-
else if (Dimension.isNode())
671-
Dimension.asNode()->print(S);
632+
if (Dimension)
633+
Dimension->print(S);
672634
S += "]";
673635
Base->printRight(S);
674636
}
@@ -934,10 +896,10 @@ class QualifiedName final : public Node {
934896

935897
class VectorType final : public Node {
936898
const Node *BaseType;
937-
const NodeOrString Dimension;
899+
const Node *Dimension;
938900

939901
public:
940-
VectorType(const Node *BaseType_, NodeOrString Dimension_)
902+
VectorType(const Node *BaseType_, Node *Dimension_)
941903
: Node(KVectorType), BaseType(BaseType_),
942904
Dimension(Dimension_) {}
943905

@@ -946,27 +908,25 @@ class VectorType final : public Node {
946908
void printLeft(OutputStream &S) const override {
947909
BaseType->print(S);
948910
S += " vector[";
949-
if (Dimension.isNode())
950-
Dimension.asNode()->print(S);
951-
else if (Dimension.isString())
952-
S += Dimension.asString();
911+
if (Dimension)
912+
Dimension->print(S);
953913
S += "]";
954914
}
955915
};
956916

957917
class PixelVectorType final : public Node {
958-
const NodeOrString Dimension;
918+
const Node *Dimension;
959919

960920
public:
961-
PixelVectorType(NodeOrString Dimension_)
921+
PixelVectorType(const Node *Dimension_)
962922
: Node(KPixelVectorType), Dimension(Dimension_) {}
963923

964924
template<typename Fn> void match(Fn F) const { F(Dimension); }
965925

966926
void printLeft(OutputStream &S) const override {
967927
// FIXME: This should demangle as "vector pixel".
968928
S += "pixel vector[";
969-
S += Dimension.asString();
929+
Dimension->print(S);
970930
S += "]";
971931
}
972932
};
@@ -3548,7 +3508,9 @@ Node *AbstractManglingParser<Derived, Alloc>::parseVectorType() {
35483508
if (!consumeIf("Dv"))
35493509
return nullptr;
35503510
if (look() >= '1' && look() <= '9') {
3551-
StringView DimensionNumber = parseNumber();
3511+
Node *DimensionNumber = make<NameType>(parseNumber());
3512+
if (!DimensionNumber)
3513+
return nullptr;
35523514
if (!consumeIf('_'))
35533515
return nullptr;
35543516
if (consumeIf('p'))
@@ -3573,7 +3535,7 @@ Node *AbstractManglingParser<Derived, Alloc>::parseVectorType() {
35733535
Node *ElemType = getDerived().parseType();
35743536
if (!ElemType)
35753537
return nullptr;
3576-
return make<VectorType>(ElemType, StringView());
3538+
return make<VectorType>(ElemType, /*Dimension=*/nullptr);
35773539
}
35783540

35793541
// <decltype> ::= Dt <expression> E # decltype of an id-expression or class member access (C++0x)
@@ -3599,10 +3561,12 @@ Node *AbstractManglingParser<Derived, Alloc>::parseArrayType() {
35993561
if (!consumeIf('A'))
36003562
return nullptr;
36013563

3602-
NodeOrString Dimension;
3564+
Node *Dimension = nullptr;
36033565

36043566
if (std::isdigit(look())) {
3605-
Dimension = parseNumber();
3567+
Dimension = make<NameType>(parseNumber());
3568+
if (!Dimension)
3569+
return nullptr;
36063570
if (!consumeIf('_'))
36073571
return nullptr;
36083572
} else if (!consumeIf('_')) {

‎llvm/lib/Demangle/ItaniumDemangle.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ struct DumpVisitor {
8989
else
9090
printStr("<null>");
9191
}
92-
void print(NodeOrString NS) {
93-
if (NS.isNode())
94-
print(NS.asNode());
95-
else if (NS.isString())
96-
print(NS.asString());
97-
else
98-
printStr("NodeOrString()");
99-
}
10092
void print(NodeArray A) {
10193
++Depth;
10294
printStr("{");

‎llvm/lib/Support/ItaniumManglingCanonicalizer.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@ struct FoldingSetNodeIDBuilder {
3636
operator()(T V) {
3737
ID.AddInteger((unsigned long long)V);
3838
}
39-
void operator()(itanium_demangle::NodeOrString NS) {
40-
if (NS.isNode()) {
41-
ID.AddInteger(0);
42-
(*this)(NS.asNode());
43-
} else if (NS.isString()) {
44-
ID.AddInteger(1);
45-
(*this)(NS.asString());
46-
} else {
47-
ID.AddInteger(2);
48-
}
49-
}
5039
void operator()(itanium_demangle::NodeArray A) {
5140
ID.AddInteger(A.size());
5241
for (const Node *N : A)

0 commit comments

Comments
 (0)