Mercurial > hg > truffle

diff src/cpu/x86/vm/methodHandles_x86.cpp @ 4852:6d00795f99a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dsamersoff
date Wed, 25 Jan 2012 15:03:42 -0800
parents 15d394228cfa
children 82e5a84b7436
line wrap: on
line diff
--- a/src/cpu/x86/vm/methodHandles_x86.cpp	Wed Jan 25 21:10:08 2012 +0400
+++ b/src/cpu/x86/vm/methodHandles_x86.cpp	Wed Jan 25 15:03:42 2012 -0800
@@ -1005,7 +1005,7 @@
   intptr_t* base_sp = last_sp;
   typedef MethodHandles::RicochetFrame RicochetFrame;
   RicochetFrame* rfp = (RicochetFrame*)((address)saved_bp - RicochetFrame::sender_link_offset_in_bytes());
-  if (!UseRicochetFrames || Universe::heap()->is_in((address) rfp->saved_args_base())) {
+  if (Universe::heap()->is_in((address) rfp->saved_args_base())) {
     // Probably an interpreter frame.
     base_sp = (intptr_t*) saved_bp[frame::interpreter_frame_monitor_block_top_offset];
   }
@@ -1104,7 +1104,7 @@
          |(1<<java_lang_invoke_AdapterMethodHandle::OP_DROP_ARGS)
           //OP_COLLECT_ARGS is below...
          |(1<<java_lang_invoke_AdapterMethodHandle::OP_SPREAD_ARGS)
-         |(!UseRicochetFrames ? 0 :
+         |(
            java_lang_invoke_MethodTypeForm::vmlayout_offset_in_bytes() <= 0 ? 0 :
            ((1<<java_lang_invoke_AdapterMethodHandle::OP_PRIM_TO_REF)
            |(1<<java_lang_invoke_AdapterMethodHandle::OP_COLLECT_ARGS)