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 100755 index 0000000000000000000000000000000000000000..7bc6569fcae4a7b7d0ac4d380820d518706b4f07 --- /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 69596ac80..cc92be234 100644 +--- a/src/hotspot/share/opto/macro.cpp ++++ b/src/hotspot/share/opto/macro.cpp +@@ -1251,7 +1251,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-17.spec b/openjdk-17.spec index 73916eef2a17d6b1b4e00ac6d2a74b01afece63e..4fb8e7c1485b5bfa94b9bfeed0b3867b97fe46fa 100644 --- a/openjdk-17.spec +++ b/openjdk-17.spec @@ -903,7 +903,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 3 +Release: 4 # 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 @@ -1040,6 +1040,7 @@ Patch66: Backport-of-8337712-Wrong-javadoc-in-java.util.Date-.patch #17.0.13 Patch67: Huawei-Fix-JBooster-file-issue-caused-by-os-write-change.patch Patch68: downgrade-fcntl64-to-fcntl-on-linux.patch +Patch69: Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch ############################################ # # LoongArch64 specific patches @@ -1325,6 +1326,7 @@ pushd %{top_level_dir_name} %patch67 -p1 %endif %patch68 -p1 +%patch69 -p1 popd # openjdk %endif @@ -1891,6 +1893,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Tue Nov 19 2024 gaoxiang - 1:17.0.13.11-4 +- add Backport-JDK-8327963-incorrect-result-of-C2-compiled-code.patch + * Tue Nov 12 2024 Dingli Zhang - 1:17.0.13.11-3 - Fix build error for riscv64