FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/5670 (verify.cc not properly merging states)

Browse source 
2002-02-13  Todd Stock  <toddastock@yahoo.com>

	Fix for PR libgcj/5670:
	* verify.cc (is_assignable_from_slow): If `source' is interface,
	recursively look for merge with `target'.

From-SVN: r49769
This commit is contained in:
Todd Stock 2002-02-14 17:48:36 +00:00 • committed by Tom Tromey
parent 6c4cf6956e
commit 30fbb95c05
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2002-02-13 Todd Stock <toddastock@yahoo.com>
Fix for PR libgcj/5670:
* verify.cc (is_assignable_from_slow): If `source' is interface,
recursively look for merge with `target'.
2002-02-14 Martin Kahlert <martin.kahlert@infineon.com> 2002-02-14 Martin Kahlert <martin.kahlert@infineon.com>
* include/jni.h: Fix typo. * include/jni.h: Fix typo.

16
libjava/verify.cc
View file

@ -259,10 +259,22 @@ private:
if (source == NULL) if (source == NULL)
return false; return false;
} }
else if (source->isInterface ())
{
for (int i = 0; i < target->interface_count; ++i)
{
// We use a recursive call because we also need to
// check superinterfaces.
if (is_assignable_from_slow (target->interfaces[i], source))
return true;
}
target = target->getSuperclass ();
if (target == NULL)
return false;
}
else if (target == &java::lang::Object::class$) else if (target == &java::lang::Object::class$)
return true; return true;
else if (source->isInterface () else if (source == &java::lang::Object::class$)
|| source == &java::lang::Object::class$)
return false; return false;
else else
source = source->getSuperclass (); source = source->getSuperclass ();