提交 a76a8919 编写于 作者: N never

7021603: crash in fill_sync_handler with ExtendedDTrace probes

Reviewed-by: iveresov
上级 56a4ae55
...@@ -3308,22 +3308,23 @@ void GraphBuilder::fill_sync_handler(Value lock, BlockBegin* sync_handler, bool ...@@ -3308,22 +3308,23 @@ void GraphBuilder::fill_sync_handler(Value lock, BlockBegin* sync_handler, bool
Value exception = append_with_bci(new ExceptionObject(), SynchronizationEntryBCI); Value exception = append_with_bci(new ExceptionObject(), SynchronizationEntryBCI);
assert(exception->is_pinned(), "must be"); assert(exception->is_pinned(), "must be");
int bci = SynchronizationEntryBCI;
if (compilation()->env()->dtrace_method_probes()) { if (compilation()->env()->dtrace_method_probes()) {
// Report exit from inline methods // Report exit from inline methods. We don't have a stream here
// so pass an explicit bci of SynchronizationEntryBCI.
Values* args = new Values(1); Values* args = new Values(1);
args->push(append(new Constant(new ObjectConstant(method())))); args->push(append_with_bci(new Constant(new ObjectConstant(method())), bci));
append(new RuntimeCall(voidType, "dtrace_method_exit", CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), args)); append_with_bci(new RuntimeCall(voidType, "dtrace_method_exit", CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), args), bci);
} }
int bci = SynchronizationEntryBCI;
if (lock) { if (lock) {
assert(state()->locks_size() > 0 && state()->lock_at(state()->locks_size() - 1) == lock, "lock is missing"); assert(state()->locks_size() > 0 && state()->lock_at(state()->locks_size() - 1) == lock, "lock is missing");
if (!lock->is_linked()) { if (!lock->is_linked()) {
lock = append_with_bci(lock, -1); lock = append_with_bci(lock, bci);
} }
// exit the monitor in the context of the synchronized method // exit the monitor in the context of the synchronized method
monitorexit(lock, SynchronizationEntryBCI); monitorexit(lock, bci);
// exit the context of the synchronized method // exit the context of the synchronized method
if (!default_handler) { if (!default_handler) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册