Merge pull request #646 from andreasfertig/fixIssue644

Fixed #644: Handle `AttributeStmt` with sub statements.

CodeGenerator.cpp

@@ -3626,6 +3626,8 @@ void CodeGenerator::InsertArg(const AttributedStmt* stmt)
     for(const auto& attr : stmt->getAttrs()) {
         InsertAttribute(*attr);
     }
+
+    InsertArg(stmt->getSubStmt());
 }
 //-----------------------------------------------------------------------------
 
@@ -5003,7 +5005,7 @@ void CodeGenerator::WrapInParensOrCurlys(const BraceKind        braceKind,
 
 void CodeGenerator::WrapInCompoundIfNeeded(const Stmt* stmt, const AddNewLineAfter addNewLineAfter)
 {
-    const bool hasNoCompoundStmt = not isa<CompoundStmt>(stmt);
+    const bool hasNoCompoundStmt = not(isa<CompoundStmt>(stmt) or isa<AttributedStmt>(stmt));
 
     if(hasNoCompoundStmt) {
         mOutputFormatHelper.OpenScope();
@@ -5012,8 +5014,13 @@ void CodeGenerator::WrapInCompoundIfNeeded(const Stmt* stmt, const AddNewLineAft
     if(not isa<NullStmt>(stmt)) {
         InsertArg(stmt);
 
+        const bool isAttrWithCompound{[&] {
+            auto* attrStmt = dyn_cast_or_null<AttributedStmt>(stmt);
+            return attrStmt and isa<CompoundStmt>(attrStmt->getSubStmt());
+        }()};
+
         // Add semi-colon if necessary. A do{} while does already add one.
-        if(IsStmtRequiringSemi<IfStmt, CompoundStmt, NullStmt, WhileStmt, DoStmt>(stmt)) {
+        if(IsStmtRequiringSemi<IfStmt, CompoundStmt, NullStmt, WhileStmt, DoStmt>(stmt) and not isAttrWithCompound) {
             mOutputFormatHelper.AppendSemiNewLine();
         }
     }

tests/Issue644.cpp

@@ -0,0 +1,22 @@
+// cmdline:-std=c++20
+
+int main(int argc, char* argv[])
+{
+    if(argc) [[likely]] 
+        return 5;
+    else 
+        return 8;
+
+    if(argc) [[likely]] {
+        return 5;
+    } else {
+        return 8;
+    }
+
+
+    switch(argc) {
+        case 1: return 6;
+        [[likely]] case 2: return 9;
+    }
+
+}

tests/Issue644.expect

@@ -0,0 +1,19 @@
+int main(int argc, char ** argv)
+{
+  if(static_cast<bool>(argc)) [[likely]] return 5;
+   else {
+    return 8;
+  } 
+
+  if(static_cast<bool>(argc)) [[likely]] {
+    return 5;
+  } else {
+    return 8;
+  } 
+
+  switch(argc) {
+    case 1: return 6;
+    [[likely]] case 2: return 9;
+  }
+  return 0;
+}