--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp	Fri Oct 09 15:48:30 2015 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp	Fri Oct 09 14:08:15 2015 -0400
@@ -588,7 +588,7 @@
     _obj_tag = (_entry == NULL) ? 0 : _entry->tag();
 
     // get the class and the class's tag value
-    assert(SystemDictionary::Class_klass()->oop_is_instanceMirror(), "Is not?");
+    assert(InstanceKlass::cast(SystemDictionary::Class_klass())->is_mirror_instance_klass(), "Is not?");
 
     _klass_tag = tag_for(tag_map, _o->klass()->java_mirror());
   }