Test class instance size and alignment

Author: robertoraggi

src/parser/cxx/ast_rewriter.cc

@@ -1199,6 +1199,8 @@ auto ASTRewriter::operator()(BaseSpecifierAST* ast) -> BaseSpecifierAST* {
   copy->accessSpecifier = ast->accessSpecifier;
   copy->symbol = ast->symbol;
 
+  binder_.bind(ast);
+
   return copy;
 }
 
@@ -3784,6 +3786,10 @@ auto ASTRewriter::SpecifierVisitor::operator()(ClassSpecifierAST* ast)
     auto value = rewrite(node);
     *baseSpecifierList = make_list_node(arena(), value);
     baseSpecifierList = &(*baseSpecifierList)->next;
+
+    if (value->symbol) {
+      classSymbol->addBaseClass(value->symbol);
+    }
   }
 
   copy->lbraceLoc = ast->lbraceLoc;
@@ -3800,6 +3806,8 @@ auto ASTRewriter::SpecifierVisitor::operator()(ClassSpecifierAST* ast)
   // copy->symbol = ast->symbol; // TODO: remove done by the binder
   copy->isFinal = ast->isFinal;
 
+  binder()->complete(copy);
+
   return copy;
 }
 

src/parser/cxx/symbol_printer.cc

@@ -100,6 +100,11 @@ struct DumpSymbols {
     } else {
       out << std::format("{} {}\n", classKey, to_string(symbol->name()));
     }
+    for (auto baseClass : symbol->baseClasses()) {
+      ++depth;
+      visit(*this, baseClass);
+      --depth;
+    }
     if (!symbol->constructors().empty()) {
       ++depth;
       for (auto constructor : symbol->constructors()) {

tests/api_tests/test_rewriter.cc

@@ -259,8 +259,12 @@ const auto N = S<0, 1, 2>;
 
 TEST(Rewriter, Class) {
   auto source = R"(
+struct Base {
+  int x;
+};
+
 template <typename T1, typename T2>
-struct Pair {
+struct Pair : Base {
   T1 first;
   T2 second;
   auto operator=(const Pair& other) -> Pair&;
@@ -309,8 +313,12 @@ using Pair1 = Pair<int, float*>;
   dump(os, classDeclInstance->symbol);
 
   ASSERT_EQ(os.str(), R"(class Pair
+  base class Base
   field int first
   field float* second
   function ::Pair& operator =(const ::Pair&)
 )");
-}
+
+  ASSERT_EQ(classInstance->sizeInBytes(), 12);
+  ASSERT_EQ(classInstance->alignment(), 4);
+}

tests/api_tests/test_utils.h

@@ -47,7 +47,7 @@ struct Source {
 
   explicit Source(std::string_view source, bool templateInstantiation = true) {
     // default to wasm32 memory layout
-    auto memoryLayout = std::make_unique<MemoryLayout>(32);
+    memoryLayout = std::make_unique<MemoryLayout>(32);
 
     unit.control()->setMemoryLayout(memoryLayout.get());
 

tests/unit_tests/sema/using_decl_01.cc

@@ -36,9 +36,9 @@ auto main() -> int {
 // CHECK-NEXT:    function  operator bool() const
 // CHECK-NEXT:    function void f()
 // CHECK-NEXT:  class Derived
+// CHECK-NEXT:    base class Base
 // CHECK-NEXT:    using  operator bool() const
 // CHECK-NEXT:    using void f()
 // CHECK-NEXT:  function int main()
 // CHECK-NEXT:    block
 // CHECK-NEXT:      using decltype(nullptr) nullptr_t
-