procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/28337 (ICE with string literals in templates)

Browse source 
PR c++/28337
	* typeck.c (build_binary_op): Short-circuit pointer arithmetic in
	templates.
	PR c++/28337
	* g++.dg/template/string1.C: New test.

From-SVN: r115597
This commit is contained in:
Mark Mitchell 2006-07-19 17:32:38 +00:00 • committed by Mark Mitchell
parent cf0d6f2e57
commit 0225a19df7
4 changed files with 45 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2006-07-18 Mark Mitchell <mark@codesourcery.com>
PR c++/28337
* typeck.c (build_binary_op): Short-circuit pointer arithmetic in
templates.
2006-07-18 Mark Mitchell <mark@codesourcery.com>
PR c++/28048

42
gcc/cp/typeck.c
View file

@ -3043,16 +3043,6 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
switch (code)
{
case PLUS_EXPR:
/* Handle the pointer + int case. */
if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
return cp_pointer_int_sum (PLUS_EXPR, op0, op1);
else if (code1 == POINTER_TYPE && code0 == INTEGER_TYPE)
return cp_pointer_int_sum (PLUS_EXPR, op1, op0);
else
common = 1;
break;
case MINUS_EXPR:
/* Subtraction of two similar pointers.
We must subtract them as integers, then divide by object size. */
@ -3060,11 +3050,33 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
&& same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (type0),
TREE_TYPE (type1)))
return pointer_diff (op0, op1, common_type (type0, type1));
/* Handle pointer minus int. Just like pointer plus int. */
else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
return cp_pointer_int_sum (MINUS_EXPR, op0, op1);
else
common = 1;
/* In all other cases except pointer - int, the usual arithmetic
rules aply. */
else if (!(code0 == POINTER_TYPE && code1 == INTEGER_TYPE))
{
common = 1;
break;
}
/* The pointer - int case is just like pointer + int; fall
through. */
case PLUS_EXPR:
if ((code0 == POINTER_TYPE || code1 == POINTER_TYPE)
&& (code0 == INTEGER_TYPE || code1 == INTEGER_TYPE))
{
tree ptr_operand;
tree int_operand;
ptr_operand = ((code0 == POINTER_TYPE) ? op0 : op1);
int_operand = ((code0 == INTEGER_TYPE) ? op0 : op1);
if (processing_template_decl)
{
result_type = TREE_TYPE (ptr_operand);
break;
}
return cp_pointer_int_sum (code,
ptr_operand,
int_operand);
}
common = 1;
break;
case MULT_EXPR:

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2006-07-18 Mark Mitchell <mark@codesourcery.com>
PR c++/28337
* g++.dg/template/string1.C: New test.
2006-07-18 Mark Mitchell <mark@codesourcery.com>
PR c++/28048

7
gcc/testsuite/g++.dg/template/string1.C Normal file
View file

@ -0,0 +1,7 @@
// PR c++/28337
template <int> void foo()
{
(0 ? "" : "X") + 1;
}