1.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp Wed Jan 18 16:18:31 2012 +0100
1.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp Thu Jan 19 13:00:11 2012 -0800
1.3 @@ -1005,7 +1005,7 @@
1.4 intptr_t* base_sp = last_sp;
1.5 typedef MethodHandles::RicochetFrame RicochetFrame;
1.6 RicochetFrame* rfp = (RicochetFrame*)((address)saved_bp - RicochetFrame::sender_link_offset_in_bytes());
1.7 - if (!UseRicochetFrames || Universe::heap()->is_in((address) rfp->saved_args_base())) {
1.8 + if (Universe::heap()->is_in((address) rfp->saved_args_base())) {
1.9 // Probably an interpreter frame.
1.10 base_sp = (intptr_t*) saved_bp[frame::interpreter_frame_monitor_block_top_offset];
1.11 }
1.12 @@ -1104,7 +1104,7 @@
1.13 |(1<<java_lang_invoke_AdapterMethodHandle::OP_DROP_ARGS)
1.14 //OP_COLLECT_ARGS is below...
1.15 |(1<<java_lang_invoke_AdapterMethodHandle::OP_SPREAD_ARGS)
1.16 - |(!UseRicochetFrames ? 0 :
1.17 + |(
1.18 java_lang_invoke_MethodTypeForm::vmlayout_offset_in_bytes() <= 0 ? 0 :
1.19 ((1<<java_lang_invoke_AdapterMethodHandle::OP_PRIM_TO_REF)
1.20 |(1<<java_lang_invoke_AdapterMethodHandle::OP_COLLECT_ARGS)
