Mercurial > hg > truffle
diff src/share/vm/interpreter/interpreterRuntime.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | 04b9a2566eec 20334ed5ed3c |
children | 18a5539bf19b |
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Mon Feb 27 13:10:13 2012 +0100 @@ -871,7 +871,9 @@ const int branch_bci = branch_bcp != NULL ? method->bci_from(branch_bcp) : InvocationEntryBci; const int bci = branch_bcp != NULL ? method->bci_from(fr.interpreter_frame_bcp()) : InvocationEntryBci; + assert(!HAS_PENDING_EXCEPTION, "Should not have any exceptions pending"); nmethod* osr_nm = CompilationPolicy::policy()->event(method, method, branch_bci, bci, CompLevel_none, NULL, thread); + assert(!HAS_PENDING_EXCEPTION, "Event handler should not throw any exceptions"); if (osr_nm != NULL) { // We may need to do on-stack replacement which requires that no