Mercurial > hg > truffle
diff src/share/vm/c1/c1_GraphBuilder.hpp @ 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 | f067b4e0e04b |
| children | 7f813940ac35 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.hpp Mon Jul 23 13:04:59 2012 -0700 +++ b/src/share/vm/c1/c1_GraphBuilder.hpp Tue Jul 24 10:51:00 2012 -0700 @@ -225,7 +225,7 @@ void load_constant(); void load_local(ValueType* type, int index); void store_local(ValueType* type, int index); - void store_local(ValueStack* state, Value value, ValueType* type, int index); + void store_local(ValueStack* state, Value value, int index); void load_indexed (BasicType type); void store_indexed(BasicType type); void stack_op(Bytecodes::Code code); @@ -337,14 +337,16 @@ void fill_sync_handler(Value lock, BlockBegin* sync_handler, bool default_handler = false); // inliners - bool try_inline( ciMethod* callee, bool holder_known, Value receiver = NULL); + bool try_inline( ciMethod* callee, bool holder_known, Bytecodes::Code bc = Bytecodes::_illegal, Value receiver = NULL); bool try_inline_intrinsics(ciMethod* callee); - bool try_inline_full( ciMethod* callee, bool holder_known, BlockBegin* cont_block, Value receiver); + bool try_inline_full( ciMethod* callee, bool holder_known, Bytecodes::Code bc = Bytecodes::_illegal, Value receiver = NULL); bool try_inline_jsr(int jsr_dest_bci); + const char* check_can_parse(ciMethod* callee) const; + const char* should_not_inline(ciMethod* callee) const; + // JSR 292 support bool for_method_handle_inline(ciMethod* callee); - bool for_invokedynamic_inline(ciMethod* callee); // helpers void inline_bailout(const char* msg); @@ -366,9 +368,9 @@ bool append_unsafe_prefetch(ciMethod* callee, bool is_store, bool is_static); void append_unsafe_CAS(ciMethod* callee); - NOT_PRODUCT(void print_inline_result(ciMethod* callee, bool res);) + void print_inlining(ciMethod* callee, const char* msg, bool success = true); - void profile_call(Value recv, ciKlass* predicted_holder); + void profile_call(ciMethod* callee, Value recv, ciKlass* predicted_holder); void profile_invocation(ciMethod* inlinee, ValueStack* state); // Shortcuts to profiling control.