[SR-15231] #sourceLocation doesn't recognize CRLF line endings swiftlang#57553 (swiftlang#63071)

Author: grynspan

lib/Parse/ParseDecl.cpp

@@ -6193,18 +6193,24 @@ ParserStatus Parser::parseLineDirective(bool isLine) {
 
   const char *LastTokTextEnd = Tok.getText().end();
 
-  // Skip over trailing whitespace and a single \n to the start of the next
-  // line.
+  // Skip over trailing whitespace and a single \r and/or \n to the start of the
+  // next line.
   while (*LastTokTextEnd == ' ' || *LastTokTextEnd == '\t')
     ++LastTokTextEnd;
-  SourceLoc nextLineStartLoc = Lexer::getSourceLoc(LastTokTextEnd);
-  
-  if (*LastTokTextEnd == '\n')
-    nextLineStartLoc = nextLineStartLoc.getAdvancedLoc(1);
-  else {
+  bool hadCROrLF = false;
+  if (*LastTokTextEnd == '\r') {
+    hadCROrLF = true;
+    ++LastTokTextEnd;
+  }
+  if (*LastTokTextEnd == '\n') {
+    hadCROrLF = true;
+    ++LastTokTextEnd;
+  }
+  if (!hadCROrLF) {
     diagnose(Tok.getLoc(), diag::extra_tokens_line_directive);
     return makeParserError();
   }
+  SourceLoc nextLineStartLoc = Lexer::getSourceLoc(LastTokTextEnd);
 
   int LineOffset =
       StartLine - SourceMgr.getLineAndColumnInBuffer(nextLineStartLoc).first;

test/Parse/line-directive-crlf.swift.gyb

@@ -0,0 +1,13 @@
+// RUN: %empty-directory(%t)
+// RUN: %gyb %s -o %t/line-directive-crlf.swift
+// RUN: %target-swift-frontend -typecheck -parse-as-library -verify %t/line-directive-crlf.swift
+
+// https://github.com/apple/swift/issues/57553
+func I57553() {
+% print("#sourceLocation(file: \"issue-57553.swift\", line: 100)\r\n")
+% print("#sourceLocation()\r\n")
+% print("#sourceLocation(file: \"issue-57553.swift\", line: 200)\r")
+% print("#sourceLocation()\r")
+% print("#sourceLocation(file: \"issue-57553.swift\", line: 300)\n")
+% print("#sourceLocation()\n")
+}