Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fix crash in JVMTI FiberTest, part 2
- Loading branch information
Showing
with
6 additions
and
1 deletion.
-
+6
−1
src/hotspot/share/code/compiledMethod.cpp
|
@@ -359,7 +359,12 @@ int CompiledMethod::verify_icholder_relocations() { |
|
|
// Method that knows how to preserve outgoing arguments at call. This method must be |
|
|
// called with a frame corresponding to a Java invoke |
|
|
void CompiledMethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) { |
|
|
if (method() != NULL && !method()->is_native()) { |
|
|
if (method() != NULL && !method()->is_native() && reg_map->thread()) { |
|
|
// handle the case of an anchor explicitly set in continuation code that doesn't have a callee |
|
|
JavaThread* thread = reg_map->thread(); |
|
|
if (thread->has_last_Java_frame() && fr.sp() == thread->last_Java_sp()) |
|
|
return; |
|
|
|
|
|
address pc = fr.pc(); |
|
|
SimpleScopeDesc ssd(this, pc); |
|
|
Bytecode_invoke call(methodHandle(Thread::current(), ssd.method()), ssd.bci()); |
|
|