svn commit: r582305 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp

[gs...@apache.org]

Author: gshimansky
Date: Fri Oct  5 08:11:53 2007
New Revision: 582305

URL: http://svn.apache.org/viewvc?rev=582305&view=rev
Log:
Applied workaround for HARMONY-4873
[drlvm][exception] NullPointerException causes SIGSEGV


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp?rev=582305&r1=582304&r2=582305&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp Fri Oct  5 08:11:53 2007
@@ -561,7 +561,18 @@
     exn_propagate_exception(si, &local_exn_obj, exn_class, NULL, NULL, NULL);
     si_copy_to_registers(si, regs);
 
+#ifdef _WIN32
     END_RAISE_AREA;
+#else
+    /*
+     * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
+     * Gregory -
+     * This is a workaround for bug HARMONY-4873. This code should
+     * actually be replaced with END_RAISE_AREA when the bug is fixed
+     */
+    set_unwindable(unwindable);
+    }
+#endif
 
     m2n_set_last_frame(si_get_m2n(si));
     si_free(si);