Merge pull request #17508 from graydon/rdar-41154797-multiline-pound-diagnostic

graydon · web-flow · commit 33d1fc91b929 · 2018-06-26T09:43:40.000-07:00
[Parse] &lt;rdar://41154797&gt; Detect eof in non-string-arg recovery loop in #error arg list.
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -3285,7 +3285,7 @@ ParserResult<PoundDiagnosticDecl> Parser::parseDeclPoundDiagnostic() {
     // Catch #warning(oops, forgot the quotes)
     SourceLoc wordsStartLoc = Tok.getLoc();
 
-    while (!Tok.isAtStartOfLine() && Tok.isNot(tok::r_paren)) {
+    while (!Tok.isAtStartOfLine() && !Tok.isAny(tok::r_paren, tok::eof)) {
       skipSingle();
     }
 
diff --git a/test/Parse/multiline_pound_diagnostic_arg_rdar_41154797.swift b/test/Parse/multiline_pound_diagnostic_arg_rdar_41154797.swift
@@ -0,0 +1,4 @@
+// RUN: not %target-typecheck-verify-swift
+
+#error("""
+

Original file line number	Diff line number	Diff line change
`@@ -3285,7 +3285,7 @@ ParserResult<PoundDiagnosticDecl> Parser::parseDeclPoundDiagnostic() {`
`3285`	`3285`	`// Catch #warning(oops, forgot the quotes)`
`3286`	`3286`	`SourceLoc wordsStartLoc = Tok.getLoc();`
`3287`	`3287`
`3288`		`- while (!Tok.isAtStartOfLine() && Tok.isNot(tok::r_paren)) {`
	`3288`	`+ while (!Tok.isAtStartOfLine() && !Tok.isAny(tok::r_paren, tok::eof)) {`
`3289`	`3289`	`skipSingle();`
`3290`	`3290`	`}`
`3291`	`3291`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +// RUN: not %target-typecheck-verify-swift
++
 +#error("""
++