src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp

@@ -195,11 +195,11 @@
      print_failure(_safe_unknown, obj, interior_loc, NULL, "Shenandoah assert_correct failed",
                    "oop must point to a heap address",
                    file, line);
    }
  
-   Klass* obj_klass = obj->klass_or_null();
+   Klass* obj_klass = obj->forward_safe_klass();
    if (obj_klass == NULL) {
      print_failure(_safe_unknown, obj, interior_loc, NULL, "Shenandoah assert_correct failed",
                    "Object klass pointer should not be NULL",
                    file,line);
    }

@@ -227,11 +227,11 @@
        print_failure(_safe_oop, obj, interior_loc, NULL, "Shenandoah assert_correct failed",
                      "Forwardee must point to a heap address",
                      file, line);
      }
  
-     if (obj_klass != fwd->klass()) {
+     if (obj_klass != fwd->forward_safe_klass()) {
        print_failure(_safe_oop, obj, interior_loc, NULL, "Shenandoah assert_correct failed",
                      "Forwardee klass disagrees with object class",
                      file, line);
      }