#include "vm/types.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
-#include "vm/access.h"
-#include "vm/classcache.h"
-#include "vm/descriptor.h"
+#include "vm/access.hpp"
+#include "vm/classcache.hpp"
+#include "vm/descriptor.hpp"
#include "vm/exceptions.hpp"
#include "vm/global.h"
#include "vm/globals.hpp"
-#include "vm/linker.h"
+#include "vm/linker.hpp"
#include "vm/loader.hpp"
#include "vm/options.h"
#include "vm/primitive.hpp"
/* check subtype constraints for TYPE_ADR parameters */
- assert(mi == ref->methodref->p.method || mi->parseddesc->paramcount == ref->methodref->parseddesc.md->paramcount);
+ assert(mi->parseddesc->paramcount == ref->methodref->parseddesc.md->paramcount);
paramtypes = mi->parseddesc->paramtypes;
for (i = 0; i < mi->parseddesc->paramcount-instancecount; i++) {