From a01d24f9f644aaf4628772a5db7007edd1264b29 Mon Sep 17 00:00:00 2001
From: Evan Haas <evan@lagerdata.com>
Date: Fri, 5 Apr 2024 22:56:19 -0700
Subject: [PATCH] Preprocessor: trailing backslash in stringize output is
 allowed if escaped

---
 src/aro/Preprocessor.zig           | 21 ++++++++++++++++++---
 test/cases/stringify backslashes.c |  8 ++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 test/cases/stringify backslashes.c

diff --git a/src/aro/Preprocessor.zig b/src/aro/Preprocessor.zig
index dc7be1ff..5cac807a 100644
--- a/src/aro/Preprocessor.zig
+++ b/src/aro/Preprocessor.zig
@@ -1329,15 +1329,30 @@ fn stringify(pp: *Preprocessor, tokens: []const TokenWithExpansionLocs) !void {
                 try pp.char_buf.append(c);
         }
     }
-    if (pp.char_buf.items[pp.char_buf.items.len - 1] == '\\') {
+    try pp.char_buf.ensureUnusedCapacity(2);
+    if (pp.char_buf.items[pp.char_buf.items.len - 1] != '\\') {
+        pp.char_buf.appendSliceAssumeCapacity("\"\n");
+        return;
+    }
+    pp.char_buf.appendAssumeCapacity('"');
+    var tokenizer: Tokenizer = .{
+        .buf = pp.char_buf.items,
+        .index = 0,
+        .source = .generated,
+        .langopts = pp.comp.langopts,
+        .line = 0,
+    };
+    const item = tokenizer.next();
+    if (item.id == .unterminated_string_literal) {
         const tok = tokens[tokens.len - 1];
         try pp.comp.addDiagnostic(.{
             .tag = .invalid_pp_stringify_escape,
             .loc = tok.loc,
         }, tok.expansionSlice());
-        pp.char_buf.items.len -= 1;
+        pp.char_buf.items.len -= 2; // erase unpaired backslash and appended end quote
+        pp.char_buf.appendAssumeCapacity('"');
     }
-    try pp.char_buf.appendSlice("\"\n");
+    pp.char_buf.appendAssumeCapacity('\n');
 }
 
 fn reconstructIncludeString(pp: *Preprocessor, param_toks: []const TokenWithExpansionLocs, embed_args: ?*[]const TokenWithExpansionLocs, first: TokenWithExpansionLocs) !?[]const u8 {
diff --git a/test/cases/stringify backslashes.c b/test/cases/stringify backslashes.c
new file mode 100644
index 00000000..2d7e7804
--- /dev/null
+++ b/test/cases/stringify backslashes.c	
@@ -0,0 +1,8 @@
+#define NO_ERROR_VALIDATION
+
+#define str(s) #s
+x[str()
+x[str(\)
+x[str(\\)
+x[str(\\\)
+x[str(\\\\)