git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* verify.cc (type::compatible): Backed out broken change. 

From-SVN: r59496
This commit is contained in:
Tom Tromey 2002-11-26 07:15:53 +00:00 committed by Tom Tromey
parent d2dff06bdb
commit cbad89c4e2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libjava/ChangeLog
View File

@ -1,5 +1,7 @@
2002-11-25 Tom Tromey <tromey@redhat.com> 2002-11-25 Tom Tromey <tromey@redhat.com>
* verify.cc (type::compatible): Backed out broken change.
* verify.cc (type::compatible): Check initialization status * verify.cc (type::compatible): Check initialization status
first. first.
* interpret.cc (run) [insn_invokespecial, invokespecial_resolved]: * interpret.cc (run) [insn_invokespecial, invokespecial_resolved]:

10
libjava/verify.cc
View File

@ -458,11 +458,6 @@ private:
if (key < reference_type || k.key < reference_type) if (key < reference_type || k.key < reference_type)
return key == k.key; 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. // The `null' type is convertible to any reference type.
if (key == null_type || k.key == null_type) if (key == null_type || k.key == null_type)
return true; return true;
@ -473,6 +468,11 @@ private:
&& data.klass == &java::lang::Object::class$) && data.klass == &java::lang::Object::class$)
return true; 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: // Two uninitialized objects are compatible if either:
// * The PCs are identical, or // * The PCs are identical, or
// * One PC is UNINIT. // * One PC is UNINIT.