--- a/hotspot/src/share/vm/runtime/thread.cpp	Mon Apr 28 16:05:12 2014 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Tue Apr 29 08:08:44 2014 +0200
@@ -3602,9 +3602,7 @@
   // It is done after compilers are initialized, because otherwise compilations of
   // signature polymorphic MH intrinsics can be missed
   // (see SystemDictionary::find_method_handle_intrinsic).
-  if (EnableInvokeDynamic) {
-    initialize_jsr292_core_classes(CHECK_JNI_ERR);
-  }
+  initialize_jsr292_core_classes(CHECK_JNI_ERR);
 
 #if INCLUDE_MANAGEMENT
   Management::initialize(THREAD);