stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8145137: Incorrect call signature can be used in nmethod::preserve_callee_argument_oops

Browse Source 
Reviewed-by: roland, jrose
This commit is contained in:
Vladimir Ivanov 2015-12-11 15:03:11 +03:00
parent e56a7de478
commit 1a4c3a752d
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hotspot/src/share/vm/code/nmethod.cpp
View File

@ -2332,11 +2332,22 @@ bool nmethod::detect_scavenge_root_oops() {
void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) {
#ifndef SHARK
if (method() != NULL && !method()->is_native()) {
SimpleScopeDesc ssd(this, fr.pc());
address pc = fr.pc();
SimpleScopeDesc ssd(this, pc);
Bytecode_invoke call(ssd.method(), ssd.bci());
bool has_receiver = call.has_receiver();
bool has_appendix = call.has_appendix();
Symbol* signature = call.signature();
// The method attached by JIT-compilers should be used, if present.
// Bytecode can be inaccurate in such case.
Method* callee = attached_method_before_pc(pc);
if (callee != NULL) {
has_receiver = !(callee->access_flags().is_static());
has_appendix = false;
signature = callee->signature();
}
fr.oops_compiled_arguments_do(signature, has_receiver, has_appendix, reg_map, f);
}
#endif // !SHARK
@ -3526,3 +3537,11 @@ Method* nmethod::attached_method(address call_instr) {
return NULL; // not found
}
Method* nmethod::attached_method_before_pc(address pc) {
if (NativeCall::is_call_before(pc)) {
NativeCall* ncall = nativeCall_before(pc);
return attached_method(ncall->instruction_address());
}
return NULL; // not a call
}

1
hotspot/src/share/vm/code/nmethod.hpp
View File

@ -512,6 +512,7 @@ class nmethod : public CodeBlob {
void copy_values(GrowableArray<Metadata*>* metadata);
Method* attached_method(address call_pc);
Method* attached_method_before_pc(address pc);
// Relocation support
private:

5
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View File

@ -1078,10 +1078,7 @@ methodHandle SharedRuntime::extract_attached_method(vframeStream& vfst) {
address pc = vfst.frame_pc();
{ // Get call instruction under lock because another thread may be busy patching it.
MutexLockerEx ml_patch(Patching_lock, Mutex::_no_safepoint_check_flag);
if (NativeCall::is_call_before(pc)) {
NativeCall* ncall = nativeCall_before(pc);
return caller_nm->attached_method(ncall->instruction_address());
}
return caller_nm->attached_method_before_pc(pc);
}
return NULL;
}

16
hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java
View File

@ -74,23 +74,23 @@ public class InvokeTest {
}
static class T implements I {
@DontInline public Class<?> f1() { if (doDeopt) WB.deoptimize(); return T.class; }
@DontInline public static Class<?> f2() { if (doDeopt) WB.deoptimize(); return T.class; }
@DontInline private Class<?> f4() { if (doDeopt) WB.deoptimize(); return T.class; }
@DontInline public Class<?> f1() { if (doDeopt) WB.deoptimizeAll(); return T.class; }
@DontInline public static Class<?> f2() { if (doDeopt) WB.deoptimizeAll(); return T.class; }
@DontInline private Class<?> f4() { if (doDeopt) WB.deoptimizeAll(); return T.class; }
}
static class P1 extends T {
@DontInline public Class<?> f1() { if (doDeopt) WB.deoptimize(); return P1.class; }
@DontInline public Class<?> f3() { if (doDeopt) WB.deoptimize(); return P1.class; }
@DontInline public Class<?> f1() { if (doDeopt) WB.deoptimizeAll(); return P1.class; }
@DontInline public Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return P1.class; }
}
static class P2 extends T {
@DontInline public Class<?> f1() { if (doDeopt) WB.deoptimize(); return P2.class; }
@DontInline public Class<?> f3() { if (doDeopt) WB.deoptimize(); return P2.class; }
@DontInline public Class<?> f1() { if (doDeopt) WB.deoptimizeAll(); return P2.class; }
@DontInline public Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return P2.class; }
}
static interface I {
@DontInline default Class<?> f3() { if (doDeopt) WB.deoptimize(); return I.class; }
@DontInline default Class<?> f3() { if (doDeopt) WB.deoptimizeAll(); return I.class; }
}
@DontInline