Automatic merge of jdk:master into master

duke · duke · commit 3a8e7423fe99 · 2021-09-14T08:14:57.000Z
diff --git a/src/hotspot/cpu/zero/vm_version_zero.cpp b/src/hotspot/cpu/zero/vm_version_zero.cpp
@@ -45,6 +45,11 @@ void VM_Version::initialize() {
   }
   FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);
 
+  // If lock diagnostics is needed, always call to runtime
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    FLAG_SET_DEFAULT(UseHeavyMonitors, true);
+  }
+
   // Not implemented
   UNSUPPORTED_OPTION(CriticalJNINatives);
 }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ void VM_Version::initialize() {`
`45`	`45`	`}`
`46`	`46`	`FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);`
`47`	`47`
	`48`	`+ // If lock diagnostics is needed, always call to runtime`
	`49`	`+ if (DiagnoseSyncOnValueBasedClasses != 0) {`
	`50`	`+ FLAG_SET_DEFAULT(UseHeavyMonitors, true);`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`// Not implemented`
`49`	`54`	`UNSUPPORTED_OPTION(CriticalJNINatives);`
`50`	`55`	`}`