compiler: discard carriage returns in raw string literals

Fixes golang/go#10407.

From-SVN: r222001

diff --git a/gcc/go/gofrontend/lex.cc b/gcc/go/gofrontend/lex.cc
index 3404cedb5f67bf7025361cff023ba8fb647c66e7..aa7071dbe78050b7571313c50ec6a23167afcb4d 100644 (file)
--- a/gcc/go/gofrontend/lex.cc
+++ b/gcc/go/gofrontend/lex.cc
@@ -1440,7 +1440,10 @@ Lex::gather_raw_string()
          bool issued_error;
          this->lineoff_ = p - this->linebuf_;
          p = this->advance_one_utf8_char(p, &c, &issued_error);
-         Lex::append_char(c, true, &value, loc);
+         // "Carriage return characters ('\r') inside raw string literals
+         // are discarded from the raw string value."
+         if (c != '\r')
+             Lex::append_char(c, true, &value, loc);
        }
       this->lineoff_ = p - this->linebuf_;
       if (!this->require_line())