--- a/hotspot/src/share/vm/ci/ciObject.cpp	Mon Apr 28 16:05:12 2014 -0700
+++ b/hotspot/src/share/vm/ci/ciObject.cpp	Tue Apr 29 08:08:44 2014 +0200
@@ -181,9 +181,8 @@
     if (klass() == env->String_klass() || klass() == env->Class_klass()) {
       return true;
     }
-  if (EnableInvokeDynamic &&
-      (klass()->is_subclass_of(env->MethodHandle_klass()) ||
-       klass()->is_subclass_of(env->CallSite_klass()))) {
+  if (klass()->is_subclass_of(env->MethodHandle_klass()) ||
+      klass()->is_subclass_of(env->CallSite_klass())) {
     assert(ScavengeRootsInCode >= 1, "must be");
     // We want to treat these aggressively.
     return true;