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

7196681: NPG: Some JSR 292 tests crash in Windows exception handler

Browse source 
There was a rogue os::breakpoint() call in log_dependency left over from the jsr292 merge.  Also changed verify_oop() calls for metadata to verify_{method,klass}_ptr.

Reviewed-by: kvn, twisti
This commit is contained in:
Coleen Phillimore 2012-09-11 20:20:38 -04:00
parent 08757b8a99
commit 6f1b52ab16
9 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
View file

@ -1110,7 +1110,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
// allocate space for parameters
__ movptr(method, STATE(_method));
__ verify_oop(method);
__ verify_method_ptr(method);
__ load_unsigned_short(t, Address(method, Method::size_of_parameters_offset()));
__ shll(t, 2);
#ifdef _LP64
@ -1134,7 +1134,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
__ movptr(method, STATE(_method));
__ cmpptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
__ jcc(Assembler::notEqual, pending_exception_present);
__ verify_oop(method);
__ verify_method_ptr(method);
__ movptr(t, Address(method, Method::signature_handler_offset()));
__ bind(L);
}
@ -1162,7 +1162,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
__ movptr(from_ptr, STATE(_locals)); // get the from pointer
__ call(t);
__ movptr(method, STATE(_method));
__ verify_oop(method);
__ verify_method_ptr(method);
// result handler is in rax
// set result handler
@ -1176,7 +1176,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
__ jcc(Assembler::notZero, L);
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call), method);
__ movptr(method, STATE(_method));
__ verify_oop(method);
__ verify_method_ptr(method);
__ movptr(rax, Address(method, Method::native_function_offset()));
__ bind(L);
}
@ -1351,7 +1351,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
__ increment(rsp, wordSize);
__ movptr(method, STATE(_method));
__ verify_oop(method);
__ verify_method_ptr(method);
__ movptr(thread, STATE(_thread)); // get thread
__ bind(Continue);