Add attributed stmt

include/vast/CodeGen/ClangVisitorBase.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2022-present, Trail of Bits, Inc.
 
 #pragma once
 
@@ -90,6 +90,12 @@
             };
         }
 
+        auto mk_region_builder(const clang_stmt *stmt) {
+            return [this, stmt] (auto &bld, auto) {
+                self.visit(stmt);
+            };
+        }
+
         auto mk_optional_region_builder(const clang_stmt *stmt) {
             return [this, stmt] (auto &bld, auto) {
                 if (stmt) self.visit(stmt);

include/vast/CodeGen/DefaultAttrVisitor.hpp

@@ -56,6 +56,7 @@ namespace vast::cg {
         mlir_attr VisitMaxFieldAlignmentAttr(const clang::MaxFieldAlignmentAttr *attr);
         mlir_attr VisitAvailableOnlyInDefaultEvalMethodAttr(const clang::AvailableOnlyInDefaultEvalMethodAttr *attr);
         mlir_attr VisitAvailabilityAttr(const clang::AvailabilityAttr *attr);
+        mlir_attr VisitFallThroughAttr(const clang::FallThroughAttr *attr);
 
       private:
         template< typename attr_t, typename... args_t >

include/vast/CodeGen/DefaultStmtVisitor.hpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2022-present, Trail of Bits, Inc.
 
 #pragma once
 
@@ -278,6 +278,8 @@
 
         operation VisitInitListExpr(const clang::InitListExpr *expr);
         operation VisitImplicitValueInitExpr(const clang::ImplicitValueInitExpr *expr);
+
+        operation VisitAttributedStmt(const clang::AttributedStmt *stmt);
         protected:
             acontext_t &actx;
     };

include/vast/Dialect/HighLevel/HighLevelAttributes.td

@@ -61,6 +61,7 @@ def HighLevel_NoCfCheckAttr        : HighLevel_Attr< "NoCfCheck", "nocf_check" >
 def HighLevel_AvailableOnlyInDefaultEvalMethodAttr
   : HighLevel_Attr< "AvailableOnlyInDefaultEvalMethod", "available_only_in_default_eval_method" >;
 def HighLevel_AvailabilityAttr     : HighLevel_Attr< "AvailabilityAttr", "availability" >;
+def HighLevel_FallthroughAttr      : HighLevel_Attr< "Fallthrough", "fallthrough" >;
 
 def HighLevel_AsmLabelAttr
   : HighLevel_Attr< "AsmLabel", "asm" >

include/vast/Dialect/HighLevel/HighLevelOps.td

@@ -1613,4 +1613,23 @@ def HighLevel_StaticAssertDecl
   let assemblyFormat = "`failed` `:` $failed $assert (`,` $message^)? attr-dict";
 }
 
+def HighLevel_AttributedStmt
+  : HighLevel_Op< "attributed_stmt", [NoTerminator] >
+{
+  let summary = "Attributed stmt operation.";
+
+  let regions = (region AnyRegion:$body);
+
+  let skipDefaultBuilders = 1;
+  let builders = [
+  OpBuilder< (ins CArg< "builder_callback_ref" >:$bodyBuilder),
+     [{
+      InsertionGuard guard($_builder);
+      build_region($_builder, $_state, bodyBuilder);
+    }] >
+  ];
+
+  let assemblyFormat = [{ attr-dict `:` $body }];
+}
+
 #endif // VAST_DIALECT_HIGHLEVEL_IR_HIGHLEVELOPS

lib/vast/CodeGen/DefaultAttrVisitor.cpp

@@ -149,4 +149,7 @@ namespace vast::cg
         return make< hl::AvailabilityAttrAttr >();
     }
 
+    mlir_attr default_attr_visitor::VisitFallThroughAttr(const clang::FallThroughAttr *attr) {
+        return make< hl::FallthroughAttr >();
+    }
 } // namespace vast::hcg

lib/vast/CodeGen/DefaultStmtVisitor.cpp

@@ -1,4 +1,4 @@
 // Copyright (c) 2022-present, Trail of Bits, Inc.
 
 #include "vast/Util/Warnings.hpp"
 
@@ -1116,4 +1116,24 @@
             .freeze();
     }
 
+    operation default_stmt_visitor::VisitAttributedStmt(const clang::AttributedStmt *stmt) {
+        auto attr_stmt = bld.compose< hl::AttributedStmt >()
+            .bind(self.location(stmt))
+            .bind(mk_region_builder(stmt->getSubStmt()))
+            .freeze();
+
+        mlir_attr_list attrs;
+
+        // This is not handled by default, because statements usually do not have attributes
+        for (auto attr : stmt->getAttrs()) {
+            if (auto visited = self.visit(attr)) {
+                attrs.set(visited->getName(), visited->getValue());
+            }
+        }
+
+        attr_stmt->setAttrs(attrs);
+
+        return attr_stmt;
+    }
+
 } // namespace vast::cg

test/vast/Dialect/HighLevel/attr-stmt-a.c

@@ -0,0 +1,17 @@
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %file-check %s
+// RUN: %vast-cc1 -vast-emit-mlir=hl %s -o %t && %vast-opt %t | diff -B %t -
+
+void f() {
+    int x;
+    switch (1) {
+        case 1:
+            x = 1;
+// CHECK: hl.attributed_stmt {hl.fallthrough = #hl.fallthrough} : {
+// CHECK: hl.null
+// CHECK: }
+            [[fallthrough]];
+        case 2:
+            x = 2;
+            break;
+    }
+}