*** old/src/share/vm/opto/callGenerator.cpp	Mon Oct 24 02:24:27 2011
--- new/src/share/vm/opto/callGenerator.cpp	Mon Oct 24 02:24:27 2011

*** 736,745 ****
--- 736,750 ----
  
  CallGenerator* CallGenerator::for_invokedynamic_inline(ciCallSite* call_site, JVMState* jvms,
                                                         ciMethod* caller, ciMethod* callee, ciCallProfile profile) {
    ciMethodHandle* method_handle = call_site->get_target();
  
+   // Don't inline if there were already too many traps.
+   if (call_site->too_many_traps()) {
+     return NULL;
+   }
+ 
    // Set the callee to have access to the class and signature in the
    // MethodHandleCompiler.
    method_handle->set_callee(callee);
    method_handle->set_caller(caller);
    method_handle->set_call_profile(profile);