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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 921aeb714c8ff25a3b18c7d4790ca5f613ae01a9..c0ccc1da6a05f93e191106a7ea2b87782040d317 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,9 @@
 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.

diff --git a/gcc/java/class.c b/gcc/java/class.c
index 391752ad271c63eae40be7517aa43d3dc0393c87..df398c71c48233a36351bdc9a6f37367659037f2 100644 (file)
--- a/gcc/java/class.c
+++ b/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);
 

diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index 8eb0c308488eff8b67abdac3e3adbb650681624f..fdc272167af151e7caefc88de32174352408840c 100644 (file)
--- a/gcc/java/verify.c
+++ b/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)

diff --git a/gcc/java/verify.h b/gcc/java/verify.h
index 6657ffc471a9f6332c9d26166e18c2f861c34885..3553d3579601bf971368a8af7794ef5bf2130e9f 100644 (file)
--- a/gcc/java/verify.h
+++ b/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;