* expr.c (can_widen_reference_to): Allow cast of array to
Cloneable or Serializable.
* java-tree.h (java_lang_cloneable_identifier_node): Declare.
(java_io_serializable_identifier_node): Likewise.
* parse.y (java_lang_cloneable, java_io_serializable): Removed.
(valid_ref_assignconv_cast_p): Use new identifier nodes.
* lex.c (java_init_lex): Don't initialize java_lang_cloneable and
java_io_serializable.
* decl.c (java_init_decl_processing): Initialize
java_lang_cloneable_identifier_node and
java_io_serializable_identifier_node.
(java_lang_cloneable_identifier_node): New global.
(java_io_serializable_identifier_node): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59227
138bc75d-0d04-0410-961f-
82ee72b054a4
+2002-11-18 Tom Tromey <tromey@redhat.com>
+
+ Fix for PR java/7912:
+ * expr.c (can_widen_reference_to): Allow cast of array to
+ Cloneable or Serializable.
+ * java-tree.h (java_lang_cloneable_identifier_node): Declare.
+ (java_io_serializable_identifier_node): Likewise.
+ * parse.y (java_lang_cloneable, java_io_serializable): Removed.
+ (valid_ref_assignconv_cast_p): Use new identifier nodes.
+ * lex.c (java_init_lex): Don't initialize java_lang_cloneable and
+ java_io_serializable.
+ * decl.c (java_init_decl_processing): Initialize
+ java_lang_cloneable_identifier_node and
+ java_io_serializable_identifier_node.
+ (java_lang_cloneable_identifier_node): New global.
+ (java_io_serializable_identifier_node): Likewise.
+
2002-11-14 Jens-Michael Hoffmann <jensmh@gmx.de>
* buffer.c: Remove unnecessary casts.
static tree check_local_unnamed_variable PARAMS ((tree, tree, tree));
static void dump_function PARAMS ((enum tree_dump_index, tree));
+/* Name of the Cloneable class. */
+tree java_lang_cloneable_identifier_node;
+
+/* Name of the Serializable class. */
+tree java_io_serializable_identifier_node;
+
/* Set to nonzero value in order to emit class initilization code
before static field references. */
extern int always_initialize_class_p;
access0_identifier_node = get_identifier ("access$0");
classdollar_identifier_node = get_identifier ("class$");
+ java_lang_cloneable_identifier_node = get_identifier ("java.lang.Cloneable");
+ java_io_serializable_identifier_node =
+ get_identifier ("java.io.Serializable");
+
/* for lack of a better place to put this stub call */
init_expr_processing();
/* Process expressions for the GNU compiler for the Java(TM) language.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of GNU CC.
{
HOST_WIDE_INT source_length, target_length;
if (TYPE_ARRAY_P (source_type) != TYPE_ARRAY_P (target_type))
- return 0;
+ {
+ /* An array implements Cloneable and Serializable. */
+ tree name = DECL_NAME (TYPE_NAME (target_type));
+ return (name == java_lang_cloneable_identifier_node
+ || name == java_io_serializable_identifier_node);
+ }
target_length = java_array_type_length (target_type);
if (target_length >= 0)
{
#define COMPONENT_REF_SIGNATURE(CPOOL, IDX) \
NAME_AND_TYPE_SIGNATURE (CPOOL, COMPONENT_REF_NAME_AND_TYPE(CPOOL, IDX))
+extern GTY(()) tree java_lang_cloneable_identifier_node;
+extern GTY(()) tree java_io_serializable_identifier_node;
+
enum java_tree_index
{
JTI_PROMOTED_BYTE_TYPE_NODE,
if (!java_lang_id)
java_lang_id = get_identifier ("java.lang");
- if (!java_lang_cloneable)
- java_lang_cloneable = get_identifier ("java.lang.Cloneable");
- if (!java_io_serializable)
- java_io_serializable = get_identifier ("java.io.Serializable");
if (!inst_id)
inst_id = get_identifier ("inst$");
if (!wpv_id)
instance/field access functions. */
static GTY(()) tree inst_id;
-/* The "java.lang.Cloneable" qualified name. */
-static GTY(()) tree java_lang_cloneable;
-
-/* The "java.io.Serializable" qualified name. */
-static GTY(()) tree java_io_serializable;
-
/* Context and flag for static blocks */
static GTY(()) tree current_static_block;
{
/* Array */
return (cast
- && (DECL_NAME (TYPE_NAME (source)) == java_lang_cloneable
+ && (DECL_NAME (TYPE_NAME (source))
+ == java_lang_cloneable_identifier_node
|| (DECL_NAME (TYPE_NAME (source))
- == java_io_serializable)));
+ == java_io_serializable_identifier_node)));
}
}
if (TYPE_ARRAY_P (source))
/* Can't cast an array to an interface unless the interface is
java.lang.Cloneable or java.io.Serializable. */
if (TYPE_INTERFACE_P (dest))
- return (DECL_NAME (TYPE_NAME (dest)) == java_lang_cloneable
- || DECL_NAME (TYPE_NAME (dest)) == java_io_serializable);
+ return (DECL_NAME (TYPE_NAME (dest))
+ == java_lang_cloneable_identifier_node
+ || (DECL_NAME (TYPE_NAME (dest))
+ == java_io_serializable_identifier_node));
else /* Arrays */
{
tree source_element_type = TYPE_ARRAY_ELEMENT (source);