--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp Mon Aug 19 11:30:03 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp Mon Aug 19 12:40:27 2019 +0200
@@ -77,11 +77,11 @@
oop forwardee = obj->forwardee();
if (forwardee == NULL) {
// Not forwarded, return current reference.
- assert(obj->mark_raw() == markWord::prototype_for_object(obj) || // Correct mark
- obj->mark_raw().must_be_preserved(obj) || // Will be restored by PreservedMarksSet
+ assert(obj->mark_raw() == markWord::prototype_for_klass(obj->klass()) || // Correct mark
+ obj->mark_must_be_preserved() || // Will be restored by PreservedMarksSet
(UseBiasedLocking && obj->has_bias_pattern_raw()), // Will be restored by BiasedLocking
"Must have correct prototype or be preserved, obj: " PTR_FORMAT ", mark: " PTR_FORMAT ", prototype: " PTR_FORMAT,
- p2i(obj), obj->mark_raw().value(), markWord::prototype_for_object(obj).value());
+ p2i(obj), obj->mark_raw().value(), markWord::prototype_for_klass(obj->klass()).value());
return;
}