[GR-74207] Guard JVMTI VTMS thread state fixup for attaching threads

PullRequest: labsjdk-ce/274

Author: dougxc

.ci/ci.jsonnet

@@ -375,6 +375,8 @@ local common = import 'common.libsonnet';
         targets: ['gate'],
         deploysArtifacts: true,
 
+        local skip_fastdebug = conf.name == '-windows-cygwin-amd64',
+
         local build_labsjdk(jdk_debug_level, java_home_env_var) = [
             ['set-export', java_home_env_var, conf.path('${PWD}/../%s-java-home' % jdk_debug_level)],
             ['python3', '-u', conf.path('${LABSJDK_BUILDER_DIR}/build_labsjdk.py'),
@@ -403,7 +405,7 @@ local common = import 'common.libsonnet';
             ['set-export', 'JIB_DATA_DIR', conf.path('${PWD}/../jib')],
         ] +
         build_labsjdk('release', 'JAVA_HOME') +
-        build_labsjdk('fastdebug', 'JAVA_HOME_FASTDEBUG'),
+        (if skip_fastdebug then [] else build_labsjdk('fastdebug', 'JAVA_HOME_FASTDEBUG')),
     },
 
     local build_confs(defs) = [

src/hotspot/share/prims/jvmtiEnvBase.cpp

@@ -1671,9 +1671,13 @@ class VM_SetNotifyJvmtiEventsMode : public VM_Operation {
 
   static void correct_jvmti_thread_state(JavaThread* jt) {
     oop  ct_oop = jt->threadObj();
+    // JNI-attaching threads may not have a java.lang.Thread yet.
+    if (ct_oop == nullptr) {
+      return;
+    }
     oop  vt_oop = jt->vthread();
     JvmtiThreadState* jt_state = jt->jvmti_thread_state();
-    JvmtiThreadState* ct_state = java_lang_Thread::jvmti_thread_state(jt->threadObj());
+    JvmtiThreadState* ct_state = java_lang_Thread::jvmti_thread_state(ct_oop);
     JvmtiThreadState* vt_state = vt_oop != nullptr ? java_lang_Thread::jvmti_thread_state(vt_oop) : nullptr;
     bool virt = vt_oop != nullptr && java_lang_VirtualThread::is_instance(vt_oop);