archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6986944: JSR 292 assert(caller_nm->is_method_handle_return(caller_frame.pc())) failed: must be MH call site

Browse source 
Reviewed-by: never, kvn
This commit is contained in:
Christian Thalinger 2010-09-24 03:51:43 -07:00
parent bce771e0fe
commit 79847991ad
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
View file

@ -346,7 +346,7 @@ void trace_method_handle_stub(const char* adaptername,
if (stack_dump_count > 64) stack_dump_count = 48; if (stack_dump_count > 64) stack_dump_count = 48;
for (i = 0; i < stack_dump_count; i += 4) { for (i = 0; i < stack_dump_count; i += 4) {
printf(" dump at SP[%d] "INTPTR_FORMAT": "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT"\n", printf(" dump at SP[%d] "INTPTR_FORMAT": "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT"\n",
i, &entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]); i, (intptr_t) &entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]);
} }
print_method_handle(mh); print_method_handle(mh);
} }

6
hotspot/src/share/vm/ci/ciMethod.cpp
View file

@ -735,7 +735,11 @@ int ciMethod::scale_count(int count, float prof_factor) {
// Return true if the method is an instance of one of the two // Return true if the method is an instance of one of the two
// signature-polymorphic MethodHandle methods, invokeExact or invokeGeneric. // signature-polymorphic MethodHandle methods, invokeExact or invokeGeneric.
bool ciMethod::is_method_handle_invoke() const { bool ciMethod::is_method_handle_invoke() const {
if (!is_loaded()) return false; if (!is_loaded()) {
bool flag = (holder()->name() == ciSymbol::java_dyn_MethodHandle() &&
methodOopDesc::is_method_handle_invoke_name(name()->sid()));
return flag;
}
VM_ENTRY_MARK; VM_ENTRY_MARK;
return get_methodOop()->is_method_handle_invoke(); return get_methodOop()->is_method_handle_invoke();
} }