Handle _Static_assert gracefully. Closes #276 (#277)

* Warn that static asserts are not transpiled * Include message when iterating children of StaticAssert * Fix handling of message in VisitStaticAssertDecl * Formatting fix in c2rust-transpile/src/c_ast/iterators.rs Co-authored-by: ahomescu <[email protected]> * Update c2rust-transpile/src/c_ast/iterators.rs Co-authored-by: ahomescu <[email protected]> * Update c2rust-transpile/src/c_ast/iterators.rs Co-authored-by: ahomescu <[email protected]> * Clean up VisitStaticAssertDecl Co-authored-by: ahomescu <[email protected]>
immunant · Jul 9, 2020 · c04009f · c04009f
1 parent 9108a10
commit c04009f
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 0 deletions.
diff --git a/c2rust-ast-exporter/src/AstExporter.cpp b/c2rust-ast-exporter/src/AstExporter.cpp
@@ -857,6 +857,15 @@ class TranslateASTVisitor final
         abort();
     }
 
+    bool VisitStaticAssertDecl(StaticAssertDecl *SAD) {
+        std::vector<void *> childIds = {SAD->getAssertExpr()};
+        auto msg = SAD->getMessage();
+        if (msg != nullptr)
+            childIds.push_back(msg);
+        encode_entry(SAD, TagStaticAssertDecl, childIds, QualType()); // 4th argument unused
+        return true;
+    }
+
     bool VisitLabelStmt(LabelStmt *LS) {
 
         std::vector<void *> childIds = {LS->getSubStmt()};

diff --git a/c2rust-ast-exporter/src/ast_tags.hpp b/c2rust-ast-exporter/src/ast_tags.hpp
@@ -23,6 +23,8 @@ enum ASTEntryTag {
 
     TagNonCanonicalDecl,
 
+    TagStaticAssertDecl,
+
     TagMacroObjectDef,
     TagMacroFunctionDef,
 

diff --git a/c2rust-transpile/src/c_ast/conversion.rs b/c2rust-transpile/src/c_ast/conversion.rs
@@ -2036,6 +2036,19 @@ impl ConversionContext {
                     self.processed_nodes.insert(new_id, OTHER_DECL);
                 }
 
+                ASTEntryTag::TagStaticAssertDecl if expected_ty & DECL != 0 => {
+                    let assert_expr = CExprId(node.children[0]
+                        .expect("StaticAssert must point to an expression"));
+                    let message = if node.children.len() > 1 {
+                        Some(CExprId(node.children[1]
+                            .expect("Expected static assert message")))
+                    } else {
+                        None
+                    };
+                    let static_assert = CDeclKind::StaticAssert{ assert_expr, message };
+                    self.add_decl(new_id, located(node, static_assert));
+                }
+
                 t => panic!("Could not translate node {:?} as type {}", t, expected_ty),
             }
         }

diff --git a/c2rust-transpile/src/c_ast/iterators.rs b/c2rust-transpile/src/c_ast/iterators.rs
@@ -174,6 +174,13 @@ fn immediate_decl_children(kind: &CDeclKind) -> Vec<SomeId> {
         Field { typ, .. } => intos![typ.ctype],
         MacroObject { .. } | MacroFunction { .. } => vec![],
         NonCanonicalDecl { canonical_decl } => intos![canonical_decl],
+        StaticAssert { assert_expr, message } => {
+            if let Some(message) = message {
+                intos![assert_expr, message]
+            } else {
+                intos![assert_expr]
+            }
+        },
     }
 }
 

diff --git a/c2rust-transpile/src/c_ast/mod.rs b/c2rust-transpile/src/c_ast/mod.rs
@@ -947,6 +947,11 @@ pub enum CDeclKind {
 
     NonCanonicalDecl {
         canonical_decl: CDeclId,
+    },
+
+    StaticAssert {
+        assert_expr: CExprId,
+        message: Option<CExprId>
     }
 }
 

diff --git a/c2rust-transpile/src/c_ast/print.rs b/c2rust-transpile/src/c_ast/print.rs
@@ -743,6 +743,10 @@ impl<W: Write> Printer<W> {
                 }
             }
 
+            Some(&CDeclKind::StaticAssert { .. }) => {
+                self.writer.write_fmt(format_args!("static_assert(...)"))
+            }
+
             None => panic!("Could not find declaration with ID {:?}", decl_id),
             // _ => unimplemented!("Printer::print_decl"),
         }

diff --git a/c2rust-transpile/src/translator/mod.rs b/c2rust-transpile/src/translator/mod.rs
@@ -2009,6 +2009,11 @@ impl<'c> Translation<'c> {
             // Do not translate non-canonical decls. They will be translated at
             // their canonical declaration.
             CDeclKind::NonCanonicalDecl { .. } => Ok(ConvertedDecl::NoItem),
+
+            CDeclKind::StaticAssert { .. } => {
+                warn!("ignoring static assert during translation");
+                Ok(ConvertedDecl::NoItem)
+            }
         }
     }