diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 17d6c45..e5ec3d1 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -849,7 +849,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 3%{?dist} +Release: 4%{?dist} # 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 # also included the epoch in their virtual provides. This created a @@ -949,6 +949,12 @@ Patch12: JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch # intrinsics on aarch64, falling back to C code. Re-enable once JDK-8210461 # is fixed and available in jdk11u. Patch6: JDK-8211105-aarch64-log-sin-intrinsics-disable.patch +############################################# +# +# Patches appearing in 11.0.2 +# +############################################# +Patch584: jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch BuildRequires: autoconf BuildRequires: automake @@ -1218,7 +1224,7 @@ pushd %{top_level_dir_name} %patch10 -p1 %patch11 -p1 %patch12 -p1 - +%patch584 -p1 popd # openjdk %patch1000 @@ -1769,6 +1775,9 @@ require "copy_jdk_configs.lua" %changelog +* Fri Oct 26 2018 Jiri Vanek - 1:11.0.1.13-3 +- added Patch584 jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch + * Mon Oct 29 2018 Severin Gehwolf - 1:11.0.1.13-3 - Use upstream's version of Aarch64 intrinsics disable patch: - Removed: diff --git a/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch new file mode 100644 index 0000000..b3221f8 --- /dev/null +++ b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch @@ -0,0 +1,114 @@ + +# HG changeset patch +# User roland +# Date 1534518792 -7200 +# Node ID 690d9be191bf068b68c37bc835b355b1535e6075 +# Parent 5be470fb7a19293eb95fd33806413b94abca9724 +8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item +Reviewed-by: neliasso, kvn + +diff -r 5be470fb7a19 -r 690d9be191bf src/hotspot/share/opto/coalesce.cpp +--- a/src/hotspot/share/opto/coalesce.cpp Tue Oct 16 12:47:56 2018 +0100 ++++ b/src/hotspot/share/opto/coalesce.cpp Fri Aug 17 17:13:12 2018 +0200 +@@ -25,6 +25,7 @@ + #include "precompiled.hpp" + #include "memory/allocation.inline.hpp" + #include "opto/block.hpp" ++#include "opto/c2compiler.hpp" + #include "opto/cfgnode.hpp" + #include "opto/chaitin.hpp" + #include "opto/coalesce.hpp" +@@ -294,9 +295,13 @@ + } else { + uint ireg = m->ideal_reg(); + if (ireg == 0 || ireg == Op_RegFlags) { +- assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s", +- m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput)); +- C->record_method_not_compilable("attempted to spill a non-spillable item"); ++ if (C->subsume_loads()) { ++ C->record_failure(C2Compiler::retry_no_subsuming_loads()); ++ } else { ++ assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s", ++ m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput)); ++ C->record_method_not_compilable("attempted to spill a non-spillable item"); ++ } + return; + } + const RegMask *rm = C->matcher()->idealreg2spillmask[ireg]; +diff -r 5be470fb7a19 -r 690d9be191bf test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java Fri Aug 17 17:13:12 2018 +0200 +@@ -0,0 +1,72 @@ ++/* ++ * Copyright (c) 2018, 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 8209639 ++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item ++ * ++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill ++ * ++ */ ++ ++public class SubsumingLoadsCauseFlagSpill { ++ private static Object field; ++ private static boolean do_throw; ++ private static volatile boolean barrier; ++ ++ public static void main(String[] args) { ++ for (int i = 0; i < 20_000; i++) { ++ do_throw = true; ++ field = null; ++ test(0); ++ do_throw = false; ++ field = new Object(); ++ test(0); ++ } ++ } ++ ++ private static float test(float f) { ++ Object v = null; ++ try { ++ not_inlined(); ++ v = field; ++ } catch (MyException me) { ++ v = field; ++ barrier = true; ++ } ++ if (v == null) { ++ return f * f; ++ } ++ return f; ++ } ++ ++ private static void not_inlined() throws MyException{ ++ if (do_throw) { ++ throw new MyException(); ++ } ++ } ++ ++ private static class MyException extends Throwable { ++ } ++} +