--- a/hotspot/src/share/vm/oops/cpCache.cpp	Mon Oct 26 13:11:36 2015 -0400
+++ b/hotspot/src/share/vm/oops/cpCache.cpp	Wed Oct 28 09:47:23 2015 -0400
@@ -394,7 +394,7 @@
         int holder_index = cpool->uncached_klass_ref_index_at(constant_pool_index());
         if (cpool->tag_at(holder_index).is_klass()) {
           Klass* klass = cpool->resolved_klass_at(holder_index);
-          if (!klass->oop_is_instance())
+          if (!klass->is_instance_klass())
             klass = SystemDictionary::Object_klass();
           return InstanceKlass::cast(klass)->method_at_vtable(f2_as_index());
         }