diff --git a/Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch b/Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch new file mode 100644 index 0000000000000000000000000000000000000000..be41fbe6012a2932ebbce4a3a5279b2fc5630fc6 --- /dev/null +++ b/Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch @@ -0,0 +1,17 @@ +diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp +index f6d9fcc6b..6a4e5ab0f 100644 +--- a/src/hotspot/share/opto/macro.cpp ++++ b/src/hotspot/share/opto/macro.cpp +@@ -1234,7 +1234,11 @@ void PhaseMacroExpand::expand_allocate_common( + if (!allocation_has_use) { + InitializeNode* init = alloc->initialization(); + if (init != nullptr) { +- init->remove(&_igvn); ++ MemBarCPUOrderNode* membar = new MemBarCPUOrderNode(C, C->get_alias_index(init->adr_type()), nullptr); ++ membar->init_req(TypeFunc::Control, init->in(TypeFunc::Control)); ++ membar->init_req(TypeFunc::Memory, init->in(TypeFunc::Memory)); ++ transform_later(membar); ++ _igvn.replace_node(init, membar); + } + if (expand_fast_path && (initial_slow_test == nullptr)) { + // Remove allocation node and return. diff --git a/openjdk-21.spec b/openjdk-21.spec index d8fc0463e3460a79f118c8ea00f2d02eaabe23dc..eeea16506ea19cc26282d44dc71b62cd30893b00 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -897,7 +897,7 @@ Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 2 +Release: 3 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages @@ -1025,6 +1025,7 @@ Patch73: Backport-JDK-8325730-StringBuilder.toString-allocati.patch Patch74: Backport-JDK-8337679-Memset-warning-in-src-hotspot-s.patch Patch75: Backport-JDK-8326957-Implement-JEP-474-ZGC-Generatio.patch Patch76: Backport-JDK-8320308-C2-compilation-crashes-in-Libra.patch +Patch77: Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch ############################################ # # LoongArch64 specific patches @@ -1312,6 +1313,7 @@ pushd %{top_level_dir_name} %patch74 -p1 %patch75 -p1 %patch76 -p1 +%patch77 -p1 popd # openjdk %endif @@ -1872,6 +1874,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Tue Nov 19 2024 gao'xianggaoxiang - 1:21.0.5.11-3 +- add Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch + * Mon Nov 11 2024 Dingli Zhang - 1:21.0.5.11-2 - Remove redundant patch to fix ci check