harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r513301 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier: Verifier.cpp ver_dataflow.cpp
Date Thu, 01 Mar 2007 13:04:50 GMT
Author: gshimansky
Date: Thu Mar  1 05:04:49 2007
New Revision: 513301

URL: http://svn.apache.org/viewvc?view=rev&rev=513301
Log:
Applied HARMONY-3270 [drlvm][verifier] verifier rejects correct method


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp?view=diff&rev=513301&r1=513300&r2=513301
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp Thu Mar  1 05:04:49 2007
@@ -4900,7 +4900,8 @@
             const_index = (unsigned short)( (bytecode[index] << 8)|(bytecode[index
+ 1]) );
             // skip constant pool index (u2)
             index += 2;
-            result = vf_opcode_new( code, const_index, codeNum, ctex );
+            // Zero number of opcode new is reserved for "uninitialized this"
+            result = vf_opcode_new( code, const_index, codeNum + 1, ctex );
             if( result != VER_OK ) {
                 return result;
             }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp?view=diff&rev=513301&r1=513300&r2=513301
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp Thu Mar  1 05:04:49
2007
@@ -1010,7 +1010,7 @@
     for( unsigned index = 0; index < instruction; index++ )
     {
         if( ( 0 == instr[index].m_inlen + instr[index].m_outlen )
-            && ( VF_TYPE_INSTR_NONE == instr->m_type ) )
+            && ( VF_TYPE_INSTR_NONE == instr[index].m_type ) )
         {
             continue;
         } else {



Mime
View raw message