From aa506154b8df9175949a3ffcee4fdaa7b59de5f6 Mon Sep 17 00:00:00 2001
From: coleenp <unknown>
Date: Thu, 3 Mar 2011 19:51:36 -0500
Subject: [PATCH] 7022999: Can't build with FORCE_TIERED=0 Summary: Put
 UseFastLocking test under #ifdef COMPILER1 Reviewed-by: kvn, phh, never,
 dcubed

---
 src/share/vm/runtime/arguments.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
index 912312a31..df0ee5013 100644
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -3114,7 +3114,11 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
   // Turn off biased locking for locking debug mode flags,
   // which are subtlely different from each other but neither works with
   // biased locking.
-  if (!UseFastLocking || UseHeavyMonitors) {
+  if (UseHeavyMonitors
+#ifdef COMPILER1
+      || !UseFastLocking
+#endif // COMPILER1
+    ) {
     if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
       // flag set to true on command line; warn the user that they
       // can't enable biased locking here
-- 
GitLab