Merge pull request #20327 from a7ehuo/acquire-classTableMutex

gacholio · web-flow · commit 6d2cb68c760e · 2024-10-10T12:20:33.000-04:00
Acquire classTableMutex when traversing sub class links
diff --git a/runtime/codert_vm/CodertVMHelpers.cpp b/runtime/codert_vm/CodertVMHelpers.cpp
@@ -207,6 +207,8 @@ jitMethodTranslated(J9VMThread *currentThread, J9Method *method, void *jitStartA
 			}
 			UDATA initialClassDepth = VM_VMHelpers::getClassDepth(currentClass);
 			void *j2jAddress = VM_VMHelpers::jitToJitStartAddress(jitStartAddress);
+
+			omrthread_monitor_enter(vm->classTableMutex);
 			do {
 				J9VTableHeader* vTableHeader = J9VTABLE_HEADER_FROM_RAM_CLASS(currentClass);
 
@@ -228,6 +230,7 @@ jitMethodTranslated(J9VMThread *currentThread, J9Method *method, void *jitStartA
 				}
 				currentClass = currentClass->subclassTraversalLink;
 			} while (VM_VMHelpers::getClassDepth(currentClass) > initialClassDepth);
+			omrthread_monitor_exit(vm->classTableMutex);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,8 @@ jitMethodTranslated(J9VMThread currentThread, J9Method method, void *jitStartA`
`207`	`207`	`}`
`208`	`208`	`UDATA initialClassDepth = VM_VMHelpers::getClassDepth(currentClass);`
`209`	`209`	`void *j2jAddress = VM_VMHelpers::jitToJitStartAddress(jitStartAddress);`
	`210`	`+`
	`211`	`+ omrthread_monitor_enter(vm->classTableMutex);`
`210`	`212`	`do {`
`211`	`213`	`J9VTableHeader* vTableHeader = J9VTABLE_HEADER_FROM_RAM_CLASS(currentClass);`
`212`	`214`
`@@ -228,6 +230,7 @@ jitMethodTranslated(J9VMThread currentThread, J9Method method, void *jitStartA`
`228`	`230`	`}`
`229`	`231`	`currentClass = currentClass->subclassTraversalLink;`
`230`	`232`	`} while (VM_VMHelpers::getClassDepth(currentClass) > initialClassDepth);`
	`233`	`+ omrthread_monitor_exit(vm->classTableMutex);`
`231`	`234`	`}`
`232`	`235`	`}`
`233`	`236`	`}`