Mercurial > hg > graal-compiler
diff src/share/vm/opto/library_call.cpp @ 6266:1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
6984705: JSR 292 method handle creation should not go through JNI
Summary: remove assembly code for JDK 7 chained method handles
Reviewed-by: jrose, twisti, kvn, mhaupt
Contributed-by: John Rose <john.r.rose@oracle.com>, Christian Thalinger <christian.thalinger@oracle.com>, Michael Haupt <michael.haupt@oracle.com>
author | twisti |
---|---|
date | Tue, 24 Jul 2012 10:51:00 -0700 |
parents | d50605d9417e |
children | 09aad8452938 |
line wrap: on
line diff
--- a/src/share/vm/opto/library_call.cpp Mon Jul 23 13:04:59 2012 -0700 +++ b/src/share/vm/opto/library_call.cpp Tue Jul 24 10:51:00 2012 -0700 @@ -2171,7 +2171,7 @@ if (id == vmIntrinsics::_reverseBytes_l && !Matcher::has_match_rule(Op_ReverseBytesL)) return false; if (id == vmIntrinsics::_reverseBytes_c && !Matcher::has_match_rule(Op_ReverseBytesUS)) return false; if (id == vmIntrinsics::_reverseBytes_s && !Matcher::has_match_rule(Op_ReverseBytesS)) return false; - _sp += arg_size(); // restore stack pointer + _sp += arg_size(); // restore stack pointer switch (id) { case vmIntrinsics::_reverseBytes_i: push(_gvn.transform(new (C, 2) ReverseBytesINode(0, pop()))); @@ -2344,6 +2344,7 @@ // Argument words: "this" plus (oop/offset) or (lo/hi) args plus maybe 1 or 2 value words int nargs = 1 + (is_native_ptr ? 2 : 3) + (is_store ? type_words : 0); + assert(callee()->arg_size() == nargs, "must be"); debug_only(int saved_sp = _sp); _sp += nargs; @@ -4047,7 +4048,8 @@ } } } - else if (method->is_method_handle_adapter()) { + else if (method->is_method_handle_intrinsic() || + method->is_compiled_lambda_form()) { // This is an internal adapter frame from the MethodHandleCompiler -- skip it return true; }