test/hotspot/gtest/oops/test_markOop.cpp

*** 96,108 ****
    assert_test_pattern(h_obj, "is_biased");
  
    // Lock using biased locking.
    BasicObjectLock lock;
    lock.set_obj(obj);
!   markWord mark = obj->mark().incr_bias_epoch();
!   obj->set_mark(mark);
!   ObjectSynchronizer::fast_enter(h_obj, lock.lock(), true, THREAD);
    // Look for the biased_locker in markWord, not prototype_header.
  #ifdef _LP64
    assert_not_test_pattern(h_obj, "mark(is_biased biased_locker=0x0000000000000000");
  #else
    assert_not_test_pattern(h_obj, "mark(is_biased biased_locker=0x00000000");
--- 96,109 ----
    assert_test_pattern(h_obj, "is_biased");
  
    // Lock using biased locking.
    BasicObjectLock lock;
    lock.set_obj(obj);
!   markWord prototype_header = obj->klass()->prototype_header();
!   markWord mark = obj->mark();
!   markWord biased_mark = markWord::encode((JavaThread*) THREAD, mark.age(), prototype_header.bias_epoch());
!   obj->set_mark(biased_mark);
    // Look for the biased_locker in markWord, not prototype_header.
  #ifdef _LP64
    assert_not_test_pattern(h_obj, "mark(is_biased biased_locker=0x0000000000000000");
  #else
    assert_not_test_pattern(h_obj, "mark(is_biased biased_locker=0x00000000");