re PR c++/61038 (g++ -E is unusable with UDL strings)

PR c++/61038
I was asked to combine the escape logic for regular chars and strings
with the escape logic for user-defined literals chars and strings.
I just forgot the first time.

From-SVN: r211266

libcpp/macro.c

@@ -492,10 +492,9 @@ stringify_arg (cpp_reader *pfile, macro_arg *arg)
 		   || token->type == CPP_WSTRING || token->type == CPP_WCHAR
 		   || token->type == CPP_STRING32 || token->type == CPP_CHAR32
 		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16
-		   || token->type == CPP_UTF8STRING);
-
-      escape_it = escape_it || cpp_userdef_string_p (token->type)
-			    || cpp_userdef_char_p (token->type);
+		   || token->type == CPP_UTF8STRING
+		   || cpp_userdef_string_p (token->type)
+		   || cpp_userdef_char_p (token->type));
 
       /* Room for each char being written in octal, initial space and
 	 final quote and NUL.  */