This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[BC] Patch: FYI: remove unused method


I'm checking this in on the BC branch.

This removes a method that is no longer used.

Tom

Index: gcc/java/ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* java-tree.h (soft_check_assignment_node): Removed.
	(enum java_tree_index): Removed JTI_SOFT_CHECK_ASSIGNMENT_NODE.
	* decl.c (java_init_decl_processing): Don't initialize
	soft_check_assignment_node.

Index: gcc/java/decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/decl.c,v
retrieving revision 1.178.4.13
diff -u -r1.178.4.13 decl.c
--- gcc/java/decl.c 5 Nov 2004 19:30:05 -0000 1.178.4.13
+++ gcc/java/decl.c 8 Nov 2004 16:17:08 -0000
@@ -1038,12 +1038,6 @@
 			build_function_type (boolean_type_node, t),
 			0, NOT_BUILT_IN, NULL, NULL_TREE);
   DECL_IS_PURE (soft_instanceof_node) = 1;
-  t = tree_cons (NULL_TREE, ptr_type_node,
-		 tree_cons (NULL_TREE, ptr_type_node, endlink));
-  soft_check_assignment_node
-    = builtin_function ("_Jv_CheckAssignment",
-			build_function_type (void_type_node, t),
-			0, NOT_BUILT_IN, NULL, NULL_TREE);
   t = tree_cons (NULL_TREE, object_ptr_type_node,
 		 tree_cons (NULL_TREE, object_ptr_type_node, endlink));
   soft_checkarraystore_node
Index: gcc/java/java-tree.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/java-tree.h,v
retrieving revision 1.197.2.13
diff -u -r1.197.2.13 java-tree.h
--- gcc/java/java-tree.h 5 Nov 2004 19:30:05 -0000 1.197.2.13
+++ gcc/java/java-tree.h 8 Nov 2004 16:17:08 -0000
@@ -387,7 +387,6 @@
   JTI_ALLOC_NO_FINALIZER_NODE,
   JTI_SOFT_INSTANCEOF_NODE,
   JTI_SOFT_CHECKCAST_NODE,
-  JTI_SOFT_CHECK_ASSIGNMENT_NODE,
   JTI_SOFT_INITCLASS_NODE,
   JTI_SOFT_NEWARRAY_NODE,
   JTI_SOFT_ANEWARRAY_NODE,
@@ -639,8 +638,6 @@
   java_global_trees[JTI_ALLOC_NO_FINALIZER_NODE]
 #define soft_instanceof_node \
   java_global_trees[JTI_SOFT_INSTANCEOF_NODE]
-#define soft_check_assignment_node \
-  java_global_trees[JTI_SOFT_CHECK_ASSIGNMENT_NODE]
 #define soft_checkcast_node \
   java_global_trees[JTI_SOFT_CHECKCAST_NODE]
 #define soft_initclass_node \
Index: libjava/ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* include/jvm.h (_Jv_CheckAssignment): Removed.
	* java/lang/natClass.cc (_Jv_CheckAssignment): Removed.

Index: libjava/include/jvm.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/jvm.h,v
retrieving revision 1.63.6.10
diff -u -r1.63.6.10 jvm.h
--- libjava/include/jvm.h 5 Nov 2004 19:30:11 -0000 1.63.6.10
+++ libjava/include/jvm.h 8 Nov 2004 16:17:13 -0000
@@ -440,8 +440,6 @@
 extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
                                                int meth_idx);
 extern "C" void _Jv_CheckArrayStore (jobject array, jobject obj);
-extern "C" void _Jv_CheckAssignment (java::lang::ClassLoader *,
-				     _Jv_Utf8Const *, _Jv_Utf8Const *);
 extern "C" void _Jv_RegisterClass (jclass klass);
 extern "C" void _Jv_RegisterClasses (jclass *classes);
 extern "C" void _Jv_RegisterResource (void *vptr);
Index: libjava/java/lang/natClass.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/natClass.cc,v
retrieving revision 1.75.2.20
diff -u -r1.75.2.20 natClass.cc
--- libjava/java/lang/natClass.cc 4 Nov 2004 18:24:20 -0000 1.75.2.20
+++ libjava/java/lang/natClass.cc 8 Nov 2004 16:17:13 -0000
@@ -1172,28 +1172,6 @@
   return false;
 }
 
-// Check that SOURCE is assignment compatible with DEST.  Both are
-// loaded with the indicated class loader.  Neither is prepared.
-// Throws appropriate exception, usually VerifyError, on failure.
-void
-_Jv_CheckAssignment (java::lang::ClassLoader *loader,
-                    _Jv_Utf8Const *source_name,
-                    _Jv_Utf8Const *dest_name)
-{
-  jclass source = _Jv_FindClassFromSignature (source_name->chars(), loader);
-  jclass dest = _Jv_FindClassFromSignature (dest_name->chars(), loader);
-
-  if (! _Jv_IsAssignableFromSlow (dest, source))
-    {
-      using namespace java::lang;
-      StringBuffer *sb = new StringBuffer();
-      sb->append(dest->getName());
-      sb->append(JvNewStringLatin1(" isn't assignable from "));
-      sb->append(source->getName());
-      throw new VerifyError(sb->toString());
-    }
-}
-
 // Lookup an interface method by name.  This is very similar to
 // purpose to _getMethod, but the interfaces are quite different.  It
 // might be a good idea for _getMethod to call this function.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]