8314863: [Lilliput] Revert changes in zRelocate, prevent ZGC with Lil…

…liput Reviewed-by: shade
openjdk · Aug 23, 2023 · 0a73377 · 0a73377
1 parent d85adb6
commit 0a73377
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -894,10 +894,6 @@ class ZRelocateWork : public StackObj {
       to_page = start_in_place_relocation(ZAddress::offset(addr));
       set_target(to_age, to_page);
     }
-
-    if (SuspendibleThreadSet::should_yield()) {
-      SuspendibleThreadSet::yield();
-    }
   }
 
 public:
@@ -1098,7 +1094,6 @@ class ZRelocateTask : public ZRestartableTask {
     ZRelocateWork<ZRelocateSmallAllocator> small(&_small_allocator, _generation);
     ZRelocateWork<ZRelocateMediumAllocator> medium(&_medium_allocator, _generation);
 
-    SuspendibleThreadSetJoiner sts_joiner;
     const auto do_forwarding = [&](ZForwarding* forwarding) {
       ZPage* const page = forwarding->page();
       if (page->is_small()) {

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
@@ -3093,6 +3093,11 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
 #endif // CAN_SHOW_REGISTERS_ON_ASSERT
 
 #ifdef _LP64
+  if (UseCompactObjectHeaders && UseZGC) {
+    warning("ZGC does not work with compact object headers, disabling UseCompactObjectHeaders");
+    FLAG_SET_DEFAULT(UseCompactObjectHeaders, false);
+  }
+
   if (UseCompactObjectHeaders && FLAG_IS_CMDLINE(UseCompressedClassPointers) && !UseCompressedClassPointers) {
     // If user specifies -UseCompressedClassPointers, disable compact headers with a warning.
     warning("Compact object headers require compressed class pointers. Disabling compact object headers.");