1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index c8dc7bf55c..742b9a8d1c 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -1427,7 +1427,8 @@ private:
                                  std::vector<AnnotatedLine>::iterator E,
                                  unsigned Limit) {
     AnnotatedLine &Line = *I;
-    if (!(I + 1)->InPPDirective) return;
+    if (!(I + 1)->InPPDirective || (I + 1)->First.FormatTok.HasUnescapedNewline)
+      return;
     if (I + 2 != E && (I + 2)->InPPDirective &&
         !(I + 2)->First.FormatTok.HasUnescapedNewline)
       return;