From 916e43aa9abe238ffdda3ae549de419774fe8bdc Mon Sep 17 00:00:00 2001 From: Vladimir Ivanov Date: Fri, 18 Jan 2019 17:34:36 -0800 Subject: [PATCH] 8217400: Optimized build is broken by Shenandoah changes Reviewed-by: shade --- src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp | 4 ++-- src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp | 6 +++--- src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp index c21c6e093ef..b6fd59304f9 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp @@ -77,8 +77,8 @@ public: bool has_cset_oops(ShenandoahHeap* heap); - void assert_alive_and_correct() PRODUCT_RETURN; - void assert_same_oops(GrowableArray* oops) PRODUCT_RETURN; + void assert_alive_and_correct() NOT_DEBUG_RETURN; + void assert_same_oops(GrowableArray* oops) NOT_DEBUG_RETURN; static bool find_with_nmethod(void* nm, ShenandoahNMethod* other) { return other->_nm == nm; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp index 85e1ca2037a..546b46448d2 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp @@ -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; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index bb11d045f43..caa430a4483 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -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();