harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfur...@apache.org
Subject svn commit: r575666 - in /harmony/enhanced/drlvm/trunk/vm: jitrino/src/jet/cg_fld_arr.cpp jitrino/src/optimizer/throwopt.cpp vmcore/src/class_support/Resolve.cpp
Date Fri, 14 Sep 2007 13:12:31 GMT
Author: mfursov
Date: Fri Sep 14 06:12:29 2007
New Revision: 575666

URL: http://svn.apache.org/viewvc?rev=575666&view=rev
Log:
Fix for HARMONY-4702 [drlvm][jit] DRLVM is able to run SjAS in server mode only with -Xno_parallel_jit
option
Fix for HARMONY-4779 [drlvm][jit][EUT] compiler suite crash causes 30% pass rate regression


Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_fld_arr.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/throwopt.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Resolve.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_fld_arr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_fld_arr.cpp?rev=575666&r1=575665&r2=575666&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_fld_arr.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_fld_arr.cpp Fri Sep 14 06:12:29 2007
@@ -227,9 +227,8 @@
                 fieldOp.fld = fld;
             }
         }
-        if(fieldOp.fld == NULL) { 
+        if(fieldOp.fld == NULL && !lazy) {  //in lazy resolution mode exception will
be thrown from lazy resolution helper
             //TODO: we can avoid this check and use lazy resolution code path in this case!
-            assert(!lazy);
             gen_call_throw(ci_helper_linkerr, rt_helper_throw_linking_exc, 0, enclClass,
cpIndex, opcode);
         }
     }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/throwopt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/throwopt.cpp?rev=575666&r1=575665&r2=575666&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/throwopt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/throwopt.cpp Fri Sep 14 06:12:29
2007
@@ -57,13 +57,12 @@
     const Nodes& nodes = flowGraph.getNodes();
     StlVector<bool> visited_nodes(irManager.getMemoryManager(), flowGraph.getMaxNodeId(),
false);
     StlVector<Inst *> pseudo_insts(irManager.getMemoryManager(), 10);
-    LoopTree * loop_tree = irManager.getLoopTree();
-    Nodes::const_iterator node_iter;
+    LoopTree * loop_tree = irManager.getLoopTree();    
     bool restore_ssa = false;
 
     loop_tree->rebuild(false);
 
-    for(node_iter = nodes.begin(); node_iter != nodes.end(); ++node_iter) {
+    for(Nodes::const_iterator node_iter = nodes.begin(), end = nodes.end(); node_iter !=
end; ++node_iter) {
         Node * throw_node = *node_iter;
         Inst * throw_inst = (Inst *)throw_node->getLastInst();
         

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Resolve.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Resolve.cpp?rev=575666&r1=575665&r2=575666&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Resolve.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Resolve.cpp Fri Sep 14 06:12:29
2007
@@ -987,6 +987,11 @@
                     clazz->unlock();*/
                     res = true;
                 }
+
+                //if array of primitives -> return true;
+                if (*typeName->bytes=='[' && !strchr(typeName->bytes, 'L'))
{
+                    return true;
+                }
             }
 
         } 



Mime
View raw message