llvm
diff --git a/‎clang/lib/Format/UnwrappedLineFormatter.cpp
Copy file name to clipboardExpand all lines: clang/lib/Format/UnwrappedLineFormatter.cpp
+2-2Lines changed: 2 additions & 2 deletions b/‎clang/lib/Format/UnwrappedLineFormatter.cpp
Copy file name to clipboardExpand all lines: clang/lib/Format/UnwrappedLineFormatter.cpp
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎clang/unittests/Format/FormatTest.cpp
Copy file name to clipboardExpand all lines: clang/unittests/Format/FormatTest.cpp
+7Lines changed: 7 additions & 0 deletions b/‎clang/unittests/Format/FormatTest.cpp
Copy file name to clipboardExpand all lines: clang/unittests/Format/FormatTest.cpp
+7Lines changed: 7 additions & 0 deletions
@@ -314,8 +314,8 @@ class LineJoiner {
           const AnnotatedLine *Line = nullptr;
           for (auto J = I - 1; J >= AnnotatedLines.begin(); --J) {
             assert(*J);
-            if ((*J)->InPPDirective || (*J)->isComment() ||
-                (*J)->Level > TheLine->Level) {
+            if (((*J)->InPPDirective && !(*J)->InMacroBody) ||
+                (*J)->isComment() || (*J)->Level > TheLine->Level) {
               continue;
             }
             if ((*J)->Level < TheLine->Level ||
 
@@ -15093,6 +15093,13 @@ TEST_F(FormatTest, PullInlineFunctionDefinitionsIntoSingleLine) {
                "};",
                MergeInlineOnly);
 
+  MergeInlineOnly.AlignEscapedNewlines = FormatStyle::ENAS_Left;
+  verifyFormat("#define Foo                \\\n"
+               "  struct S {               \\\n"
+               "    void foo() { return; } \\\n"
+               "  }",
+               MergeInlineOnly);
+
   // Also verify behavior when BraceWrapping.AfterFunction = true
   MergeInlineOnly.BreakBeforeBraces = FormatStyle::BS_Custom;
   MergeInlineOnly.BraceWrapping.AfterFunction = true;