Merge pull request #21922 from hangshao0/Test

Add missing exit trace point in objectMonitorExit

Author: keithc-ca

runtime/vm/j9vm.tdf

@@ -154,7 +154,7 @@ TraceExit=Trc_VM_flushForClassesUnload_Exit group=profilingbc Overhead=1 Level=1
 
 TraceEntry=Trc_VM_objectMonitorExit_Entry Overhead=1 Level=4 Template="objectMonitorExit (obj=%p)"
 TraceEvent=Trc_VM_objectMonitorExit_SmartDecisionPoint Overhead=1 Level=4 Template="pro=%d,anti=%d"
-TraceExit=Trc_VM_objectMonitorExit_Exit Overhead=1 Level=4 Template="objectMonitorExit"
+TraceExit=Trc_VM_objectMonitorExit_Exit Obsolete Overhead=1 Level=4 Template="objectMonitorExit"
 TraceExit=Trc_VM_objectMonitorExit_Exit_FCBSet Overhead=1 Level=4 Template="objectMonitorExit (FCB is set)"
 TraceExit-Exception=Trc_VM_objectMonitorExit_Exit_IllegalInflatedLock Overhead=1 Level=4 Template="objectMonitorExit (IllegalMonitorState in objectMonitorExit. Inflated monitor's owner is %p, not %p)"
 TraceExit-Exception=Trc_VM_objectMonitorExit_Exit_IllegalFlatLock Overhead=1 Level=4 Template="objectMonitorExit (IllegalMonitorState in objectMonitorExit. Flat lock = %p, object=%p)"
@@ -1019,3 +1019,4 @@ TraceEntry=Trc_VM_getTypeId_Entry Overhead=1 Level=5 Template="getTypeId clazz=%
 TraceExit=Trc_VM_getTypeId_Exit Overhead=1 Level=5 Template="getTypeId clazz=%p result=%lli"
 
 TraceEvent=Trc_systemPropertyIterator Overhead=1 Level=10 Template="systemPropertyIterator: added VM system property '%s'='%s'"
+TraceExit-Exception=Trc_VM_objectMonitorExit_Exit_LearningStateUnowned Overhead=1 Level=4 Template="objectMonitorExit (IllegalMonitorState: Lock in learning state but unowned. Flat lock=%p, object=%p)"

runtime/vm/monhelpers.c

@@ -115,6 +115,7 @@ objectMonitorExit(J9VMThread* vmStruct, j9object_t object)
 			}
 		} else if (count & OBJECT_HEADER_LOCK_LEARNING) {
 			/* Lock is in Learning state but unowned (if it were owned it would have been caught by the first Learning state check) */
+			Trc_VM_objectMonitorExit_Exit_LearningStateUnowned(vmStruct, lock, object);
 			goto done;
 		} else if (count >= OBJECT_HEADER_LOCK_FIRST_RECURSION_BIT) {
 			/* just decrement the flatlock recursion count */