--- a/hotspot/src/share/vm/classfile/classFileParser.hpp	Thu Oct 11 18:21:01 2012 +0200
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp	Thu Oct 11 14:46:20 2012 -0700
@@ -344,7 +344,7 @@
   // constant pool construction, but in later versions they can.
   // %%% Let's phase out the old is_klass_reference.
   bool is_klass_reference(constantPoolHandle cp, int index) {
-    return ((LinkWellKnownClasses || EnableInvokeDynamic)
+    return (EnableInvokeDynamic
             ? cp->tag_at(index).is_klass_or_reference()
             : cp->tag_at(index).is_klass_reference());
   }