diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 4619422..2904bcb 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -218,7 +218,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 9 -%global rpmrelease 1 +%global rpmrelease 2 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -1006,7 +1006,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: jdk-updates-jdk13u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz +Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1043,6 +1043,8 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1 Patch4: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch # Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch +Patch7: jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch +Patch8: jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch BuildRequires: autoconf BuildRequires: automake @@ -1284,6 +1286,8 @@ pushd %{top_level_dir_name} %patch3 -p1 %patch4 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 popd # openjdk %patch1000 @@ -1811,6 +1815,11 @@ require "copy_jdk_configs.lua" %changelog +* Fri Oct 25 2019 Petra Alice Mikova - 1:13.0.1.9-2.rolling +- Fixed hardcoded major version in jdk13u to macro +- added jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch +- added jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch + * Mon Oct 21 2019 Petra Alice Mikova - 1:13.0.1.9-1.rolling - Updated to October 2019 CPU sources diff --git a/jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch b/jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch new file mode 100644 index 0000000..564ff7c --- /dev/null +++ b/jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch @@ -0,0 +1,104 @@ + +# HG changeset patch +# User roland +# Date 1569512984 -7200 +# Node ID ee34d448e2172e536eaabf76cfc3d55f19ae4419 +# Parent 8786c0e9b585592992f330ba6ee011a5347b2405 +#8231405: [Shenandoah] guarantee(d != NULL) failed: Null dominator info +#Reviewed-by: shade, rkennke + +diff -r 8786c0e9b585 -r ee34d448e217 src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp +--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Fri Aug 02 11:21:41 2019 +0200 ++++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Thu Sep 26 17:49:44 2019 +0200 +@@ -1329,6 +1329,18 @@ + } + if ((ctrl->is_Proj() && ctrl->in(0)->is_CallJava()) || ctrl->is_CallJava()) { + CallNode* call = ctrl->is_Proj() ? ctrl->in(0)->as_CallJava() : ctrl->as_CallJava(); ++ if (call->entry_point() == OptoRuntime::rethrow_stub()) { ++ // The rethrow call may have too many projections to be ++ // properly handled here. Given there's no reason for a ++ // barrier to depend on the call, move it above the call ++ if (phase->get_ctrl(val) == ctrl) { ++ assert(val->Opcode() == Op_DecodeN, "unexpected node"); ++ assert(phase->is_dominator(phase->get_ctrl(val->in(1)), call->in(0)), "Load is too low"); ++ phase->set_ctrl(val, call->in(0)); ++ } ++ phase->set_ctrl(lrb, call->in(0)); ++ continue; ++ } + CallProjections projs; + call->extract_projections(&projs, false, false); + +diff -r 8786c0e9b585 -r ee34d448e217 test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java Thu Sep 26 17:49:44 2019 +0200 +@@ -0,0 +1,67 @@ ++/* ++ * Copyright (c) 2019, Red Hat, Inc. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++/** ++ * @test ++ * @bug 8231405 ++ * @summary barrier expansion breaks if barrier is right after call to rethrow stub ++ * @key gc ++ * @requires vm.gc.Shenandoah & !vm.graal.enabled ++ * ++ * @run main/othervm -XX:CompileOnly=CallMultipleCatchProjs::test -Xcomp -Xverify:none -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC CallMultipleCatchProjs ++ * ++ */ ++ ++public class CallMultipleCatchProjs { ++ private static A field = new A(); ++ ++ public static void main(String[] args) throws Exception { ++ Exception3 exception3 = new Exception3(); ++ test(new Exception2()); ++ } ++ ++ static int test(Exception exception) throws Exception { ++ try { ++ throw exception; ++ } catch (Exception1 e1) { ++ return 1; ++ } catch (Exception2 e2) { ++ return field.i + 2; ++ } catch (Exception3 e3) { ++ return field.i + 3; ++ } ++ } ++ ++ private static class Exception1 extends Exception { ++ } ++ ++ private static class Exception2 extends Exception { ++ } ++ ++ private static class Exception3 extends Exception { ++ } ++ ++ private static class A { ++ public int i; ++ } ++} + + diff --git a/jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch b/jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch new file mode 100644 index 0000000..23a8f53 --- /dev/null +++ b/jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch @@ -0,0 +1,47 @@ + +# HG changeset patch +# User shade +# Date 1569859344 -7200 +# Node ID 6f85097da2487529811f31ea779d9004f63725c6 +# Parent 3873cd2a203484b5a6106c7262f9a21070915a6d +#8231583: Shenandoah: Fix register clash in SBSA::resolve_forwarding_pointer() borrowing +#Reviewed-by: rkennke + +diff -r 3873cd2a2034 -r 6f85097da248 src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp +--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Thu Sep 19 20:26:51 2019 +0200 ++++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Mon Sep 30 18:02:24 2019 +0200 +@@ -236,9 +236,14 @@ + if (borrow_reg) { + // No free registers available. Make one useful. + tmp = rscratch1; ++ if (tmp == dst) { ++ tmp = rscratch2; ++ } + __ push(RegSet::of(tmp), sp); + } + ++ assert_different_registers(tmp, dst); ++ + Label done; + __ ldr(tmp, Address(dst, oopDesc::mark_offset_in_bytes())); + __ eon(tmp, tmp, zr); +diff -r 3873cd2a2034 -r 6f85097da248 src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp +--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Thu Sep 19 20:26:51 2019 +0200 ++++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Mon Sep 30 18:02:24 2019 +0200 +@@ -344,9 +344,14 @@ + if (borrow_reg) { + // No free registers available. Make one useful. + tmp = LP64_ONLY(rscratch1) NOT_LP64(rdx); ++ if (tmp == dst) { ++ tmp = LP64_ONLY(rscratch2) NOT_LP64(rcx); ++ } + __ push(tmp); + } + ++ assert_different_registers(dst, tmp); ++ + Label done; + __ movptr(tmp, Address(dst, oopDesc::mark_offset_in_bytes())); + __ notptr(tmp); + +