Merge pull request #15824 from tajila/loom2

Add missing increment in non-blocking enter
eclipse-openj9 · Sep 6, 2022 · ab6952a · ab6952a
2 parents b187f52 + 5527428
commit ab6952a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/runtime/vm/ObjectMonitor.cpp b/runtime/vm/ObjectMonitor.cpp
@@ -567,6 +567,9 @@ spinOnFlatLock(J9VMThread *currentThread, j9objectmonitor_t volatile *lwEA, j9ob
 						if (lock == VM_ObjectMonitor::compareAndSwapLockword(currentThread, lwEA, lock, (j9objectmonitor_t)(UDATA)currentThread, false)) {
 							/* compare and swap succeeded */
 							VM_AtomicSupport::readBarrier();
+#if JAVA_SPEC_VERSION >= 19
+							currentThread->ownedMonitorCount += 1;
+#endif /* JAVA_SPEC_VERSION >= 19 */
 							rc = true;
 
 							/* Transition from Learning to Flat occurred so the Cancel Counter in the object's J9Class is incremented by 1. */

diff --git a/test/functional/Java19andUp/playlist.xml b/test/functional/Java19andUp/playlist.xml
@@ -35,7 +35,7 @@
 			-excludegroups $(DEFAULT_EXCLUDE); \
 			$(TEST_STATUS)
 		</command>
-		<platformRequirements>bits.64,^arch.ppc,^arch.390,^arch.arm,^arch.riscv,^os.zos,^os.sunos,^os.osx</platformRequirements>
+		<platformRequirements>bits.64,^arch.390,^arch.arm,^arch.riscv,^os.zos,^os.sunos,^os.osx</platformRequirements>
 		<levels>
 			<level>sanity</level>
 		</levels>