re PR preprocessor/48740 (Raw C++0x strings and trigraphs mix badly)

	PR preprocessor/48740
	* lex.c (lex_raw_string): When raw string ends with
	??) followed by raw prefix and ", ensure it is preprocessed
	with ??) rather than ??].

	* c-c++-common/raw-string-11.c: New test.

From-SVN: r172903

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2cf73c70cfe1cc0ecc17425e0e7d44ed62f73ecc..0ec9b20126ae50569c101060d416687d110233f0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+       PR preprocessor/48740
+       * c-c++-common/raw-string-11.c: New test.
+
 2011-04-23  John David Anglin  <dave.anglin@nrc-cnrc.ca>
 
        * gcc.dg/pr48616.c (dg-options): Add -fno-common to options on

diff --git a/gcc/testsuite/c-c++-common/raw-string-11.c b/gcc/testsuite/c-c++-common/raw-string-11.c
new file mode 100644 (file)
index 0000000..49ceba2
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/raw-string-11.c
@@ -0,0 +1,13 @@
+// PR preprocessor/48740
+// { dg-options "-std=gnu99 -trigraphs -save-temps" { target c } }
+// { dg-options "-std=c++0x -save-temps" { target c++ } }
+// { dg-do run }
+
+int main ()
+{
+  return __builtin_memcmp (R"raw(foo%sbar%sfred%sbob?????)raw",
+                          "foo%sbar%sfred%sbob?""?""?""?""?",
+                          sizeof ("foo%sbar%sfred%sbob?""?""?""?""?"));
+}
+
+// { dg-final { cleanup-saved-temps } }

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index eb93719e27bee67ecc8a1e14b77a885d6397b613..26013027b691ccc66a8d0b1b49d7f00776eb5602 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+       PR preprocessor/48740
+       * lex.c (lex_raw_string): When raw string ends with
+       ??) followed by raw prefix and ", ensure it is preprocessed
+       with ??) rather than ??].
+
 2011-04-20  Jim Meyering  <meyering@redhat.com>
 
        * files.c (destroy_cpp_file): Remove useless if-before-free.

diff --git a/libcpp/lex.c b/libcpp/lex.c
index c9b5c95df6a55e32567e59a6c1f452dc3b064c72..3bf4886b6d28c273be03fde83b1384ab67fe4e5a 100644 (file)
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1410,7 +1410,9 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
                                       raw_prefix_len) == 0
                           && cur[raw_prefix_len+1] == '"')
                    {
-                     cur += raw_prefix_len+2;
+                     BUF_APPEND (")", 1);
+                     base++;
+                     cur += raw_prefix_len + 2;
                      goto break_outer_loop;
                    }
                  else