This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: more BC merge fixes
- From: Tom Tromey <tromey at redhat dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 25 Nov 2004 00:01:24 -0700
- Subject: Patch: FYI: more BC merge fixes
- Reply-to: tromey at redhat dot com
I'm checking this in.
This fixes more warnings from the BC branch merge. At least the
class.c one caused the regression checker to fail :-(
Tom
Index: ChangeLog
from 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.
Index: class.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/class.c,v
retrieving revision 1.215
diff -u -r1.215 class.c
--- class.c 25 Nov 2004 03:46:39 -0000 1.215
+++ class.c 25 Nov 2004 07:02:05 -0000
@@ -943,13 +943,8 @@
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);
Index: verify.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/verify.c,v
retrieving revision 1.67
diff -u -r1.67 verify.c
--- verify.c 25 Nov 2004 03:46:41 -0000 1.67
+++ verify.c 25 Nov 2004 07:02:06 -0000
@@ -129,9 +129,9 @@
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)
Index: verify.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/verify.h,v
retrieving revision 1.2
diff -u -r1.2 verify.h
--- verify.h 25 Nov 2004 03:46:41 -0000 1.2
+++ verify.h 25 Nov 2004 07:02:06 -0000
@@ -136,6 +136,7 @@
#define JAVAOP(name, num, ignore1, ignore2, ignore3) \
GLOM (op_, name) = num,
#include "javaop.def"
+ java_opcode_end
} java_opcode;