ThisTokEnd -= ThisTokBuf - Prefix;
assert(ThisTokEnd >= ThisTokBuf && "malformed raw string literal");
- // Copy the string over
- if (CopyStringFragment(StringToks[i], ThisTokBegin,
- StringRef(ThisTokBuf, ThisTokEnd - ThisTokBuf)))
- hadError = true;
+ // C++14 [lex.string]p4: A source-file new-line in a raw string literal
+ // results in a new-line in the resulting execution string-literal.
+ StringRef RemainingTokenSpan(ThisTokBuf, ThisTokEnd - ThisTokBuf);
+ while (!RemainingTokenSpan.empty()) {
+ // Split the string literal on \r\n boundaries.
+ size_t CRLFPos = RemainingTokenSpan.find("\r\n");
+ StringRef BeforeCRLF = RemainingTokenSpan.substr(0, CRLFPos);
+ StringRef AfterCRLF = RemainingTokenSpan.substr(CRLFPos);
+
+ // Copy everything before the \r\n sequence into the string literal.
+ if (CopyStringFragment(StringToks[i], ThisTokBegin, BeforeCRLF))
+ hadError = true;
+
+ // Point into the \n inside the \r\n sequence and operate on the
+ // remaining portion of the literal.
+ RemainingTokenSpan = AfterCRLF.substr(1);
+ }
} else {
if (ThisTokBuf[0] != '"') {
// The file may have come from PCH and then changed after loading the
--- /dev/null
+// RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify %s\r
+// expected-no-diagnostics\r
+\r
+// NOTE: This file intentionally uses DOS-style line endings to test\r
+// that we don't propagate them into string literals as per [lex.string]p4.\r
+\r
+constexpr const char* p = R"(a\\r
+b\r
+c)";\r
+\r
+static_assert(p[0] == 'a', "");\r
+static_assert(p[1] == '\\', "");\r
+static_assert(p[2] == '\n', "");\r
+static_assert(p[3] == 'b', "");\r
+static_assert(p[4] == '\n', "");\r
+static_assert(p[5] == 'c', "");\r
+static_assert(p[6] == '\0', "");\r