8362350: recompute_enable hit assertion "should never come here before live phase" if happens in post_vm_start

Reviewed-by: cjplummer, sspitsyn

Author: lmesnik

src/hotspot/share/prims/jvmtiEventController.cpp

@@ -544,6 +544,11 @@ JvmtiEventControllerPrivate::recompute_env_thread_enabled(JvmtiEnvThreadState* e
   }
 
   switch (JvmtiEnv::get_phase()) {
+  case JVMTI_PHASE_ONLOAD:
+  case JVMTI_PHASE_PRIMORDIAL:
+  case JVMTI_PHASE_START:
+    now_enabled &= EARLY_EVENT_BITS;
+    break;
   case JVMTI_PHASE_DEAD:
     // no events allowed when dead
     now_enabled = 0;

test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt

@@ -32,8 +32,6 @@ gc/stringdedup/TestStringDeduplicationInterned.java     8362562 generic-all
 gc/stringdedup/TestStringDeduplicationPrintOptions.java 8362562 generic-all
 
 
-serviceability/jvmti/events/SingleStep/singlestep02/singlestep02.java       8362350 generic-all
-vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/TestDescription.java    8362350 generic-all
 
 # Incompatbile tests
 

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,6 @@
 
 extern "C" {
 
-#define STATUS_FAILED 2
-#define PASSED 0
-
-static volatile jint result = PASSED;
-static volatile long wrongStepEv = 0;
 
 static jvmtiEnv *jvmti = nullptr;
 
@@ -44,31 +39,25 @@ SingleStep(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread, jmethodID method, jloca
   jvmtiError err;
 
   err = jvmti->GetPhase(&phase);
-  if (err != JVMTI_ERROR_NONE) {
-    result = STATUS_FAILED;
-    COMPLAIN("TEST FAILED: unable to obtain phase of the VM execution during SingleStep callback\n\n");
-  } else {
-    if (phase != JVMTI_PHASE_LIVE) {
-      wrongStepEv++;
-      result = STATUS_FAILED;
-      COMPLAIN("TEST FAILED: SingleStep event received during non-live phase %s\n", TranslatePhase(phase));
-    }
+  check_jvmti_status(jni, err, "Error in GetPhase");
+  if (phase != JVMTI_PHASE_LIVE) {
+    COMPLAIN("TEST FAILED: SingleStep event received during non-live phase %s\n", TranslatePhase(phase));
+    jni->FatalError("Event SingleStep event received during non-live phase.");
   }
 }
 
+/*
+ * The ClassLoad event is not used. This is thread filtered event that should
+ * be sent during start phase. It is enabled to trigger creation of jvmti thread state
+ * in the START phase. So test ensures that even jvmti state for thread is created
+ * before live phase the SingleStep event is sent only during live phase.
+ */
 void JNICALL
-VMDeath(jvmtiEnv *jvmti, JNIEnv *jni) {
-  LOG("VMDeath event received\n");
-
-  if (wrongStepEv != 0) {
-    LOG("TEST FAILED: there are %ld SingleStep events\n"
-        "sent during non-live phase of the VM execution\n", wrongStepEv);
-    jni->FatalError("Test Failed.");
-  }
+ClassLoad(jvmtiEnv *jvmti_env,
+            JNIEnv* jni_env,
+            jthread thread,
+            jclass klass) {
 
-  if (result == STATUS_FAILED) {
-    jni->FatalError("Test Failed.");
-  }
 }
 
 jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
@@ -105,19 +94,20 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
   /* set event callback */
   LOG("setting event callbacks ...\n");
   (void) memset(&callbacks, 0, sizeof(callbacks));
+  callbacks.ClassLoad = &ClassLoad;
   callbacks.SingleStep = &SingleStep;
-  callbacks.VMDeath = &VMDeath;
   err = jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks));
   if (err != JVMTI_ERROR_NONE) {
     return JNI_ERR;
   }
 
   LOG("setting event callbacks done\nenabling JVMTI events ...\n");
-  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, nullptr);
+
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, nullptr);
   if (err != JVMTI_ERROR_NONE) {
     return JNI_ERR;
   }
-  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, nullptr);
+  err = jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, nullptr);
   if (err != JVMTI_ERROR_NONE) {
     return JNI_ERR;
   }

test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/singlestep02.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,39 +21,25 @@
  * questions.
  */
 
-import jdk.test.lib.jvmti.DebugeeClass;
 import java.io.*;
 
 /*
  * @test
  *
  * @summary converted from VM Testbase nsk/jvmti/SingleStep/singlestep002.
- * VM Testbase keywords: [jpda, jvmti, onload_only_caps, noras]
- * VM Testbase readme:
- * DESCRIPTION
  *     This test exercises the JVMTI event SingleStep.
- *     It verifies that this event s sent only during the live phase
+ *     It verifies that this event is sent only during the live phase
  *     of VM execution.
  *     The test works as follows. The tested event is enabled in the
  *     'OnLoad' phase. Then all received SingleStep events is checked
  *     to be sent only during the live phase via the GetPhase() call.
- * COMMENTS
  *
- * @library /test/lib
  * @run main/othervm/native -agentlib:singlestep02 singlestep02
  */
 
 public class singlestep02 {
 
-    static {
-        System.loadLibrary("singlestep02");
-    }
-
     public static void main(String[] args) {
-        new singlestep02().runThis(args);
     }
 
-    private int runThis(String argv[]) {
-        return DebugeeClass.TEST_PASSED;
-    }
 }