archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-25 22:04:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8026407: VM crashes on linux-ppc and linux-i586 when there is not enough ReservedCodeCacheSize specified

Browse source 
Ensure currently required generation of AdapterHandlerLibrary::create_native_wrapper()

Reviewed-by: roland, iveresov
This commit is contained in:
Albert Noll 2013-10-23 10:00:39 +02:00
parent 4b0c603628
commit ceb177b16f
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/share/vm/compiler/compileBroker.cpp
View file

@ -1297,13 +1297,6 @@ nmethod* CompileBroker::compile_method(methodHandle method, int osr_bci,
method->jmethod_id(); method->jmethod_id();
} }
// If the compiler is shut off due to code cache getting full
// fail out now so blocking compiles dont hang the java thread
if (!should_compile_new_jobs()) {
CompilationPolicy::policy()->delay_compilation(method());
return NULL;
}
// do the compilation // do the compilation
if (method->is_native()) { if (method->is_native()) {
if (!PreferInterpreterNativeStubs || method->is_method_handle_intrinsic()) { if (!PreferInterpreterNativeStubs || method->is_method_handle_intrinsic()) {
@ -1313,11 +1306,22 @@ nmethod* CompileBroker::compile_method(methodHandle method, int osr_bci,
MutexLocker locker(MethodCompileQueue_lock, THREAD); MutexLocker locker(MethodCompileQueue_lock, THREAD);
compile_id = assign_compile_id(method, standard_entry_bci); compile_id = assign_compile_id(method, standard_entry_bci);
} }
// To properly handle the appendix argument for out-of-line calls we are using a small trampoline that
// pops off the appendix argument and jumps to the target (see gen_special_dispatch in SharedRuntime).
//
// Since normal compiled-to-compiled calls are not able to handle such a thing we MUST generate an adapter
// in this case. If we can't generate one and use it we can not execute the out-of-line method handle calls.
(void) AdapterHandlerLibrary::create_native_wrapper(method, compile_id); (void) AdapterHandlerLibrary::create_native_wrapper(method, compile_id);
} else { } else {
return NULL; return NULL;
} }
} else { } else {
// If the compiler is shut off due to code cache getting full
// fail out now so blocking compiles dont hang the java thread
if (!should_compile_new_jobs()) {
CompilationPolicy::policy()->delay_compilation(method());
return NULL;
}
compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, THREAD); compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, THREAD);
} }