--- a/hotspot/src/share/vm/runtime/init.cpp	Tue Feb 16 12:01:37 2016 -0800
+++ b/hotspot/src/share/vm/runtime/init.cpp	Thu Feb 18 18:10:35 2016 +0100
@@ -145,6 +145,7 @@
   }
   javaClasses_init();   // must happen after vtable initialization
   stubRoutines_init2(); // note: StubRoutines need 2-phase init
+  MethodHandles::generate_adapters();
   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::StubRoutines2);
 
 #if INCLUDE_NMT