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

8185790: [JVMCI] getNextStackFrame and materializeVirtualObjects need to forward exceptions

Browse source 
Reviewed-by: kvn, iveresov
This commit is contained in:
Lukas Stadler 2017-08-10 12:16:35 -07:00 • committed by Vladimir Kozlov
parent 78aab12406
commit ebb8c32e7f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
View file

@ -1365,8 +1365,8 @@ C2V_VMENTRY(jobject, getNextStackFrame, (JNIEnv*, jobject compilerToVM, jobject
ResourceMark rm; ResourceMark rm;
if (!thread->has_last_Java_frame()) return NULL; if (!thread->has_last_Java_frame()) return NULL;
Handle result = HotSpotStackFrameReference::klass()->allocate_instance_handle(thread); Handle result = HotSpotStackFrameReference::klass()->allocate_instance_handle(CHECK_NULL);
HotSpotStackFrameReference::klass()->initialize(thread); HotSpotStackFrameReference::klass()->initialize(CHECK_NULL);
StackFrameStream fst(thread); StackFrameStream fst(thread);
if (hs_frame != NULL) { if (hs_frame != NULL) {
@ -1418,13 +1418,13 @@ C2V_VMENTRY(jobject, getNextStackFrame, (JNIEnv*, jobject compilerToVM, jobject
initialSkip --; initialSkip --;
} else { } else {
ScopeDesc* scope = cvf->scope(); ScopeDesc* scope = cvf->scope();
// native wrapper do not have a scope // native wrappers do not have a scope
if (scope != NULL && scope->objects() != NULL) { if (scope != NULL && scope->objects() != NULL) {
bool realloc_failures = Deoptimization::realloc_objects(thread, fst.current(), scope->objects(), THREAD); bool realloc_failures = Deoptimization::realloc_objects(thread, fst.current(), scope->objects(), CHECK_NULL);
Deoptimization::reassign_fields(fst.current(), fst.register_map(), scope->objects(), realloc_failures, false); Deoptimization::reassign_fields(fst.current(), fst.register_map(), scope->objects(), realloc_failures, false);
GrowableArray<ScopeValue*>* local_values = scope->locals(); GrowableArray<ScopeValue*>* local_values = scope->locals();
typeArrayOop array_oop = oopFactory::new_boolArray(local_values->length(), thread); typeArrayOop array_oop = oopFactory::new_boolArray(local_values->length(), CHECK_NULL);
typeArrayHandle array(THREAD, array_oop); typeArrayHandle array(THREAD, array_oop);
for (int i = 0; i < local_values->length(); i++) { for (int i = 0; i < local_values->length(); i++) {
ScopeValue* value = local_values->at(i); ScopeValue* value = local_values->at(i);
@ -1543,7 +1543,7 @@ C2V_VMENTRY(void, materializeVirtualObjects, (JNIEnv*, jobject, jobject hs_frame
THROW_MSG(vmSymbols::java_lang_NullPointerException(), "stack frame is null") THROW_MSG(vmSymbols::java_lang_NullPointerException(), "stack frame is null")
} }
HotSpotStackFrameReference::klass()->initialize(thread); HotSpotStackFrameReference::klass()->initialize(CHECK);
// look for the given stack frame // look for the given stack frame
StackFrameStream fst(thread); StackFrameStream fst(thread);
@ -1601,7 +1601,7 @@ C2V_VMENTRY(void, materializeVirtualObjects, (JNIEnv*, jobject, jobject hs_frame
return; return;
} }
bool realloc_failures = Deoptimization::realloc_objects(thread, fstAfterDeopt.current(), objects, THREAD); bool realloc_failures = Deoptimization::realloc_objects(thread, fstAfterDeopt.current(), objects, CHECK);
Deoptimization::reassign_fields(fstAfterDeopt.current(), fstAfterDeopt.register_map(), objects, realloc_failures, false); Deoptimization::reassign_fields(fstAfterDeopt.current(), fstAfterDeopt.register_map(), objects, realloc_failures, false);
for (int frame_index = 0; frame_index < virtualFrames->length(); frame_index++) { for (int frame_index = 0; frame_index < virtualFrames->length(); frame_index++) {