re PR c++/8214 (character conversion problem)

PR c++/8214
	* g++.dg/init/string1.C: New test.

	PR c++/8214
	* typeck.c (convert_for_assignment): Do not use
	decl_constant_value on the operand.

From-SVN: r59668
This commit is contained in:
Mark Mitchell 2002-12-01 02:11:05 +00:00 committed by Mark Mitchell
parent 65f8b0fbaf
commit c17707f1d1
4 changed files with 29 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2002-11-30 Mark Mitchell <mark@codesourcery.com>
PR c++/8214
* typeck.c (convert_for_assignment): Do not use
decl_constant_value on the operand.
2002-11-30 Mark Mitchell <mark@codesourcery.com>
PR c++/8511

View File

@ -5859,8 +5859,16 @@ convert_for_assignment (type, rhs, errtype, fndecl, parmnum)
/* Simplify the RHS if possible. */
if (TREE_CODE (rhs) == CONST_DECL)
rhs = DECL_INITIAL (rhs);
else if (coder != ARRAY_TYPE)
rhs = decl_constant_value (rhs);
/* We do not use decl_constant_value here because of this case:
const char* const s = "s";
The conversion rules for a string literal are more lax than for a
variable; in particular, a string literal can be converted to a
"char *" but the variable "s" cannot be converted in the same
way. If the conversion is allowed, the optimization should be
performed while creating the converted expression. */
/* [expr.ass]

View File

@ -1,3 +1,8 @@
2002-11-30 Mark Mitchell <mark@codesourcery.com>
PR c++/8214
* g++.dg/init/string1.C: New test.
2002-11-30 Mark Mitchell <mark@codesourcery.com>
PR c++/8511

View File

@ -0,0 +1,8 @@
extern void f (char*);
extern const char * const target = "foo";
void g ()
{
f (target); // { dg-error "conversion" }
}