--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Apr 01 10:55:40 2011 +0100
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Apr 01 10:58:10 2011 +0100
@@ -726,25 +726,6 @@
 
 void CppInterpreter::process_method_handle(oop method_handle, TRAPS) {
   JavaThread *thread = (JavaThread *) THREAD;
-  bool interesting = false;
-  {
-    ZeroFrame *zf = thread->top_zero_frame();
-    if (zf != NULL) {
-      zf = zf->next();
-    }
-    if (zf != NULL && zf->is_interpreter_frame()) {
-      InterpreterFrame *frame = zf->as_interpreter_frame();
-      interpreterState istate = frame->interpreter_state();
-      methodOop method = istate->method();
-
-      ResourceMark *rm;
-      if (!strcmp(method->name_and_sig_as_C_string(),
-                  "test.java.dyn.MethodHandlesTest.testPermute"
-                  "Arguments([Ljava/lang/Object;[Ljava/lang/Class;[I)V")) {
-        interesting = true;
-      }
-    }
-  }
   ZeroStack *stack = thread->zero_stack();
   intptr_t *vmslots = stack->sp();
 
@@ -757,10 +738,6 @@
   MethodHandles::EntryKind entry_kind =
     (MethodHandles::EntryKind) (((intptr_t) entry) & 0xffffffff);
 
-  if (interesting) {
-    tty->print_cr("processing %s", MethodHandles::entry_name(entry_kind));
-  }
-
   methodOop method = NULL;
   switch (entry_kind) {
   case MethodHandles::_invokestatic_mh:
@@ -942,12 +919,6 @@
 
       // Create the new slot(s)
       intptr_t *unwind_sp = calculate_unwind_sp(stack, method_handle);
-      if (interesting) {
-        tty->print_cr("arg_slot = %d, num_slots = %d", arg_slot, num_slots);
-        for (intptr_t *slot = stack->sp(); slot < unwind_sp; slot++) {
-          tty->print_cr("  %p: %p", slot, *slot);
-        }
-      }      
       stack->overflow_check(num_slots, THREAD);
       if (HAS_PENDING_EXCEPTION) {
         // all oops trashed
@@ -959,13 +930,7 @@
       for (int i = num_slots - 1; i >= 0; i--)
         stack->push(*VMSLOTS_SLOT(arg_slot + i));
 
-      vmslots = stack->sp();
-      if (interesting) {
-        tty->print_cr("----");
-        for (intptr_t *slot = stack->sp(); slot < unwind_sp; slot++) {
-          tty->print_cr("  %p: %p", slot, *slot);
-        }
-      }      
+      vmslots = stack->sp(); // unused, but let the compiler figure that out
     }
     break;
 
@@ -990,24 +955,9 @@
         java_lang_invoke_AdapterMethodHandle::conversion(method_handle);
       int arg2 = MethodHandles::adapter_conversion_vminfo(conv);
 
-      intptr_t *unwind_sp = calculate_unwind_sp(stack, method_handle);
-      if (interesting) {
-        tty->print_cr("arg1 = %d, arg2 = %d", arg1, arg2);
-        for (intptr_t *slot = stack->sp(); slot < unwind_sp; slot++) {
-          tty->print_cr("  %p: %p", slot, *slot);
-        }
-      }
-      
       intptr_t tmp = *VMSLOTS_SLOT(arg1);
       SET_VMSLOTS_SLOT(VMSLOTS_SLOT(arg2), arg1);
       SET_VMSLOTS_SLOT(&tmp, arg2);
-
-      if (interesting) {
-        tty->print_cr("----");
-        for (intptr_t *slot = stack->sp(); slot < unwind_sp; slot++) {
-          tty->print_cr("  %p: %p", slot, *slot);
-        }
-      }      
     }
     break;