Merge pull request #60720 from DougGregor/attribute-eof-parser-loop

DougGregor · web-flow · commit 714eee0f52a1 · 2022-08-23T06:48:05.000-07:00
diff --git a/include/swift/Parse/Parser.h b/include/swift/Parse/Parser.h
@@ -695,7 +695,7 @@ class Parser {
                      tok::pound_else, tok::pound_elseif,
                      tok::code_complete) &&
            !isStartOfStmt() &&
-           !isStartOfSwiftDecl(/*allowPoundIfAttributes=*/false)) {
+           !isStartOfSwiftDecl(/*allowPoundIfAttributes=*/true)) {
       skipSingle();
     }
   }
diff --git a/validation-test/compiler_crashers_2_fixed/0213-issue60702.swift b/validation-test/compiler_crashers_2_fixed/0213-issue60702.swift
@@ -0,0 +1,5 @@
+// RUN: not %target-swift-frontend -parse %s
+@
+#if true
+    print("x")
+#endif

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ class Parser {`
`695`	`695`	`tok::pound_else, tok::pound_elseif,`
`696`	`696`	`tok::code_complete) &&`
`697`	`697`	`!isStartOfStmt() &&`
`698`		`- !isStartOfSwiftDecl(/allowPoundIfAttributes=/false)) {`
	`698`	`+ !isStartOfSwiftDecl(/allowPoundIfAttributes=/true)) {`
`699`	`699`	`skipSingle();`
`700`	`700`	`}`
`701`	`701`	`}`