TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

typeck.c (convert_for_assignment): Don't look at array initializer.

Browse Source 
* typeck.c (convert_for_assignment): Don't look at array
	initializer.
	* call.c (convert_like_real): Likewise.

From-SVN: r32415
This commit is contained in:
Nathan Sidwell
2000-03-08 10:26:06 +00:00
committed by Nathan Sidwell
parent 1c08915645
commit 2abda41888
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@@ -1,3 +1,9 @@
2000-03-08 Nathan Sidwell <nathan@codesourcery.com>
* typeck.c (convert_for_assignment): Don't look at array
initializer.
* call.c (convert_like_real): Likewise.
2000-03-07 Jason Merrill <jason@casey.cygnus.com>
Add initial support for '\uNNNN' specifier.

5
gcc/cp/call.c
View File

@@ -3683,10 +3683,11 @@ convert_like_real (convs, expr, fn, argnum, inner)
if (expr == error_mark_node)
return error_mark_node;
/* Convert a constant variable to its underlying value, unless we
/* Convert a non-array constant variable to its underlying value, unless we
are about to bind it to a reference, in which case we need to
leave it as an lvalue. */
if (TREE_READONLY_DECL_P (expr) && TREE_CODE (convs) != REF_BIND)
if (TREE_READONLY_DECL_P (expr) && TREE_CODE (convs) != REF_BIND
&& TREE_CODE (TREE_TYPE (expr)) != ARRAY_TYPE)
expr = decl_constant_value (expr);
switch (TREE_CODE (convs))

2
gcc/cp/typeck.c
View File

@@ -6523,7 +6523,7 @@ 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 (TREE_READONLY_DECL_P (rhs))
else if (TREE_READONLY_DECL_P (rhs) && coder != ARRAY_TYPE)
rhs = decl_constant_value (rhs);
/* [expr.ass]