8288482: JFR: Cannot resolve method

Reviewed-by: jbachorik
openjdk · Jul 19, 2022 · a6bab2a · a6bab2a · openjdk-notifier · Jul 19, 2022
1 parent 4dc421c
commit a6bab2a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -197,7 +197,9 @@ static void set_serialized(const T* ptr) {
   assert(ptr != NULL, "invariant");
   SET_SERIALIZED(ptr);
   assert(IS_SERIALIZED(ptr), "invariant");
-  CLEAR_THIS_EPOCH_CLEARED_BIT(ptr);
+  if (current_epoch()) {
+    CLEAR_THIS_EPOCH_CLEARED_BIT(ptr);
+  }
 }
 
 /*
@@ -775,7 +777,9 @@ void set_serialized<Method>(MethodPtr method) {
   assert(method != NULL, "invariant");
   SET_METHOD_SERIALIZED(method);
   assert(IS_METHOD_SERIALIZED(method), "invariant");
-  CLEAR_THIS_EPOCH_METHOD_CLEARED_BIT(method);
+  if (current_epoch()) {
+    CLEAR_THIS_EPOCH_METHOD_CLEARED_BIT(method);
+  }
 }
 
 static int write_method(JfrCheckpointWriter* writer, MethodPtr method, bool leakp) {