cvt.c (ocp_convert): Only abort if we try to convert an object of TREE_ADDRESSABLE type.

* cvt.c (ocp_convert): Only abort if we try to convert an object
        of TREE_ADDRESSABLE type.

From-SVN: r65212
This commit is contained in:
Jason Merrill 2003-04-03 15:07:56 -05:00 committed by Jason Merrill
parent 773eae3968
commit 55a2af0c42
2 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,8 @@
2003-04-03 Jason Merrill <jason@redhat.com>
* cvt.c (ocp_convert): Only abort if we try to convert an object
of TREE_ADDRESSABLE type.
* class.c (build_vtable): Set DECL_ALIGN here.
(get_vtable_decl): Not here.
(layout_vtable_decl): Or here.

View File

@ -647,7 +647,8 @@ ocp_convert (tree type, tree expr, int convtype, int flags)
TREE_TYPE (e) = TREE_TYPE (TARGET_EXPR_SLOT (e)) = type;
return e;
}
else if (CLASS_TYPE_P (type))
else if (TREE_ADDRESSABLE (type))
/* We shouldn't be treating objects of ADDRESSABLE type as rvalues. */
abort ();
else
return fold (build1 (NOP_EXPR, type, e));