diff -r bb01e3adecb4 -r b2d040a8d375 hotspot/src/share/vm/runtime/sharedRuntime.cpp --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Wed Apr 14 15:30:13 2010 -0700 +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Apr 15 18:14:49 2010 -0700 @@ -473,6 +473,13 @@ t = table.entry_for(catch_pco, -1, 0); } +#ifdef COMPILER1 + if (t == NULL && nm->is_compiled_by_c1()) { + assert(nm->unwind_handler_begin() != NULL, ""); + return nm->unwind_handler_begin(); + } +#endif + if (t == NULL) { tty->print_cr("MISSING EXCEPTION HANDLER for pc " INTPTR_FORMAT " and handler bci %d", ret_pc, handler_bci); tty->print_cr(" Exception:");