harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r595279 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp
Date Thu, 15 Nov 2007 12:01:30 GMT
Author: varlax
Date: Thu Nov 15 04:01:27 2007
New Revision: 595279

URL: http://svn.apache.org/viewvc?rev=595279&view=rev
Log:
Fixed HARMONY-5075 [drlvm][jit][jet] assertion while handling SOE 

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp?rev=595279&r1=595278&r2=595279&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp Thu Nov 15 04:01:27 2007
@@ -270,8 +270,10 @@
 {
     if (!context->is_ip_past && !StaticConsts::g_jvmtiMode) {
         // The IP points directly to the instructions - this must be a 
-        // hardware NPE happened. Check the presumption:
-        assert(method_get_num_handlers(method) == 0);
+        // hardware NPE happened. 
+        // A special case is SOE, which is allowed to happen only at the method start.
+        // Check the presumptions:
+        assert(method_get_num_handlers(method) == 0 || rt_is_soe_area(jit, method, context));
 #ifdef _DEBUG
         bool sync = method_is_synchronized(method);
         bool inst = !method_is_static(method);



Mime
View raw message