Mercurial > hg > truffle

diff src/share/vm/c1/c1_Runtime1.cpp @ 20453:be56d800c946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8054224: Recursive method that was compiled by C1 is unable to catch StackOverflowError Summary: do not update exception cache if exception is replaced when thrown Reviewed-by: kvn, iveresov
author roland
date Mon, 11 Aug 2014 15:09:04 +0200
parents 2c6ef90f030a
children 7848fc12602b
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.cpp	Sat Aug 02 07:06:08 2014 +0200
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Mon Aug 11 15:09:04 2014 +0200
@@ -544,13 +544,18 @@
     // normal bytecode execution.
     thread->clear_exception_oop_and_pc();
 
+    Handle original_exception(thread, exception());
+
     continuation = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, false, false);
     // If an exception was thrown during exception dispatch, the exception oop may have changed
     thread->set_exception_oop(exception());
     thread->set_exception_pc(pc);
 
     // the exception cache is used only by non-implicit exceptions
-    if (continuation != NULL) {
+    // Update the exception cache only when there didn't happen
+    // another exception during the computation of the compiled
+    // exception handler.
+    if (continuation != NULL && original_exception() == exception()) {
       nm->add_handler_for_exception_and_pc(exception, pc, continuation);
     }
   }