*** old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Oct 22 18:35:29 2009
--- new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Thu Oct 22 18:35:29 2009

*** 2933,2942 ****
--- 2933,2952 ----
      // support for verify_oop (must happen after universe_init)
      StubRoutines::_verify_oop_subroutine_entry = generate_verify_oop();
  
      // arraycopy stubs used by compilers
      generate_arraycopy_stubs();
+ 
+     // generic method handle stubs
+     if (EnableMethodHandles && SystemDictionary::MethodHandle_klass() != NULL) {
+       for (MethodHandles::EntryKind ek = MethodHandles::_EK_FIRST;
+            ek < MethodHandles::_EK_LIMIT;
+            ek = MethodHandles::EntryKind(1 + (int)ek)) {
+         StubCodeMark mark(this, "MethodHandle", MethodHandles::entry_name(ek));
+         MethodHandles::generate_method_handle_stub(_masm, ek);
+       }
+     }
    }
  
   public:
    StubGenerator(CodeBuffer* code, bool all) : StubCodeGenerator(code) {
      if (all) {