archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8173795: AOT support in raw_exception_handler_for_return_address is broken

Browse source 
Enable both AOT and nmethod code to take the same path

Reviewed-by: kvn
This commit is contained in:
Dean Long 2017-04-05 13:15:44 -07:00
parent 399d4fa2ff
commit 9670822224
5 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -482,7 +482,7 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* thre
// The fastest case first
CodeBlob* blob = CodeCache::find_blob(return_address);
nmethod* nm = (blob != NULL) ? blob->as_nmethod_or_null() : NULL;
CompiledMethod* nm = (blob != NULL) ? blob->as_compiled_method_or_null() : NULL;
if (nm != NULL) {
// Set flag if return address is a method handle call site.
thread->set_is_method_handle_return(nm->is_method_handle_return(return_address));
@ -506,13 +506,6 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* thre
}
}
#if INCLUDE_AOT
if (UseAOT && blob->is_aot()) {
// AOT Compiled code
return AOTLoader::exception_begin(thread, blob, return_address);
}
#endif
// Entry code
if (StubRoutines::returns_to_call_stub(return_address)) {
return StubRoutines::catch_exception_entry();