From: Jason Merrill <jason@redhat.com>
Date: Thu, 16 Jun 2011 22:09:12 +0000 (-0400)
Subject: re PR c++/45399 ([C++0x] Warning for \0 in raw strings)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8787a05aaa4047eacd3d90ce8c1d9359747da4d2;p=gcc.git

re PR c++/45399 ([C++0x] Warning for \0 in raw strings)

	PR c++/45399
	* lex.c (lex_raw_string): Don't check for embedded NUL.

From-SVN: r175121
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 677ac710fda..0da84e5642d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/45399
+	* c-c++-common/raw-string-12.c: New.
+
 	PR c++/49229
 	* g++.dg/cpp0x/sfinae26.C: New.
 
diff --git a/gcc/testsuite/c-c++-common/raw-string-12.c b/gcc/testsuite/c-c++-common/raw-string-12.c
new file mode 100644
index 00000000000..5bdf3b9d8f8
Binary files /dev/null and b/gcc/testsuite/c-c++-common/raw-string-12.c differ
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index e1c01c13660..e36edfa981d 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/45399
+	* lex.c (lex_raw_string): Don't check for embedded NUL.
+
 2011-06-06  Dodji Seketeli  <dodji@redhat.com>
 
 	PR preprocessor/48532
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 6c3be711504..d29f36d436d 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1270,7 +1270,6 @@ static void
 lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
 		const uchar *cur)
 {
-  source_location saw_NUL = 0;
   const uchar *raw_prefix;
   unsigned int raw_prefix_len = 0;
   enum cpp_ttype type;
@@ -1476,16 +1475,9 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
 	  cur = base = pfile->buffer->cur;
 	  note = &pfile->buffer->notes[pfile->buffer->cur_note];
 	}
-      else if (c == '\0' && !saw_NUL)
-	LINEMAP_POSITION_FOR_COLUMN (saw_NUL, pfile->line_table,
-				     CPP_BUF_COLUMN (pfile->buffer, cur));
     }
  break_outer_loop:
 
-  if (saw_NUL && !pfile->state.skipping)
-    cpp_error_with_line (pfile, CPP_DL_WARNING, saw_NUL, 0,
-	       "null character(s) preserved in literal");
-
   pfile->buffer->cur = cur;
   if (first_buff == NULL)
     create_literal (pfile, token, base, cur - base, type);