Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -540,6 +540,9 @@
   if (MacroBlock && FormatTok->is(tok::l_paren))
     parseParens();
 
+  if (MunchSemi && FormatTok->Tok.is(tok::semi))
+    nextToken();
+
   size_t NbPreprocessorDirectives =
       CurrentLines == &Lines ? PreprocessorDirectives.size() : 0;
   addUnwrappedLine();
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -3480,6 +3480,9 @@
                "  int x;\n"
                "  x = 1;\n"
                "FOO_END(Baz)", Style);
+  verifyFormat("FOO_BEGIN();\n"
+               "  FOO_ENTRY\n"
+               "FOO_END();", Style);
 }
 
 //===----------------------------------------------------------------------===//