verify.c (defer_merging): Don't use C++-style comment.

	* verify.c (defer_merging): Don't use C++-style comment.
	* verify.h (java_opcode): Added java_opcode_end.
	* class.c (build_class_ref): Remove C++ comment and old FIXME.

From-SVN: r91277

gcc/java/ChangeLog

 2004-11-24  Tom Tromey  <tromey@redhat.com>
 
+	* verify.c (defer_merging): Don't use C++-style comment.
+	* verify.h (java_opcode): Added java_opcode_end.
+	* class.c (build_class_ref): Remove C++ comment and old FIXME.
+
 	* verify-impl.c (vfy_push_type): Removed bogus "return".
 	(initialize_stack): Use vfy_alloc and vfy_free.
 	(verify_instructions_0): Likewise.

gcc/java/class.c

@@ -943,13 +943,8 @@ build_class_ref (tree type)
       if (TREE_CODE (type) == POINTER_TYPE)
 	type = TREE_TYPE (type);
 
-      /* FIXME: we really want an indirect reference to our
-	 superclass.  However, libgcj assumes that a superclass
-	 pointer always points directly to a class.  As a workaround
-	 we always emit this hard superclass reference.  */
       if  (flag_indirect_dispatch
 	   && type != output_class
-// 	   && type != CLASSTYPE_SUPER (output_class)
 	   && TREE_CODE (type) == RECORD_TYPE)
 	return build_indirect_class_ref (type);
 

gcc/java/verify.c

@@ -129,9 +129,9 @@ subroutine_nesting (tree label)
 static tree
 defer_merging (tree type1, tree type2)
 {
-  // FIXME: This is just a placeholder until we replace the verifier
-  // altogether.  We really need to ouput a type assertion for all of
-  // the types, every time they are used.
+  /* FIXME: This is just a placeholder until we replace the verifier
+     altogether.  We really need to ouput a type assertion for all of
+     the types, every time they are used.  */
   return object_ptr_type_node;
 
   if (TREE_CODE (type1) == POINTER_TYPE)

gcc/java/verify.h

@@ -136,6 +136,7 @@ typedef enum
 #define JAVAOP(name, num, ignore1, ignore2, ignore3) \
   GLOM (op_, name) = num,
 #include "javaop.def"
+  java_opcode_end
 } java_opcode;