src/share/vm/gc_implementation/shenandoah/shenandoahAsserts.hpp

rev 10581 : [backport] Refactor alive-closures to deal better with new marking contexts
rev 10614 : [backport] Replace custom asserts with shenandoah_assert_*

*** 47,67 ****
  
    static void print_failure(SafeLevel level, oop obj, void *interior_loc, oop loc,
                              const char *phase, const char *label,
                              const char *file, int line);
  
!   static void print_rp_failure(const char *label, BoolObjectClosure* actual, BoolObjectClosure* expected,
                                 const char *file, int line);
  
    static void assert_in_heap(void* interior_loc, oop obj, const char* file, int line);
    static void assert_in_correct_region(void* interior_loc, oop obj, const char* file, int line);
  
    static void assert_correct(void* interior_loc, oop obj, const char* file, int line);
    static void assert_forwarded(void* interior_loc, oop obj, const char* file, int line);
    static void assert_not_forwarded(void* interior_loc, oop obj, const char* file, int line);
    static void assert_marked_complete(void* interior_loc, oop obj, const char* file, int line);
    static void assert_marked_next(void* interior_loc, oop obj, const char* file, int line);
    static void assert_not_in_cset(void* interior_loc, oop obj, const char* file, int line);
    static void assert_not_in_cset_loc(void* interior_loc, const char* file, int line);
  
    static void assert_rp_isalive_not_installed(const char *file, int line);
    static void assert_rp_isalive_installed(const char *file, int line);
--- 47,68 ----
  
    static void print_failure(SafeLevel level, oop obj, void *interior_loc, oop loc,
                              const char *phase, const char *label,
                              const char *file, int line);
  
!   static void print_rp_failure(const char *label, BoolObjectClosure* actual,
                                 const char *file, int line);
  
    static void assert_in_heap(void* interior_loc, oop obj, const char* file, int line);
    static void assert_in_correct_region(void* interior_loc, oop obj, const char* file, int line);
  
    static void assert_correct(void* interior_loc, oop obj, const char* file, int line);
    static void assert_forwarded(void* interior_loc, oop obj, const char* file, int line);
    static void assert_not_forwarded(void* interior_loc, oop obj, const char* file, int line);
    static void assert_marked_complete(void* interior_loc, oop obj, const char* file, int line);
    static void assert_marked_next(void* interior_loc, oop obj, const char* file, int line);
+   static void assert_in_cset(void* interior_loc, oop obj, const char* file, int line);
    static void assert_not_in_cset(void* interior_loc, oop obj, const char* file, int line);
    static void assert_not_in_cset_loc(void* interior_loc, const char* file, int line);
  
    static void assert_rp_isalive_not_installed(const char *file, int line);
    static void assert_rp_isalive_installed(const char *file, int line);
*** 105,114 ****
--- 106,122 ----
  #define shenandoah_assert_marked_next_except(interior_loc, obj, exception) \
    if (!(exception)) ShenandoahAsserts::assert_marked_next(interior_loc, obj, __FILE__, __LINE__);
  #define shenandoah_assert_marked_next(interior_loc, obj) \
                      ShenandoahAsserts::assert_marked_next(interior_loc, obj, __FILE__, __LINE__);
  
+ #define shenandoah_assert_in_cset_if(interior_loc, obj, condition) \
+   if (condition)    ShenandoahAsserts::assert_in_cset(interior_loc, obj, __FILE__, __LINE__);
+ #define shenandoah_assert_in_cset_except(interior_loc, obj, exception) \
+   if (!(exception)) ShenandoahAsserts::assert_in_cset(interior_loc, obj, __FILE__, __LINE__);
+ #define shenandoah_assert_in_cset(interior_loc, obj) \
+                     ShenandoahAsserts::assert_in_cset(interior_loc, obj, __FILE__, __LINE__);
+ 
  #define shenandoah_assert_not_in_cset_if(interior_loc, obj, condition) \
    if (condition)    ShenandoahAsserts::assert_not_in_cset(interior_loc, obj, __FILE__, __LINE__);
  #define shenandoah_assert_not_in_cset_except(interior_loc, obj, exception) \
    if (!(exception)) ShenandoahAsserts::assert_not_in_cset(interior_loc, obj, __FILE__, __LINE__);
  #define shenandoah_assert_not_in_cset(interior_loc, obj) \
*** 147,156 ****
--- 155,168 ----
  
  #define shenandoah_assert_marked_next_if(interior_loc, obj, condition)
  #define shenandoah_assert_marked_next_except(interior_loc, obj, exception)
  #define shenandoah_assert_marked_next(interior_loc, obj)
  
+ #define shenandoah_assert_in_cset_if(interior_loc, obj, condition)
+ #define shenandoah_assert_in_cset_except(interior_loc, obj, exception)
+ #define shenandoah_assert_in_cset(interior_loc, obj)
+ 
  #define shenandoah_assert_not_in_cset_if(interior_loc, obj, condition)
  #define shenandoah_assert_not_in_cset_except(interior_loc, obj, exception)
  #define shenandoah_assert_not_in_cset(interior_loc, obj)
  
  #define shenandoah_assert_not_in_cset_loc_if(interior_loc, condition)