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

*** 1,7 ***
--- 1,8 ---
  /*
   * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 70,10 ***
--- 71,13 ---
    static void assert_locked_or_shenandoah_safepoint(Mutex* lock, const char* file, int line);
  
    static void assert_heaplocked(const char* file, int line);
    static void assert_not_heaplocked(const char* file, int line);
    static void assert_heaplocked_or_safepoint(const char* file, int line);
+   static void assert_control_or_vm_thread_at_safepoint(bool at_safepoint, const char* file, int line);
+   static void assert_generational(const char* file, int line);
+   static void assert_generations_reconciled(const char* file, int line);
  
  #ifdef ASSERT
  #define shenandoah_assert_in_heap_bounds(interior_loc, obj) \
                      ShenandoahAsserts::assert_in_heap_bounds(interior_loc, obj, __FILE__, __LINE__)
  #define shenandoah_assert_in_heap_bounds_or_null(interior_loc, obj) \

*** 161,10 ***
--- 165,25 ---
  #define shenandoah_assert_not_heaplocked() \
                      ShenandoahAsserts::assert_not_heaplocked(__FILE__, __LINE__)
  
  #define shenandoah_assert_heaplocked_or_safepoint() \
                      ShenandoahAsserts::assert_heaplocked_or_safepoint(__FILE__, __LINE__)
+ 
+ #define shenandoah_assert_control_or_vm_thread() \
+                     ShenandoahAsserts::assert_control_or_vm_thread(false /* at_safepoint */, __FILE__, __LINE__)
+ 
+ // A stronger version of the above that checks that we are at a safepoint if the vm thread
+ #define shenandoah_assert_control_or_vm_thread_at_safepoint()                                                                                                               \
+                     ShenandoahAsserts::assert_control_or_vm_thread_at_safepoint(true /* at_safepoint */, __FILE__, __LINE__)
+ 
+ #define shenandoah_assert_generational() \
+                     ShenandoahAsserts::assert_generational(__FILE__, __LINE__)
+ 
+ // Some limited sanity checking of the _gc_generation and _active_generation fields of ShenandoahHeap
+ #define shenandoah_assert_generations_reconciled()                                                             \
+                     ShenandoahAsserts::assert_generations_reconciled(__FILE__, __LINE__)
+ 
  #else
  #define shenandoah_assert_in_heap_bounds(interior_loc, obj)
  #define shenandoah_assert_in_heap_bounds_or_null(interior_loc, obj)
  #define shenandoah_assert_in_correct_region(interior_loc, obj)
  

*** 211,10 ***
--- 230,14 ---
  #define shenandoah_assert_locked_or_safepoint(lock)
  
  #define shenandoah_assert_heaplocked()
  #define shenandoah_assert_not_heaplocked()
  #define shenandoah_assert_heaplocked_or_safepoint()
+ #define shenandoah_assert_control_or_vm_thread()
+ #define shenandoah_assert_control_or_vm_thread_at_safepoint()
+ #define shenandoah_assert_generational()
+ #define shenandoah_assert_generations_reconciled()
  
  #endif
  
  #define shenandoah_not_implemented \
                      { fatal("Deliberately not implemented."); }