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

7106774: JSR 292: nightly test inlineMHTarget fails with wrong result

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Christian Thalinger 2011-11-03 01:43:26 -07:00
parent b354aa367c
commit 5a4de97cf0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hotspot/src/share/vm/interpreter/bytecode.hpp
View File

@ -234,6 +234,13 @@ class Bytecode_invoke: public Bytecode_member_ref {
is_invokespecial() ||
is_invokedynamic(); }
bool is_method_handle_invoke() const {
return (is_invokedynamic() ||
(is_invokevirtual() &&
method()->constants()->klass_ref_at_noresolve(index()) == vmSymbols::java_lang_invoke_MethodHandle() &&
methodOopDesc::is_method_handle_invoke_name(name())));
}
// Helper to skip verification. Used is_valid() to check if the result is really an invoke
inline friend Bytecode_invoke Bytecode_invoke_check(methodHandle method, int bci);
};

8
hotspot/src/share/vm/runtime/deoptimization.cpp
View File

@ -388,12 +388,8 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
bool caller_was_method_handle = false;
if (deopt_sender.is_interpreted_frame()) {
methodHandle method = deopt_sender.interpreter_frame_method();
Bytecode_invoke cur = Bytecode_invoke_check(method,
deopt_sender.interpreter_frame_bci());
if (cur.code() == Bytecodes::_invokedynamic ||
(cur.code() == Bytecodes::_invokevirtual &&
method->constants()->klass_ref_at_noresolve(cur.index()) == vmSymbols::java_lang_invoke_MethodHandle() &&
methodOopDesc::is_method_handle_invoke_name(cur.name()))) {
Bytecode_invoke cur = Bytecode_invoke_check(method, deopt_sender.interpreter_frame_bci());
if (cur.is_method_handle_invoke()) {
// Method handle invokes may involve fairly arbitrary chains of
// calls so it's impossible to know how much actual space the
// caller has for locals.