commit ca5ea31303ab80c79d5ff2cff7e47e02e287f03c
author Senran Zhang <zsrkmyn@gmail.com> Sun Mar 27 00:04:23 2022 +0800
committer Copybara-Service <copybara-worker@google.com> Thu Apr 07 21:26:04 2022 -0700
tree df3636cc827be6ac088afba34bcf4785f6868a1e
parent 71cdbada2726bf0161fb9b34b7ecd2b2e6be593d

[demangler] Support C23 _BitInt type

Reviewed By: #libc_abi, aaron.ballman, urnathan

Differential Revision: https://reviews.llvm.org/D122530

GitOrigin-RevId: a23652f6f9d8bcdeb7eee81c45eaf3ae65cfb3c5

src/demangle/ItaniumDemangle.h

diff --git a/src/demangle/ItaniumDemangle.h b/src/demangle/ItaniumDemangle.h
index 36fe26b..90f62ba 100644
--- a/src/demangle/ItaniumDemangle.h
+++ b/src/demangle/ItaniumDemangle.h
@@ -482,6 +482,26 @@
   void printLeft(OutputBuffer &OB) const override { OB += Name; }
 };
 
+class BitIntType final : public Node {
+  const Node *Size;
+  bool Signed;
+
+public:
+  BitIntType(const Node *Size_, bool Signed_)
+      : Node(KBitIntType), Size(Size_), Signed(Signed_) {}
+
+  template <typename Fn> void match(Fn F) const { F(Size, Signed); }
+
+  void printLeft(OutputBuffer &OB) const override {
+    if (!Signed)
+      OB += "unsigned ";
+    OB += "_BitInt";
+    OB.printOpen();
+    Size->printAsOperand(OB);
+    OB.printClose();
+  }
+};
+
 class ElaboratedTypeSpefType : public Node {
   StringView Kind;
   Node *Child;
@@ -3924,6 +3944,22 @@
         return nullptr;
       return make<BinaryFPType>(DimensionNumber);
     }
+    //                ::= DB <number> _                             # C23 signed _BitInt(N)
+    //                ::= DB <instantiation-dependent expression> _ # C23 signed _BitInt(N)
+    //                ::= DU <number> _                             # C23 unsigned _BitInt(N)
+    //                ::= DU <instantiation-dependent expression> _ # C23 unsigned _BitInt(N)
+    case 'B':
+    case 'U': {
+      bool Signed = look(1) == 'B';
+      First += 2;
+      Node *Size = std::isdigit(look()) ? make<NameType>(parseNumber())
+                                        : getDerived().parseExpr();
+      if (!Size)
+        return nullptr;
+      if (!consumeIf('_'))
+        return nullptr;
+      return make<BitIntType>(Size, Signed);
+    }
     //                ::= Di   # char32_t
     case 'i':
       First += 2;

src/demangle/ItaniumNodes.def

diff --git a/src/demangle/ItaniumNodes.def b/src/demangle/ItaniumNodes.def
index 1d71c5d..f615cb9 100644
--- a/src/demangle/ItaniumNodes.def
+++ b/src/demangle/ItaniumNodes.def
@@ -42,6 +42,7 @@
 NODE(VectorType)
 NODE(PixelVectorType)
 NODE(BinaryFPType)
+NODE(BitIntType)
 NODE(SyntheticTemplateParamName)
 NODE(TypeTemplateParamDecl)
 NODE(NonTypeTemplateParamDecl)

test/test_demangle.pass.cpp

diff --git a/test/test_demangle.pass.cpp b/test/test_demangle.pass.cpp
index 5282b01..a450f36 100644
--- a/test/test_demangle.pass.cpp
+++ b/test/test_demangle.pass.cpp
@@ -32,6 +32,10 @@
     {"_Z1A", "A"},
     {"_Z1Av", "A()"},
     {"_Z1A1B1C", "A(B, C)"},
+    {"_Z1fDB3_", "f(_BitInt(3))"},
+    {"_Z1fDU10_", "f(unsigned _BitInt(10))"},
+    {"_Z1fIfEvDUstPT__", "void f<float>(unsigned _BitInt(sizeof (float*)))"},
+    {"_Z1fIiEvDBstPT__", "void f<int>(_BitInt(sizeof (int*)))"},
     {"_Z4testI1A1BE1Cv", "C test<A, B>()"},
     {"_Z4testI1A1BET0_T_S3_", "B test<A, B>(A, A)"},
     {"_ZN1SgtEi", "S::operator>(int)"},