This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: back out "fix"
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 25 Nov 2002 23:53:52 -0700
- Subject: Patch: FYI: back out "fix"
- Reply-to: tromey at redhat dot com
My verifier change was incorrect. I'm backing it out. I'll
fix it tomorrow. Sorry for the noise.
Tom
Index: libjava/ChangeLog
from Tom Tromey <tromey@redhat.com>
* verify.cc (type::compatible): Backed out broken change.
Index: libjava/verify.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/verify.cc,v
retrieving revision 1.43
diff -u -r1.43 verify.cc
--- libjava/verify.cc 26 Nov 2002 06:51:14 -0000 1.43
+++ libjava/verify.cc 26 Nov 2002 06:54:47 -0000
@@ -458,11 +458,6 @@
if (key < reference_type || k.key < reference_type)
return key == k.key;
- // An initialized type and an uninitialized type are not
- // compatible.
- if (isinitialized () != k.isinitialized ())
- return false;
-
// The `null' type is convertible to any reference type.
if (key == null_type || k.key == null_type)
return true;
@@ -472,6 +467,11 @@
if (key == reference_type
&& data.klass == &java::lang::Object::class$)
return true;
+
+ // An initialized type and an uninitialized type are not
+ // compatible.
+ if (isinitialized () != k.isinitialized ())
+ return false;
// Two uninitialized objects are compatible if either:
// * The PCs are identical, or