* merged default branch into jitcache-arm-x86 branch

[cacao.git] / src / vm / resolve.cpp

diff --git a/src/vm/resolve.cpp b/src/vm/resolve.cpp
index 1d1173a87d4bca833f37cb6b09aa926f02ea596f..cdd42a733ef852c8ec3cb955bc0695fdcbcf00a5 100644 (file)
--- a/src/vm/resolve.cpp
+++ b/src/vm/resolve.cpp
@@ -2241,7 +2241,7 @@ resolved_the_method:
 
                /* check subtype constraints for TYPE_ADR parameters */
 
-               assert(mi->parseddesc->paramcount == ref->methodref->parseddesc.md->paramcount);
+               assert(mi == ref->methodref->p.method || mi->parseddesc->paramcount == ref->methodref->parseddesc.md->paramcount);
                paramtypes = mi->parseddesc->paramtypes;
 
                for (i = 0; i < mi->parseddesc->paramcount-instancecount; i++) {