8217400: Optimized build is broken by Shenandoah changes

Reviewed-by: shade
This commit is contained in:
Vladimir Ivanov 2019-01-18 17:34:36 -08:00
parent 8f16189ab3
commit 916e43aa9a
3 changed files with 9 additions and 9 deletions

View File

@ -77,8 +77,8 @@ public:
bool has_cset_oops(ShenandoahHeap* heap);
void assert_alive_and_correct() PRODUCT_RETURN;
void assert_same_oops(GrowableArray<oop*>* oops) PRODUCT_RETURN;
void assert_alive_and_correct() NOT_DEBUG_RETURN;
void assert_same_oops(GrowableArray<oop*>* oops) NOT_DEBUG_RETURN;
static bool find_with_nmethod(void* nm, ShenandoahNMethod* other) {
return other->_nm == nm;

View File

@ -42,9 +42,9 @@ private:
size_t _capacity;
size_t _used;
void assert_bounds() const PRODUCT_RETURN;
void assert_heaplock_owned_by_current_thread() const PRODUCT_RETURN;
void assert_heaplock_not_owned_by_current_thread() const PRODUCT_RETURN;
void assert_bounds() const NOT_DEBUG_RETURN;
void assert_heaplock_owned_by_current_thread() const NOT_DEBUG_RETURN;
void assert_heaplock_not_owned_by_current_thread() const NOT_DEBUG_RETURN;
bool is_mutator_free(size_t idx) const;
bool is_collector_free(size_t idx) const;

View File

@ -163,9 +163,9 @@ public:
return &_lock;
}
void assert_heaplock_owned_by_current_thread() PRODUCT_RETURN;
void assert_heaplock_not_owned_by_current_thread() PRODUCT_RETURN;
void assert_heaplock_or_safepoint() PRODUCT_RETURN;
void assert_heaplock_owned_by_current_thread() NOT_DEBUG_RETURN;
void assert_heaplock_not_owned_by_current_thread() NOT_DEBUG_RETURN;
void assert_heaplock_or_safepoint() NOT_DEBUG_RETURN;
// ---------- Initialization, termination, identification, printing routines
//
@ -231,7 +231,7 @@ private:
public:
uint max_workers();
void assert_gc_workers(uint nworker) PRODUCT_RETURN;
void assert_gc_workers(uint nworker) NOT_DEBUG_RETURN;
WorkGang* workers() const;
WorkGang* get_safepoint_workers();