You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/05/23 16:48:54 UTC
svn commit: r540966 -
/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp
Author: gshimansky
Date: Wed May 23 07:48:53 2007
New Revision: 540966
URL: http://svn.apache.org/viewvc?view=rev&rev=540966
Log:
Applied HARMONY-3927 [drlvm][verifier] DRLVM crashes or throw no error instead of throwing VerifyError if an instruction call has type inconsistency
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp?view=diff&rev=540966&r1=540965&r2=540966
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp Wed May 23 07:48:53 2007
@@ -1105,7 +1105,8 @@
if( ( restriction->m_target[0] != '['
&& restriction->m_source[0] == '[' )
|| ( restriction->m_target[0] != '['
- && restriction->m_source[0] == '[' ) ) {
+ && restriction->m_source[0] == '[' ) )
+ {
vf_set_error( VF_CHECK_PARAM, ctx );
return VER_ErrorIncompatibleArgument;
}
@@ -1290,10 +1291,13 @@
// check constraints
for( vf_TypeConstraint *constraint = collection;
- constraint; constraint = constraint->m_next ) {
+ constraint;
+ constraint = constraint->m_next )
+ {
// set context method
- // FIXME - need set method to context?
- //ctx->SetMethod( constraint->m_method );
+ ctx->m_method = constraint->m_method;
+ ctx->m_name = constraint->m_name;
+ ctx->m_descriptor = constraint->m_descriptor;
// check constraint
vf_Result result = vf_check_constraint( constraint, ctx );