Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8227713: Convert G1's assert_ macros into NOT_DEBUG_RETURN functions #17188

Closed
wants to merge 6 commits into from
+89 −87
Closed

8227713: Convert G1's assert_ macros into NOT_DEBUG_RETURN functions #17188

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02e74bf
refactor heap locking assert functions
LizBing Dec 23, 2023
cf5ccce
make them static
LizBing Dec 23, 2023
1729483
fix
LizBing Dec 23, 2023
6a18b09
use the 'DEBUG_ONLY' macro
LizBing Dec 23, 2023
75f3010
use 'ASSERT' and fix include statement
LizBing Dec 23, 2023
8133b55
make 'assert_used_and_recalculate_used_equal' into a member function
LizBing Dec 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/hotspot/share/gc/g1/g1CollectedHeap.hpp
View file
Original file line number Diff line number Diff line change
@@ -309,13 +309,13 @@ class G1CollectedHeap : public CollectedHeap {
// These are assert functions so that, if the assert fires, we get the correct
// line number, file, etc.
public:
static void assert_heap_locked() NOT_DEBUG_RETURN;
static void assert_heap_locked_or_at_safepoint(bool should_be_vm_thread) NOT_DEBUG_RETURN;
static void assert_heap_locked_and_not_at_safepoint() NOT_DEBUG_RETURN;
static void assert_heap_not_locked() NOT_DEBUG_RETURN;
static void assert_heap_not_locked_and_not_at_safepoint() NOT_DEBUG_RETURN;
static void assert_at_safepoint_on_vm_thread() NOT_DEBUG_RETURN;
static void assert_used_and_recalculate_used_equal(G1CollectedHeap* g1h) NOT_DEBUG_RETURN;
inline static void assert_heap_locked() NOT_DEBUG_RETURN;
inline static void assert_heap_locked_or_at_safepoint(bool should_be_vm_thread) NOT_DEBUG_RETURN;
inline static void assert_heap_locked_and_not_at_safepoint() NOT_DEBUG_RETURN;
inline static void assert_heap_not_locked() NOT_DEBUG_RETURN;
inline static void assert_heap_not_locked_and_not_at_safepoint() NOT_DEBUG_RETURN;
inline static void assert_at_safepoint_on_vm_thread() NOT_DEBUG_RETURN;
inline static void assert_used_and_recalculate_used_equal(G1CollectedHeap* g1h) NOT_DEBUG_RETURN;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the intent was to leave these at namespace scope, rather than putting them in this class.
And perhaps move some of them to some more shared location, as many are pretty generic and
not specific to G1.


private:
// The young region list.
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
View file
Original file line number Diff line number Diff line change
@@ -361,7 +361,7 @@ inline void G1CollectedHeap::assert_at_safepoint_on_vm_thread() {

inline void G1CollectedHeap::
assert_used_and_recalculate_used_equal(G1CollectedHeap* g1h) {
#if ASSERT
#ifdef ASSERT
size_t cur_used_bytes = g1h->used();
size_t recal_used_bytes = g1h->recalculate_used();
assert(cur_used_bytes == recal_used_bytes, "Used(" SIZE_FORMAT ") is not"