chore: Add support for __builtin_offsetof and compound literals

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

packages/cxx-frontend/src/AST.ts

@@ -5153,6 +5153,72 @@ export class BuiltinBitCastExpressionAST extends ExpressionAST {
   }
 }
 
+/**
+ * BuiltinOffsetofExpressionAST node.
+ */
+export class BuiltinOffsetofExpressionAST extends ExpressionAST {
+  /**
+   * 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.visitBuiltinOffsetofExpression(this, context);
+  }
+
+  /**
+   * Returns the location of the offsetof token in this node
+   */
+  getOffsetofToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 0), this.parser);
+  }
+
+  /**
+   * Returns the location of the lparen token in this node
+   */
+  getLparenToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 1), this.parser);
+  }
+
+  /**
+   * Returns the typeId of this node
+   */
+  getTypeId(): TypeIdAST | undefined {
+    return AST.from<TypeIdAST>(
+      cxx.getASTSlot(this.getHandle(), 2),
+      this.parser,
+    );
+  }
+
+  /**
+   * Returns the location of the comma token in this node
+   */
+  getCommaToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 3), this.parser);
+  }
+
+  /**
+   * Returns the expression of this node
+   */
+  getExpression(): ExpressionAST | undefined {
+    return AST.from<ExpressionAST>(
+      cxx.getASTSlot(this.getHandle(), 4),
+      this.parser,
+    );
+  }
+
+  /**
+   * Returns the location of the rparen token in this node
+   */
+  getRparenToken(): Token | undefined {
+    return Token.from(cxx.getASTSlot(this.getHandle(), 5), this.parser);
+  }
+}
+
 /**
  * TypeidExpressionAST node.
  */
@@ -12703,6 +12769,7 @@ const AST_CONSTRUCTORS: Array<
   PostIncrExpressionAST,
   CppCastExpressionAST,
   BuiltinBitCastExpressionAST,
+  BuiltinOffsetofExpressionAST,
   TypeidExpressionAST,
   TypeidOfTypeExpressionAST,
   SpliceExpressionAST,

packages/cxx-frontend/src/ASTKind.ts

@@ -102,6 +102,7 @@ export enum ASTKind {
   PostIncrExpression,
   CppCastExpression,
   BuiltinBitCastExpression,
+  BuiltinOffsetofExpression,
   TypeidExpression,
   TypeidOfTypeExpression,
   SpliceExpression,

packages/cxx-frontend/src/ASTSlot.ts

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

packages/cxx-frontend/src/ASTVisitor.ts

@@ -925,6 +925,18 @@ export abstract class ASTVisitor<Context, Result> {
     context: Context,
   ): Result;
 
+  /**
+   * Visit BuiltinOffsetofExpression node.
+   *
+   * @param node The node to visit.
+   * @param context The context.
+   * @returns The result of the visit.
+   */
+  abstract visitBuiltinOffsetofExpression(
+    node: ast.BuiltinOffsetofExpressionAST,
+    context: Context,
+  ): Result;
+
   /**
    * Visit TypeidExpression node.
    *

packages/cxx-frontend/src/RecursiveASTVisitor.ts

@@ -1066,6 +1066,20 @@ export class RecursiveASTVisitor<Context> extends ASTVisitor<Context, void> {
     this.accept(node.getExpression(), context);
   }
 
+  /**
+   * Visit a BuiltinOffsetofExpression node.
+   *
+   * @param node The node to visit.
+   * @param context The context.
+   */
+  visitBuiltinOffsetofExpression(
+    node: ast.BuiltinOffsetofExpressionAST,
+    context: Context,
+  ): void {
+    this.accept(node.getTypeId(), context);
+    this.accept(node.getExpression(), context);
+  }
+
   /**
    * Visit a TypeidExpression node.
    *

packages/cxx-frontend/src/TokenKind.ts

@@ -172,6 +172,7 @@ export enum TokenKind {
   WHILE,
   __ATTRIBUTE__,
   __BUILTIN_BIT_CAST,
+  __BUILTIN_OFFSETOF,
   __BUILTIN_VA_ARG,
   __BUILTIN_VA_LIST,
   __COMPLEX__,

packages/cxx-gen-ast/src/tokens.ts

@@ -178,6 +178,7 @@ export const KEYWORDS: string[] = [
   "while",
   "__attribute__",
   "__builtin_bit_cast",
+  "__builtin_offsetof",
   "__builtin_va_arg",
   "__builtin_va_list",
   "__complex__",

src/frontend/cxx/ast_printer.cc

@@ -1025,6 +1025,12 @@ void ASTPrinter::visit(BuiltinBitCastExpressionAST* ast) {
   accept(ast->expression, "expression");
 }
 
+void ASTPrinter::visit(BuiltinOffsetofExpressionAST* ast) {
+  out_ << std::format("{}\n", "builtin-offsetof-expression");
+  accept(ast->typeId, "type-id");
+  accept(ast->expression, "expression");
+}
+
 void ASTPrinter::visit(TypeidExpressionAST* ast) {
   out_ << std::format("{}\n", "typeid-expression");
   accept(ast->expression, "expression");

src/frontend/cxx/ast_printer.h

@@ -121,6 +121,7 @@ class ASTPrinter : ASTVisitor {
   void visit(PostIncrExpressionAST* ast) override;
   void visit(CppCastExpressionAST* ast) override;
   void visit(BuiltinBitCastExpressionAST* ast) override;
+  void visit(BuiltinOffsetofExpressionAST* ast) override;
   void visit(TypeidExpressionAST* ast) override;
   void visit(TypeidOfTypeExpressionAST* ast) override;
   void visit(SpliceExpressionAST* ast) override;

src/lib/cxx/include/stddef.h

@@ -52,3 +52,7 @@ typedef int wint_t;
 #endif
 
 #endif /* __need_wint_t */
+
+#if !defined(offsetof)
+#define offsetof(t, d) __builtin_offsetof(t, d)
+#endif