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

*** 69,10 ***
--- 69,13 ---
    msg.append("    %3s allocated after mark start\n", ctx->allocated_after_mark_start(obj) ? "" : "not");
    msg.append("    %3s after update watermark\n",     cast_from_oop<HeapWord*>(obj) >= r->get_update_watermark() ? "" : "not");
    msg.append("    %3s marked strong\n",              ctx->is_marked_strong(obj) ? "" : "not");
    msg.append("    %3s marked weak\n",                ctx->is_marked_weak(obj) ? "" : "not");
    msg.append("    %3s in collection set\n",          heap->in_collection_set(obj) ? "" : "not");
+   if (heap->mode()->is_generational() && !obj->is_forwarded()) {
+     msg.append("  age: %d\n", obj->age());
+   }
    msg.append("  mark:%s\n", mw_ss.freeze());
    msg.append("  region: %s", ss.freeze());
  }
  
  void ShenandoahAsserts::print_non_obj(ShenandoahMessageBuffer& msg, void* loc) {

*** 383,11 ***
  
    if (lock->owned_by_self()) {
      return;
    }
  
!   ShenandoahMessageBuffer msg("Must ba at a Shenandoah safepoint or held %s lock", lock->name());
    report_vm_error(file, line, msg.buffer());
  }
  
  void ShenandoahAsserts::assert_heaplocked(const char* file, int line) {
    ShenandoahHeap* heap = ShenandoahHeap::heap();
--- 386,11 ---
  
    if (lock->owned_by_self()) {
      return;
    }
  
!   ShenandoahMessageBuffer msg("Must be at a Shenandoah safepoint or held %s lock", lock->name());
    report_vm_error(file, line, msg.buffer());
  }
  
  void ShenandoahAsserts::assert_heaplocked(const char* file, int line) {
    ShenandoahHeap* heap = ShenandoahHeap::heap();

*** 423,5 ***
--- 426,22 ---
    }
  
    ShenandoahMessageBuffer msg("Heap lock must be owned by current thread, or be at safepoint");
    report_vm_error(file, line, msg.buffer());
  }
+ 
+ // Unlike assert_heaplocked_or_safepoint(), this does not require current thread in safepoint to be a VM thread
+ // TODO: This should be more aptly named. Nothing in this method checks we are actually in Full GC.
+ void ShenandoahAsserts::assert_heaplocked_or_fullgc_safepoint(const char* file, int line) {
+   ShenandoahHeap* heap = ShenandoahHeap::heap();
+ 
+   if (heap->lock()->owned_by_self()) {
+     return;
+   }
+ 
+   if (ShenandoahSafepoint::is_at_shenandoah_safepoint()) {
+     return;
+   }
+ 
+   ShenandoahMessageBuffer msg("Heap lock must be owned by current thread, or be at safepoint");
+   report_vm_error(file, line, msg.buffer());
+ }