Mercurial > hg > truffle
diff src/share/vm/opto/parse1.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 | b0ff910edfc9 |
| children | 6c5b7a6becc8 |
line wrap: on
line diff
--- a/src/share/vm/opto/parse1.cpp Mon Jul 23 13:04:59 2012 -0700 +++ b/src/share/vm/opto/parse1.cpp Tue Jul 24 10:51:00 2012 -0700 @@ -398,7 +398,7 @@ if (PrintCompilation || PrintOpto) { // Make sure I have an inline tree, so I can print messages about it. JVMState* ilt_caller = is_osr_parse() ? caller->caller() : caller; - InlineTree::find_subtree_from_root(C->ilt(), ilt_caller, parse_method, true); + InlineTree::find_subtree_from_root(C->ilt(), ilt_caller, parse_method); } _max_switch_depth = 0; _est_switch_depth = 0; @@ -1398,8 +1398,8 @@ #ifdef ASSERT int pre_bc_sp = sp(); int inputs, depth; - bool have_se = !stopped() && compute_stack_effects(inputs, depth); - assert(!have_se || pre_bc_sp >= inputs, "have enough stack to execute this BC"); + bool have_se = !stopped() && compute_stack_effects(inputs, depth, /*for_parse*/ true); + assert(!have_se || pre_bc_sp >= inputs, err_msg("have enough stack to execute this BC: pre_bc_sp=%d, inputs=%d", pre_bc_sp, inputs)); #endif //ASSERT do_one_bytecode();