fix

LizBing · Dec 23, 2023 · 1729483 · 1729483
1 parent cf5ccce
commit 1729483
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -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;
 
 private:
   // The young region list.

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -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"