Merge remote-tracking branch 'origin/fibers' into fibers

pron · pron · commit 2cabb98b2cce · 2022-03-21T12:34:43.000Z
diff --git a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
@@ -72,6 +72,8 @@ void JvmtiThreadState::set_head_env_thread_state(JvmtiEnvThreadState* ets) {
   _head_env_thread_state = ets;
 }
 
+PRAGMA_DIAG_PUSH
+PRAGMA_NONNULL_IGNORED
 inline JvmtiThreadState* JvmtiThreadState::state_for_while_locked(JavaThread *thread, oop thread_oop) {
   assert(JvmtiThreadState_lock->is_locked(), "sanity check");
   assert(thread != NULL || thread_oop != NULL, "sanity check");
@@ -100,6 +102,7 @@ inline JvmtiThreadState* JvmtiThreadState::state_for_while_locked(JavaThread *th
   }
   return state;
 }
+PRAGMA_DIAG_POP
 
 inline JvmtiThreadState* JvmtiThreadState::state_for(JavaThread *thread, Handle thread_handle) {
   // in a case of unmounted virtual thread the thread can be NULL

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ void JvmtiThreadState::set_head_env_thread_state(JvmtiEnvThreadState* ets) {`
`72`	`72`	`_head_env_thread_state = ets;`
`73`	`73`	`}`
`74`	`74`
	`75`	`+PRAGMA_DIAG_PUSH`
	`76`	`+PRAGMA_NONNULL_IGNORED`
`75`	`77`	`inline JvmtiThreadState* JvmtiThreadState::state_for_while_locked(JavaThread *thread, oop thread_oop) {`
`76`	`78`	`assert(JvmtiThreadState_lock->is_locked(), "sanity check");`
`77`	`79`	`assert(thread != NULL \|\| thread_oop != NULL, "sanity check");`
`@@ -100,6 +102,7 @@ inline JvmtiThreadState* JvmtiThreadState::state_for_while_locked(JavaThread *th`
`100`	`102`	`}`
`101`	`103`	`return state;`
`102`	`104`	`}`
	`105`	`+PRAGMA_DIAG_POP`
`103`	`106`
`104`	`107`	`inline JvmtiThreadState* JvmtiThreadState::state_for(JavaThread *thread, Handle thread_handle) {`
`105`	`108`	`// in a case of unmounted virtual thread the thread can be NULL`