--- old/src/share/vm/opto/type.cpp	2015-10-08 22:15:55.780110258 +0200
+++ new/src/share/vm/opto/type.cpp	2015-10-08 22:15:55.729111476 +0200
@@ -2832,7 +2832,7 @@
 
         if (klass() == ciEnv::current()->Class_klass() &&
             (_offset == java_lang_Class::klass_offset_in_bytes() ||
-             _offset == java_lang_Class::array_klass_offset_in_bytes())) {
+             _offset == java_lang_Class::array_klass_offset_in_bytes()) || UseShenandoahGC) {
           // Special hidden fields from the Class.
           assert(this->isa_instptr(), "must be an instance ptr.");
           _is_ptr_to_narrowoop = false;