summaryrefslogtreecommitdiff
path: root/libjava/verify.cc
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-11-26 07:15:53 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-11-26 07:15:53 +0000
commitffa1a85b97dc80b35575a2a0f5e9c031bc7bada8 (patch)
treee130221187053907de550692a4f334e24be81eb3 /libjava/verify.cc
parent03b358c6a470e29fcb0eb5c8221b139af5aede69 (diff)
downloadgcc-ffa1a85b97dc80b35575a2a0f5e9c031bc7bada8.tar.gz
* verify.cc (type::compatible): Backed out broken change.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59496 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/verify.cc')
-rw-r--r--libjava/verify.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/libjava/verify.cc b/libjava/verify.cc
index 5917ce09c77..001543fc7dc 100644
--- a/libjava/verify.cc
+++ b/libjava/verify.cc
@@ -458,11 +458,6 @@ private:
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;
@@ -473,6 +468,11 @@ private:
&& 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
// * One PC is UNINIT.