Skip to content

Commit

Permalink
8314894: [Lilliput/JDK17] Revert changes in zRelocate, prevent ZGC wi…
Browse files Browse the repository at this point in the history
…th Lilliput

Reviewed-by: shade
  • Loading branch information
rkennke committed Aug 23, 2023
1 parent 9f3915d commit 8c0c160
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/hotspot/share/gc/z/zRelocate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

#include "precompiled.hpp"
#include "gc/shared/gc_globals.hpp"
#include "gc/shared/suspendibleThreadSet.hpp"
#include "gc/z/zAbort.inline.hpp"
#include "gc/z/zAddress.inline.hpp"
#include "gc/z/zBarrier.inline.hpp"
Expand Down Expand Up @@ -333,10 +332,6 @@ class ZRelocateClosure : public ObjectClosure {
_target->reset_for_in_place_relocation();
_forwarding->set_in_place();
}

if (SuspendibleThreadSet::should_yield()) {
SuspendibleThreadSet::yield();
}
}

public:
Expand Down Expand Up @@ -408,7 +403,6 @@ class ZRelocateTask : public ZTask {
ZRelocateClosure<ZRelocateSmallAllocator> small(&_small_allocator);
ZRelocateClosure<ZRelocateMediumAllocator> medium(&_medium_allocator);

SuspendibleThreadSetJoiner sts_joiner;
for (ZForwarding* forwarding; _iter.next(&forwarding);) {
if (is_small(forwarding)) {
small.do_forwarding(forwarding);
Expand Down
5 changes: 5 additions & 0 deletions src/hotspot/share/runtime/arguments.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3170,6 +3170,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.");
Expand Down

0 comments on commit 8c0c160

Please sign in to comment.