Skip to content

8341692: Implement JEP 490: ZGC: Remove the Non-Generational Mode #21401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

8341692: Implement JEP 490: ZGC: Remove the Non-Generational Mode #21401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c8f400f
8341692: Implement JEP 490: ZGC: Remove the Non-Generational Mode
xmas92 Jun 13, 2024
a793f0c
Remove x from jdk.hotspot.agent
xmas92 Oct 8, 2024
74dc9ca
Add missing problem-listing
xmas92 Oct 8, 2024
b0c4934
Fix typo in TestZUncommitEvent.java
xmas92 Oct 8, 2024
e5865bc
Remove XCollectedHeap from HSDB
xmas92 Oct 8, 2024
9f2d211
Consistent order between ZArguments and GCArguments
xmas92 Oct 9, 2024
4e4f9bb
Consistent albite special code style
xmas92 Oct 9, 2024
7019998
Reorder z_globals options: product > diagnostic product > develop
xmas92 Oct 9, 2024
4a32f94
Fix @requires !vm.gc.Z, must use vm.gc != "Z"
xmas92 Oct 9, 2024
9e3d7d3
Fix problem-listed @requires typo
xmas92 Oct 9, 2024
22c243a
LargeWindowPaintTest.java fix id typo
xmas92 Oct 9, 2024
e58b4c5
Merge tag 'jdk-24+19' into JDK-8341692
xmas92 Oct 11, 2024
76c5d0c
Merge tag 'jdk-24+20' into JDK-8341692
xmas92 Oct 18, 2024
67549bb
Merge tag 'jdk-24+21' into JDK-8341692
xmas92 Oct 25, 2024
eef214b
Remove GCName::Z
xmas92 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 1 addition & 5 deletions make/RunTests.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,11 +853,7 @@ define SetupRunJtregTestBody
endif

ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
ifneq ($$(findstring -XX:-ZGenerational, $$(JTREG_ALL_OPTIONS)), )
JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
else
JTREG_AUTO_PROBLEM_LISTS += ProblemList-generational-zgc.txt
endif
JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
endif

ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
Expand Down
2 changes: 0 additions & 2 deletions make/hotspot/gensrc/GensrcAdlc.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)

ifeq ($(call check-jvm-feature, zgc), true)
AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/x/x_$(HOTSPOT_TARGET_CPU).ad \
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/x/x_$(HOTSPOT_TARGET_CPU_ARCH).ad \
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU).ad \
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU_ARCH).ad \
)))
Expand Down
1 change: 0 additions & 1 deletion make/hotspot/lib/JvmFeatures.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ endif
ifneq ($(call check-jvm-feature, zgc), true)
JVM_CFLAGS_FEATURES += -DINCLUDE_ZGC=0
JVM_EXCLUDE_PATTERNS += gc/z
JVM_EXCLUDE_PATTERNS += gc/x
endif

ifneq ($(call check-jvm-feature, shenandoahgc), true)
Expand Down
5 changes: 1 addition & 4 deletions src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,10 +990,7 @@ void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
__ decode_heap_oop(dest->as_register());
}

if (!(UseZGC && !ZGenerational)) {
// Load barrier has not yet been applied, so ZGC can't verify the oop here
__ verify_oop(dest->as_register());
}
__ verify_oop(dest->as_register());
}
}

Expand Down
Loading