From df3b93959c451ef33a2e05cb957d5aebe28dad19 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Fri, 22 May 2026 23:35:47 +0000
Subject: [PATCH] 8373645: Test
 vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/TestDescription.java
 failed: Unexpected event JVMTI_EVENT_COMPILED_METHOD_LOAD

Reviewed-by: cjplummer, sspitsyn
---
 .../events/EM02/em02t003/em02t003.cpp         | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
index 88fb29e9c17..8443c2a156f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -325,8 +325,9 @@ cbVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
     changeCount(JVMTI_EVENT_VM_OBJECT_ALLOC, &eventCount[0]);
 }
 
+/* Sanity check of method id. */
 void
-handlerMC2(jvmtiEvent event, jvmtiEnv* jvmti, jmethodID method) {
+handlerMC2(jvmtiEnv* jvmti, jmethodID method) {
 
     char *name;
     char *sign;
@@ -338,7 +339,6 @@ handlerMC2(jvmtiEvent event, jvmtiEnv* jvmti, jmethodID method) {
     }
 
     NSK_DISPLAY2("\tMethod: %s, signature: %s\n", name, sign);
-    changeCount(event, &newEventCount[0]);
 
     if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)name))) {
         nsk_jvmti_setFailStatus();
@@ -358,7 +358,9 @@ cbNewCompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size,
                 const jvmtiAddrLocationMap* map, const void* compile_info) {
 
     loadEvents++;
-    handlerMC2(JVMTI_EVENT_COMPILED_METHOD_LOAD, jvmti_env, method);
+    changeCount(JVMTI_EVENT_COMPILED_METHOD_LOAD, &newEventCount[0]);
+    NSK_DISPLAY0(">>>JVMTI_EVENT_COMPILED_METHOD_LOAD received for\n");
+    handlerMC2(jvmti_env, method);
 }
 
 void JNICALL
@@ -366,8 +368,8 @@ cbNewCompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method,
                 const void* code_addr) {
 
     unloadEvents++;
-    NSK_DISPLAY0(">>>JVMTI_EVENT_COMPILED_METHOD_UNLOAD received for\n");
     changeCount(JVMTI_EVENT_COMPILED_METHOD_UNLOAD, &newEventCount[0]);
+    NSK_DISPLAY0(">>>JVMTI_EVENT_COMPILED_METHOD_UNLOAD received for\n");
 }
 
 /* ============================================================================= */
@@ -465,20 +467,11 @@ static bool setCallBacks(int step) {
             break;
 
         case 2:
-            for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
-                newEventCount[i] = 0;
-            }
-
             eventCallbacks.CompiledMethodLoad   = cbNewCompiledMethodLoad;
             eventCallbacks.CompiledMethodUnload = cbNewCompiledMethodUnload;
             break;
 
         case 3:
-
-            for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
-                newEventCount[i] = 0;
-            }
-
             eventCallbacks.VMDeath                   = cbVMDeath;
             break;
 
@@ -486,6 +479,13 @@ static bool setCallBacks(int step) {
     if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return false;
 
+    /* Give some time to complete already processing cbNewCompiledMethodLoad/Unload events. */
+    nsk_jvmti_sleep(100);
+    for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
+        newEventCount[i] = 0;
+    }
+
+
     return true;
 }