git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C++: Fix PR86082 

When turning a user-defined numerical literal into an operator
invocation the literal needs to be translated to the execution
character set.

gcc/cp/ChangeLog:

2018-06-25  Andreas Krebbel  <krebbel@linux.ibm.com>

	PR C++/86082
	* parser.c (make_char_string_pack): Pass this literal chars
	through cpp_interpret_string.
	(cp_parser_userdef_numeric_literal): Check the result of
	make_char_string_pack.

gcc/testsuite/ChangeLog:

2018-06-25  Andreas Krebbel  <krebbel@linux.ibm.com>

	PR C++/86082
	* g++.dg/pr86082.C: New test.

From-SVN: r262003
This commit is contained in:
Andreas Krebbel 2018-06-25 07:16:59 +00:00 committed by Andreas Krebbel
parent c5ce6638f4
commit 4f1c88ae58
4 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2018-06-25 Andreas Krebbel <krebbel@linux.ibm.com>
PR C++/86082
* parser.c (make_char_string_pack): Pass this literal chars
through cpp_interpret_string.
(cp_parser_userdef_numeric_literal): Check the result of
make_char_string_pack.
2018-06-24 Maya Rashish <coypu@sdf.org>
* ginclude/stddef.h: Simplify conditions around avoiding

17
gcc/cp/parser.c
View File

@ -4291,7 +4291,16 @@ make_char_string_pack (tree value)
/* Fill in CHARVEC with all of the parameters. */
charvec = make_tree_vec (len);
for (i = 0; i < len; ++i)
TREE_VEC_ELT (charvec, i) = build_int_cst (char_type_node, str[i]);
{
unsigned char s[3] = { '\'', str[i], '\'' };
cpp_string in = { 3, s };
cpp_string out = { 0, 0 };
if (!cpp_interpret_string (parse_in, &in, 1, &out, CPP_STRING))
return NULL_TREE;
gcc_assert (out.len == 2);
TREE_VEC_ELT (charvec, i) = build_int_cst (char_type_node,
out.text[0]);
}
/* Build the argument packs. */
SET_ARGUMENT_PACK_ARGS (argpack, charvec);
@ -4407,6 +4416,12 @@ cp_parser_userdef_numeric_literal (cp_parser *parser)
if (decl && decl != error_mark_node)
{
tree tmpl_args = make_char_string_pack (num_string);
if (tmpl_args == NULL_TREE)
{
error ("failed to translate literal to execution character set %qT",
num_string);
return error_mark_node;
}
decl = lookup_template_function (decl, tmpl_args);
result = finish_call_expr (decl, &args, false, true,
tf_warning_or_error);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2018-06-25 Andreas Krebbel <krebbel@linux.ibm.com>
PR C++/86082
* g++.dg/pr86082.C: New test.
2018-06-24 Tom de Vries <tdevries@suse.de>
* g++.dg/guality/guality.exp: Don't use which on gdb arg to report_gdb.

18
gcc/testsuite/g++.dg/pr86082.C Normal file
View File

@ -0,0 +1,18 @@
/* { dg-do link } */
/* { dg-options "-fexec-charset=IBM1047 -std=c++11" } */
/* When turning 123_test into an operator invocation the literal 123
needs to be translated to the execution character set. Failing to
do so results in a link error since '1', '2', and '3' in the
specialization will be translated as string literals. */
template <char... p> void q();
template <> void q<'1','2','3'>() {}
template <char... p> void operator""_test() { q<p...> (); }
int
main ()
{
123_test;
}