harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r490692 - /harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp
Date Thu, 28 Dec 2006 10:40:21 GMT
Author: varlax
Date: Thu Dec 28 02:40:18 2006
New Revision: 490692

URL: http://svn.apache.org/viewvc?view=rev&rev=490692
Log:
Applied HARMONY-2847 [drlvm] [ipf] latest drlvm is not compilable on linux.ipf
Did not test.

Modified:
    harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp?view=diff&rev=490692&r1=490691&r2=490692
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp Thu Dec 28 02:40:18 2006
@@ -261,15 +261,18 @@
     }
 
     M2nFrame * m2n = m2n_get_last_frame();
-    free_local_object_handles3(m2n->local_object_handles);
+    // iche free_local_object_handles3(m2n->local_object_handles);
+    free_local_object_handles3(m2n_get_local_handles(m2n)); // iche
 }
 
 void m2n_gen_pop_m2n(Merced_Code_Emitter* emitter, bool handles, M2nPreserveRet preserve_ret,
bool do_alloc, unsigned out_reg, int target)
 {
+    unsigned free_target;
+    
     if (handles) {
         assert(target != -1);  // make sure a target has been provided
         // Do we need to call free?
-        unsigned free_target = (unsigned) target;
+        free_target = (unsigned) target;
         emitter->ipf_cmp(icmp_eq, cmp_none, SCRATCH_PRED_REG, SCRATCH_PRED_REG2, M2N_OBJECT_HANDLES,
0);
         emitter->ipf_br(br_cond, br_many, br_spnt, br_none, free_target, SCRATCH_PRED_REG);
     }



Mime
View raw message