harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r811411 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363: base/ver.cpp java6/context_6.cpp java6/context_6.h
Date Fri, 04 Sep 2009 13:54:11 GMT
Author: odeakin
Date: Fri Sep  4 13:54:11 2009
New Revision: 811411

URL: http://svn.apache.org/viewvc?rev=811411&view=rev
Log:
Apply fix for HARMONY-6317 ([drlvm][verifier] Verify error running SwingSet2 demo code).

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.h

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp?rev=811411&r1=811410&r2=811411&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp Fri Sep  4 13:54:11
2009
@@ -18,7 +18,6 @@
 #include "../java5/context_5.h"
 #include "../java6/context_6.h"
 #ifndef _NDEBUG
-#include "../x_verifier/recompute.h"
 #include "class_interface.h"
 #endif
 
@@ -108,17 +107,6 @@
                 return result;
             }
         }
-
-#ifndef _NDEBUG
-        vf_recompute_stackmaptable(method, &context6.substitution, error, classwide.class_constraints);
-
-        result = context6.verify_method(method);
-        if (result != VF_OK) {
-            vf_create_error_message(method, context6, error);
-        }
-        tc_free(context6.substitution);
-        context6.substitution = NULL;
-#endif  
     }
 
     /**

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=811411&r1=811410&r2=811411&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 Fri Sep 
4 13:54:11 2009
@@ -195,10 +195,6 @@
 
     U_8* stackmaptable = method_get_stackmaptable(m_method);
 
-#ifndef _NDEBUG
-    if (substitution) stackmaptable = substitution;
-#endif
-
     if(!stackmaptable) return VF_OK;
 
     U_8* read_ptr = stackmaptable;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.h?rev=811411&r1=811410&r2=811411&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.h Fri Sep  4
13:54:11 2009
@@ -30,9 +30,6 @@
 public:
     vf_Context_6(SharedClasswideData &classwide) :
       vf_Context_x<vf_Context_6, WorkmapElement_6, _WorkmapElement_6, StackmapElement_6>(classwide)
-#ifndef _NDEBUG
-      , substitution(NULL)
-#endif
       {}
 
       vf_Result verify_method(Method_Handle method);
@@ -137,11 +134,6 @@
     void new_bogus_propagation_constraint(WorkmapElement_6 &wm_el, SmConstant init_val)
{
         wm_el = _WorkmapElement_6 (init_val);
     }
-
-    //recomputed stack map used for testing
-#ifndef _NDEBUG
-    U_8* substitution;
-#endif
 };
 
 #endif



Mime
View raw message