You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2006/12/27 14:23:26 UTC
svn commit: r490500 -
/harmony/enhanced/drlvm/trunk/vm/port/src/lil/ipf/pim/m2n_ipf.cpp
Author: varlax
Date: Wed Dec 27 05:23:26 2006
New Revision: 490500
URL: http://svn.apache.org/viewvc?view=rev&rev=490500
Log:
Applied HARMONY-2876 [drlvm][ipf] build is broken.
IPF-only thus 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=490500&r1=490499&r2=490500
==============================================================================
--- 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 Wed Dec 27 05:23:26 2006
@@ -244,21 +244,13 @@
emitter->ipf_movi(M2N_OBJECT_HANDLES, (int)imm_val);
}
-void m2n_pop_local_handles() {
+static void m2n_pop_local_handles() {
assert(!hythread_is_suspend_enabled());
+
+ exn_rethrow_if_pending();
+
M2nFrame *m2n = m2n_get_last_frame();
free_local_object_handles3(m2n_get_local_handles(m2n));
-}
-
-static void m2n_pop_local_handles() {
- assert(!hythread_is_suspend_enabled());
-
- if (exn_raised()) {
- exn_rethrow();
- }
-
- M2nFrame * m2n = m2n_get_last_frame();
- free_local_object_handles2(m2n->local_object_handles);
}
static void m2n_free_local_handles() {