8278379: Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901

DamonFool · DamonFool · commit 5266e7d780ef · 2021-12-08T06:45:01.000Z
Reviewed-by: dholmes, shade
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
@@ -2027,7 +2027,7 @@ bool Arguments::check_vm_args_consistency() {
     warning("UseHeavyMonitors is not fully implemented on this architecture");
   }
 #endif
-#if defined(X86) || defined(PPC64)
+#if (defined(X86) || defined(PPC64)) && !defined(ZERO)
   if (UseHeavyMonitors && UseRTMForStackLocks) {
     fatal("-XX:+UseHeavyMonitors and -XX:+UseRTMForStackLocks are mutually exclusive");
   }

Original file line number	Diff line number	Diff line change
`@@ -2027,7 +2027,7 @@ bool Arguments::check_vm_args_consistency() {`
`2027`	`2027`	`warning("UseHeavyMonitors is not fully implemented on this architecture");`
`2028`	`2028`	`}`
`2029`	`2029`	`#endif`
`2030`		`-#if defined(X86) \|\| defined(PPC64)`
	`2030`	`+#if (defined(X86) \|\| defined(PPC64)) && !defined(ZERO)`
`2031`	`2031`	`if (UseHeavyMonitors && UseRTMForStackLocks) {`
`2032`	`2032`	`fatal("-XX:+UseHeavyMonitors and -XX:+UseRTMForStackLocks are mutually exclusive");`
`2033`	`2033`	`}`