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

8172791: Issues with JEP 270 (ReservedStackArea)

Browse source 
Reviewed-by: dcubed, thartmann
This commit is contained in:
Andrew Haley 2017-08-11 16:29:00 -04:00 • committed by Frederic Parain
parent ebcca449a0
commit 37bbfcb2fa
6 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3128,11 +3128,14 @@ void AdapterHandlerLibrary::print_statistics() {
JRT_LEAF(void, SharedRuntime::enable_stack_reserved_zone(JavaThread* thread))
assert(thread->is_Java_thread(), "Only Java threads have a stack reserved zone");
if (thread->stack_reserved_zone_disabled()) {
thread->enable_stack_reserved_zone();
}
thread->set_reserved_stack_activation(thread->stack_base());
JRT_END
frame SharedRuntime::look_for_reserved_stack_annotated_method(JavaThread* thread, frame fr) {
ResourceMark rm(thread);
frame activation;
CompiledMethod* nm = NULL;
int count = 1;
@ -3141,17 +3144,28 @@ frame SharedRuntime::look_for_reserved_stack_annotated_method(JavaThread* thread
while (true) {
Method* method = NULL;
bool found = false;
if (fr.is_interpreted_frame()) {
method = fr.interpreter_frame_method();
if (method != NULL && method->has_reserved_stack_access()) {
found = true;
}
} else {
CodeBlob* cb = fr.cb();
if (cb != NULL && cb->is_compiled()) {
nm = cb->as_compiled_method();
method = nm->method();
// scope_desc_near() must be used, instead of scope_desc_at() because on
// SPARC, the pcDesc can be on the delay slot after the call instruction.
for (ScopeDesc *sd = nm->scope_desc_near(fr.pc()); sd != NULL; sd = sd->sender()) {
method = sd->method();
if (method != NULL && method->has_reserved_stack_access()) {
found = true;
}
}
if ((method != NULL) && method->has_reserved_stack_access()) {
ResourceMark rm(thread);
}
}
if (found) {
activation = fr;
warning("Potentially dangerous stack overflow in "
"ReservedStackAccess annotated method %s [%d]",