re PR c++/11878 (ICE in cp_expr_size)
PR c++/11878 * tree.c (build_target_expr_with_type): Call force_rvalue for classes with non-trivial copy ctors. PR c++/11063 * typeck.c (build_modify_expr): Call convert rather than abort. From-SVN: r72494
This commit is contained in:
parent
a5e6b29b07
commit
182609b572
|
@ -1,3 +1,12 @@
|
||||||
|
2003-10-14 Jason Merrill <jason@redhat.com>
|
||||||
|
|
||||||
|
PR c++/11878
|
||||||
|
* tree.c (build_target_expr_with_type): Call force_rvalue for
|
||||||
|
classes with non-trivial copy ctors.
|
||||||
|
|
||||||
|
PR c++/11063
|
||||||
|
* typeck.c (build_modify_expr): Call convert rather than abort.
|
||||||
|
|
||||||
2003-10-14 Gabriel Dos Reis <gdr@integrable-solutions.net>
|
2003-10-14 Gabriel Dos Reis <gdr@integrable-solutions.net>
|
||||||
|
|
||||||
Breack out decl.c (3/n)
|
Breack out decl.c (3/n)
|
||||||
|
|
|
@ -310,6 +310,12 @@ build_target_expr_with_type (tree init, tree type)
|
||||||
|
|
||||||
if (TREE_CODE (init) == TARGET_EXPR)
|
if (TREE_CODE (init) == TARGET_EXPR)
|
||||||
return init;
|
return init;
|
||||||
|
else if (CLASS_TYPE_P (type) && !TYPE_HAS_TRIVIAL_INIT_REF (type)
|
||||||
|
&& TREE_CODE (init) != COND_EXPR)
|
||||||
|
/* We need to build up a copy constructor call. COND_EXPR is a special
|
||||||
|
case because we already have copies on the arms and we don't want
|
||||||
|
another one here. */
|
||||||
|
return force_rvalue (init);
|
||||||
|
|
||||||
slot = build_decl (VAR_DECL, NULL_TREE, type);
|
slot = build_decl (VAR_DECL, NULL_TREE, type);
|
||||||
DECL_ARTIFICIAL (slot) = 1;
|
DECL_ARTIFICIAL (slot) = 1;
|
||||||
|
|
|
@ -4991,8 +4991,9 @@ build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs)
|
||||||
{
|
{
|
||||||
if (TREE_CODE (rhs) == CONSTRUCTOR)
|
if (TREE_CODE (rhs) == CONSTRUCTOR)
|
||||||
{
|
{
|
||||||
my_friendly_assert (same_type_p (TREE_TYPE (rhs), lhstype),
|
if (! same_type_p (TREE_TYPE (rhs), lhstype))
|
||||||
20011220);
|
/* Call convert to generate an error; see PR 11063. */
|
||||||
|
rhs = convert (lhstype, rhs);
|
||||||
result = build (INIT_EXPR, lhstype, lhs, rhs);
|
result = build (INIT_EXPR, lhstype, lhs, rhs);
|
||||||
TREE_SIDE_EFFECTS (result) = 1;
|
TREE_SIDE_EFFECTS (result) = 1;
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue