Parse C _Noreturn specifiers

Author: robertoraggi

packages/cxx-frontend/src/AST.ts

@@ -8737,6 +8737,31 @@ export class InlineSpecifierAST extends SpecifierAST {
   }
 }
 
+/**
+ * NoreturnSpecifierAST node.
+ */
+export class NoreturnSpecifierAST extends SpecifierAST {
+  /**
+   * Traverse this node using the given visitor.
+   * @param visitor the visitor.
+   * @param context the context.
+   * @returns the result of the visit.
+   */
+  accept<Context, Result>(
+    visitor: ASTVisitor<Context, Result>,
+    context: Context,
+  ): Result {
+    return visitor.visitNoreturnSpecifier(this, context);
+  }
+
+  /**
+   * Returns the location of the noreturn token in this node
+   */
+  getNoreturnToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 0), this.parser);
+  }
+}
+
 /**
  * StaticSpecifierAST node.
  */
@@ -13015,6 +13040,7 @@ const AST_CONSTRUCTORS: Array<
   ConstinitSpecifierAST,
   ConstexprSpecifierAST,
   InlineSpecifierAST,
+  NoreturnSpecifierAST,
   StaticSpecifierAST,
   ExternSpecifierAST,
   ThreadLocalSpecifierAST,

packages/cxx-frontend/src/ASTKind.ts

@@ -181,6 +181,7 @@ export enum ASTKind {
   ConstinitSpecifier,
   ConstexprSpecifier,
   InlineSpecifier,
+  NoreturnSpecifier,
   StaticSpecifier,
   ExternSpecifier,
   ThreadLocalSpecifier,

packages/cxx-frontend/src/ASTSlot.ts

@@ -166,87 +166,88 @@ export enum ASTSlot {
   newLoc = 144,
   newPlacement = 145,
   noexceptLoc = 146,
-  offsetofLoc = 147,
-  op = 148,
-  opLoc = 149,
-  openLoc = 150,
-  operatorFunctionId = 151,
-  operatorLoc = 152,
-  otherVirtualOrAccessLoc = 153,
-  outputOperandList = 154,
-  parameterDeclarationClause = 155,
-  parameterDeclarationList = 156,
-  privateLoc = 157,
-  privateModuleFragment = 158,
-  ptrOpList = 159,
-  qualifier = 160,
-  qualifierLoc = 161,
-  questionLoc = 162,
-  rangeDeclaration = 163,
-  rangeInitializer = 164,
-  rbraceLoc = 165,
-  rbracket2Loc = 166,
-  rbracketLoc = 167,
-  refLoc = 168,
-  refOp = 169,
-  refQualifierLoc = 170,
-  requirementList = 171,
-  requiresClause = 172,
-  requiresLoc = 173,
-  restrictLoc = 174,
-  returnLoc = 175,
-  rightExpression = 176,
-  rparen2Loc = 177,
-  rparenLoc = 178,
-  scopeLoc = 179,
-  secondColonLoc = 180,
-  semicolonLoc = 181,
-  sizeExpression = 182,
-  sizeofLoc = 183,
-  specifier = 184,
-  specifierLoc = 185,
-  splicer = 186,
-  starLoc = 187,
-  statement = 188,
-  statementList = 189,
-  staticAssertLoc = 190,
-  staticLoc = 191,
-  stringLiteral = 192,
-  stringliteralLoc = 193,
-  switchLoc = 194,
-  symbolicName = 195,
-  symbolicNameLoc = 196,
-  templateArgumentList = 197,
-  templateId = 198,
-  templateLoc = 199,
-  templateParameterList = 200,
-  templateRequiresClause = 201,
-  thisLoc = 202,
-  threadLoc = 203,
-  threadLocalLoc = 204,
-  throwLoc = 205,
-  tildeLoc = 206,
-  trailingReturnType = 207,
-  tryLoc = 208,
-  typeConstraint = 209,
-  typeId = 210,
-  typeIdList = 211,
-  typeLoc = 212,
-  typeSpecifier = 213,
-  typeSpecifierList = 214,
-  typeTraitLoc = 215,
-  typedefLoc = 216,
-  typeidLoc = 217,
-  typenameLoc = 218,
-  underlyingTypeLoc = 219,
-  unqualifiedId = 220,
-  usingDeclaratorList = 221,
-  usingLoc = 222,
-  vaArgLoc = 223,
-  virtualLoc = 224,
-  virtualOrAccessLoc = 225,
-  voidLoc = 226,
-  volatileLoc = 227,
-  whileLoc = 228,
-  yieldLoc = 229,
+  noreturnLoc = 147,
+  offsetofLoc = 148,
+  op = 149,
+  opLoc = 150,
+  openLoc = 151,
+  operatorFunctionId = 152,
+  operatorLoc = 153,
+  otherVirtualOrAccessLoc = 154,
+  outputOperandList = 155,
+  parameterDeclarationClause = 156,
+  parameterDeclarationList = 157,
+  privateLoc = 158,
+  privateModuleFragment = 159,
+  ptrOpList = 160,
+  qualifier = 161,
+  qualifierLoc = 162,
+  questionLoc = 163,
+  rangeDeclaration = 164,
+  rangeInitializer = 165,
+  rbraceLoc = 166,
+  rbracket2Loc = 167,
+  rbracketLoc = 168,
+  refLoc = 169,
+  refOp = 170,
+  refQualifierLoc = 171,
+  requirementList = 172,
+  requiresClause = 173,
+  requiresLoc = 174,
+  restrictLoc = 175,
+  returnLoc = 176,
+  rightExpression = 177,
+  rparen2Loc = 178,
+  rparenLoc = 179,
+  scopeLoc = 180,
+  secondColonLoc = 181,
+  semicolonLoc = 182,
+  sizeExpression = 183,
+  sizeofLoc = 184,
+  specifier = 185,
+  specifierLoc = 186,
+  splicer = 187,
+  starLoc = 188,
+  statement = 189,
+  statementList = 190,
+  staticAssertLoc = 191,
+  staticLoc = 192,
+  stringLiteral = 193,
+  stringliteralLoc = 194,
+  switchLoc = 195,
+  symbolicName = 196,
+  symbolicNameLoc = 197,
+  templateArgumentList = 198,
+  templateId = 199,
+  templateLoc = 200,
+  templateParameterList = 201,
+  templateRequiresClause = 202,
+  thisLoc = 203,
+  threadLoc = 204,
+  threadLocalLoc = 205,
+  throwLoc = 206,
+  tildeLoc = 207,
+  trailingReturnType = 208,
+  tryLoc = 209,
+  typeConstraint = 210,
+  typeId = 211,
+  typeIdList = 212,
+  typeLoc = 213,
+  typeSpecifier = 214,
+  typeSpecifierList = 215,
+  typeTraitLoc = 216,
+  typedefLoc = 217,
+  typeidLoc = 218,
+  typenameLoc = 219,
+  underlyingTypeLoc = 220,
+  unqualifiedId = 221,
+  usingDeclaratorList = 222,
+  usingLoc = 223,
+  vaArgLoc = 224,
+  virtualLoc = 225,
+  virtualOrAccessLoc = 226,
+  voidLoc = 227,
+  volatileLoc = 228,
+  whileLoc = 229,
+  yieldLoc = 230,
 }

packages/cxx-frontend/src/ASTVisitor.ts

@@ -1753,6 +1753,18 @@ export abstract class ASTVisitor<Context, Result> {
     context: Context,
   ): Result;
 
+  /**
+   * Visit NoreturnSpecifier node.
+   *
+   * @param node The node to visit.
+   * @param context The context.
+   * @returns The result of the visit.
+   */
+  abstract visitNoreturnSpecifier(
+    node: ast.NoreturnSpecifierAST,
+    context: Context,
+  ): Result;
+
   /**
    * Visit StaticSpecifier node.
    *

packages/cxx-frontend/src/RecursiveASTVisitor.ts

@@ -1926,6 +1926,17 @@ export class RecursiveASTVisitor<Context> extends ASTVisitor<Context, void> {
    */
   visitInlineSpecifier(node: ast.InlineSpecifierAST, context: Context): void {}
 
+  /**
+   * Visit a NoreturnSpecifier node.
+   *
+   * @param node The node to visit.
+   * @param context The context.
+   */
+  visitNoreturnSpecifier(
+    node: ast.NoreturnSpecifierAST,
+    context: Context,
+  ): void {}
+
   /**
    * Visit a StaticSpecifier node.
    *

src/mlir/cxx/mlir/codegen.cc

@@ -332,6 +332,8 @@ struct Codegen::SpecifierVisitor {
 
   [[nodiscard]] auto operator()(InlineSpecifierAST* ast) -> SpecifierResult;
 
+  [[nodiscard]] auto operator()(NoreturnSpecifierAST* ast) -> SpecifierResult;
+
   [[nodiscard]] auto operator()(StaticSpecifierAST* ast) -> SpecifierResult;
 
   [[nodiscard]] auto operator()(ExternSpecifierAST* ast) -> SpecifierResult;
@@ -2247,6 +2249,11 @@ auto Codegen::SpecifierVisitor::operator()(InlineSpecifierAST* ast)
   return {};
 }
 
+auto Codegen::SpecifierVisitor::operator()(NoreturnSpecifierAST* ast)
+    -> SpecifierResult {
+  return {};
+}
+
 auto Codegen::SpecifierVisitor::operator()(StaticSpecifierAST* ast)
     -> SpecifierResult {
   return {};

src/parser/cxx/ast.cc

@@ -2296,6 +2296,16 @@ auto InlineSpecifierAST::lastSourceLocation() -> SourceLocation {
   return {};
 }
 
+auto NoreturnSpecifierAST::firstSourceLocation() -> SourceLocation {
+  if (auto loc = cxx::firstSourceLocation(noreturnLoc)) return loc;
+  return {};
+}
+
+auto NoreturnSpecifierAST::lastSourceLocation() -> SourceLocation {
+  if (auto loc = cxx::lastSourceLocation(noreturnLoc)) return loc;
+  return {};
+}
+
 auto StaticSpecifierAST::firstSourceLocation() -> SourceLocation {
   if (auto loc = cxx::firstSourceLocation(staticLoc)) return loc;
   return {};
@@ -3607,6 +3617,7 @@ std::string_view kASTKindNames[] = {
     "constinit-specifier",
     "constexpr-specifier",
     "inline-specifier",
+    "noreturn-specifier",
     "static-specifier",
     "extern-specifier",
     "thread-local-specifier",

src/parser/cxx/ast.fbs

@@ -241,6 +241,7 @@ union Specifier {
   ConstinitSpecifier,
   ConstexprSpecifier,
   InlineSpecifier,
+  NoreturnSpecifier,
   StaticSpecifier,
   ExternSpecifier,
   ThreadLocalSpecifier,
@@ -1445,6 +1446,10 @@ table InlineSpecifier /* SpecifierAST */ {
   inline_loc: uint32;
 }
 
+table NoreturnSpecifier /* SpecifierAST */ {
+  noreturn_loc: uint32;
+}
+
 table StaticSpecifier /* SpecifierAST */ {
   static_loc: uint32;
 }

src/parser/cxx/ast.h

@@ -2818,6 +2818,20 @@ class InlineSpecifierAST final : public SpecifierAST {
   auto lastSourceLocation() -> SourceLocation override;
 };
 
+class NoreturnSpecifierAST final : public SpecifierAST {
+ public:
+  static constexpr ASTKind Kind = ASTKind::NoreturnSpecifier;
+
+  NoreturnSpecifierAST() : SpecifierAST(Kind) {}
+
+  SourceLocation noreturnLoc;
+
+  void accept(ASTVisitor* visitor) override { visitor->visit(this); }
+
+  auto firstSourceLocation() -> SourceLocation override;
+  auto lastSourceLocation() -> SourceLocation override;
+};
+
 class StaticSpecifierAST final : public SpecifierAST {
  public:
   static constexpr ASTKind Kind = ASTKind::StaticSpecifier;
@@ -4768,6 +4782,9 @@ auto visit(Visitor&& visitor, SpecifierAST* ast) {
     case InlineSpecifierAST::Kind:
       return std::invoke(std::forward<Visitor>(visitor),
                          static_cast<InlineSpecifierAST*>(ast));
+    case NoreturnSpecifierAST::Kind:
+      return std::invoke(std::forward<Visitor>(visitor),
+                         static_cast<NoreturnSpecifierAST*>(ast));
     case StaticSpecifierAST::Kind:
       return std::invoke(std::forward<Visitor>(visitor),
                          static_cast<StaticSpecifierAST*>(ast));
@@ -4871,6 +4888,7 @@ template <>
     case ConstinitSpecifierAST::Kind:
     case ConstexprSpecifierAST::Kind:
     case InlineSpecifierAST::Kind:
+    case NoreturnSpecifierAST::Kind:
     case StaticSpecifierAST::Kind:
     case ExternSpecifierAST::Kind:
     case ThreadLocalSpecifierAST::Kind:

src/parser/cxx/ast_fwd.h

@@ -240,6 +240,7 @@ class ConstevalSpecifierAST;
 class ConstinitSpecifierAST;
 class ConstexprSpecifierAST;
 class InlineSpecifierAST;
+class NoreturnSpecifierAST;
 class StaticSpecifierAST;
 class ExternSpecifierAST;
 class ThreadLocalSpecifierAST;