unaligned-memcpy-2.c (dest): Initialize to ensure alignment.

[gcc.git] / libcpp / lex.c

diff --git a/libcpp/lex.c b/libcpp/lex.c
index aa87da95323149fc0d516d02bda3d7dbdbb9daac..3e59d40d32e3f1a4a1192276dec5f0b358651b17 100644 (file)
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1561,8 +1561,10 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
         from inttypes.h, we generate a warning and treat the ud-suffix as a
         separate preprocessing token.  This approach is under discussion by
         the standards committee, and has been adopted as a conforming
-        extension by other front ends such as clang. */
-      if (ISALPHA (*cur))
+        extension by other front ends such as clang.
+         A special exception is made for the suffix 's' which will be
+        standardized as a user-defined literal suffix for strings.  */
+      if (ISALPHA (*cur) && *cur != 's')
        {
          /* Raise a warning, but do not consume subsequent tokens.  */
          if (CPP_OPTION (pfile, warn_literal_suffix))
@@ -1572,7 +1574,7 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
                                   "a space between literal and identifier");
        }
       /* Grab user defined literal suffix.  */
-      else if (*cur == '_')
+      else if (ISIDST (*cur))
        {
          type = cpp_userdef_string_add_type (type);
          ++cur;
@@ -1692,8 +1694,10 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
         from inttypes.h, we generate a warning and treat the ud-suffix as a
         separate preprocessing token.  This approach is under discussion by
         the standards committee, and has been adopted as a conforming
-        extension by other front ends such as clang. */
-      if (ISALPHA (*cur))
+        extension by other front ends such as clang.
+         A special exception is made for the suffix 's' which will be
+        standardized as a user-defined literal suffix for strings.  */
+      if (ISALPHA (*cur) && *cur != 's')
        {
          /* Raise a warning, but do not consume subsequent tokens.  */
          if (CPP_OPTION (pfile, warn_literal_suffix))
@@ -1703,7 +1707,7 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
                                   "a space between literal and identifier");
        }
       /* Grab user defined literal suffix.  */
-      else if (*cur == '_')
+      else if (ISIDST (*cur))
        {
          type = cpp_userdef_char_add_type (type);
          type = cpp_userdef_string_add_type (type);
@@ -2294,8 +2298,8 @@ _cpp_lex_direct (cpp_reader *pfile)
                 is neither : nor >, the < is treated as a preprocessor
                 token by itself".  */
              if (CPP_OPTION (pfile, cplusplus)
-                 && (CPP_OPTION (pfile, lang) == CLK_CXX11
-                     || CPP_OPTION (pfile, lang) == CLK_GNUCXX11)
+                 && CPP_OPTION (pfile, lang) != CLK_CXX98
+                 && CPP_OPTION (pfile, lang) != CLK_GNUCXX
                  && buffer->cur[1] == ':'
                  && buffer->cur[2] != ':' && buffer->cur[2] != '>')
                break;
@@ -2842,8 +2846,17 @@ new_buff (size_t len)
     len = MIN_BUFF_SIZE;
   len = CPP_ALIGN (len);
 
+#ifdef ENABLE_VALGRIND_CHECKING
+  /* Valgrind warns about uses of interior pointers, so put _cpp_buff
+     struct first.  */
+  size_t slen = CPP_ALIGN2 (sizeof (_cpp_buff), 2 * DEFAULT_ALIGNMENT);
+  base = XNEWVEC (unsigned char, len + slen);
+  result = (_cpp_buff *) base;
+  base += slen;
+#else
   base = XNEWVEC (unsigned char, len + sizeof (_cpp_buff));
   result = (_cpp_buff *) (base + len);
+#endif
   result->base = base;
   result->cur = base;
   result->limit = base + len;
@@ -2930,7 +2943,11 @@ _cpp_free_buff (_cpp_buff *buff)
   for (; buff; buff = next)
     {
       next = buff->next;
+#ifdef ENABLE_VALGRIND_CHECKING
+      free (buff);
+#else
       free (buff->base);
+#endif
     }
 }