projects
/
cacao.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b932d1c
)
* verify_multianewarray: Usage iptr->val.a and iptr->target changed.
author
twisti
<none@none>
Thu, 12 Jan 2006 22:35:37 +0000
(22:35 +0000)
committer
twisti
<none@none>
Thu, 12 Jan 2006 22:35:37 +0000
(22:35 +0000)
src/vm/jit/verify/typecheck.c
patch
|
blob
|
history
diff --git
a/src/vm/jit/verify/typecheck.c
b/src/vm/jit/verify/typecheck.c
index 67f0a79844d6b0816db23eaca529b1beab80c1a7..eaf6f0f4b4b42323bf778be7ba8326b49f6e6654 100644
(file)
--- a/
src/vm/jit/verify/typecheck.c
+++ b/
src/vm/jit/verify/typecheck.c
@@
-28,7
+28,7
@@
Changes: Christian Thalinger
Changes: Christian Thalinger
- $Id: typecheck.c
3878 2005-12-05 19:32:14
Z twisti $
+ $Id: typecheck.c
4171 2006-01-12 22:35:37
Z twisti $
*/
*/
@@
-1451,7
+1451,7
@@
verify_multianewarray(verifier_state *state)
}
/* check array descriptor */
}
/* check array descriptor */
- if (state->iptr[0].
target =
= NULL) {
+ if (state->iptr[0].
val.a !
= NULL) {
/* the array class reference has already been resolved */
arrayclass = (classinfo *) state->iptr[0].val.a;
if (!arrayclass)
/* the array class reference has already been resolved */
arrayclass = (classinfo *) state->iptr[0].val.a;
if (!arrayclass)
@@
-1470,7
+1470,7
@@
verify_multianewarray(verifier_state *state)
/* the array class reference is still unresolved */
/* check that the reference indicates an array class of correct dimension */
/* the array class reference is still unresolved */
/* check that the reference indicates an array class of correct dimension */
- cr = (constant_classref *) state->iptr[0].
val.a
;
+ cr = (constant_classref *) state->iptr[0].
target
;
i = 0;
p = cr->name->text;
while (p[i] == '[')
i = 0;
p = cr->name->text;
while (p[i] == '[')
@@
-1482,7
+1482,7
@@
verify_multianewarray(verifier_state *state)
TYPECHECK_VERIFYERROR_bool("MULTIANEWARRAY dimension to high");
/* set the array type of the result */
TYPECHECK_VERIFYERROR_bool("MULTIANEWARRAY dimension to high");
/* set the array type of the result */
- if (!typeinfo_init_class(&(state->iptr->dst->typeinfo),CLASSREF_OR_CLASSINFO(state->iptr[0].
val.a
)))
+ if (!typeinfo_init_class(&(state->iptr->dst->typeinfo),CLASSREF_OR_CLASSINFO(state->iptr[0].
target
)))
return false;
}
return false;
}