You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2007/10/25 10:57:36 UTC
svn commit: r588169 - in
/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363:
base/context_x.cpp java6/context_6.cpp
Author: mloenko
Date: Thu Oct 25 01:57:35 2007
New Revision: 588169
URL: http://svn.apache.org/viewvc?rev=588169&view=rev
Log:
additional fix for HARMONY-4946 ([drlvm][verifier][regression] 19 VTSVM tests related to stack verification failed after commit r584118)
Modified:
harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_x.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_x.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_x.cpp?rev=588169&r1=588168&r2=588169&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_x.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_x.cpp Thu Oct 25 01:57:35 2007
@@ -469,6 +469,7 @@
}
case OP_ARETURN: {
+ if( return_type == SM_BOGUS ) return error(VF_ErrorDataFlow, "returned a value from a void method");
POP_ref( return_type );
break;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp?rev=588169&r1=588168&r2=588169&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp Thu Oct 25 01:57:35 2007
@@ -28,7 +28,7 @@
vf_Result tcr;
//nothing to verify
- if( !method_get_code_length( m_method ) ) {
+ if( !method_get_code_length( method ) ) {
return VF_OK;
}