projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation for the ABC Analysis
[cacao.git]
/
src
/
vm
/
resolve.cpp
diff --git
a/src/vm/resolve.cpp
b/src/vm/resolve.cpp
index 0dc57ef3e31d6b288b1b487ef0c15cef93f58bf0..80d8a4a11561bb371c8d4cf016a8f91d3a2224ab 100644
(file)
--- a/
src/vm/resolve.cpp
+++ b/
src/vm/resolve.cpp
@@
-29,15
+29,15
@@
#include "vm/types.h"
#include "vm/types.h"
-#include "mm/memory.h"
+#include "mm/memory.h
pp
"
-#include "vm/access.h"
-#include "vm/classcache.h"
-#include "vm/descriptor.h"
+#include "vm/access.h
pp
"
+#include "vm/classcache.h
pp
"
+#include "vm/descriptor.h
pp
"
#include "vm/exceptions.hpp"
#include "vm/global.h"
#include "vm/globals.hpp"
#include "vm/exceptions.hpp"
#include "vm/global.h"
#include "vm/globals.hpp"
-#include "vm/linker.h"
+#include "vm/linker.h
pp
"
#include "vm/loader.hpp"
#include "vm/options.h"
#include "vm/primitive.hpp"
#include "vm/loader.hpp"
#include "vm/options.h"
#include "vm/primitive.hpp"
@@
-2241,7
+2241,7
@@
resolved_the_method:
/* check subtype constraints for TYPE_ADR parameters */
/* 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++) {
paramtypes = mi->parseddesc->paramtypes;
for (i = 0; i < mi->parseddesc->paramcount-instancecount; i++) {