[arch-commits] Commit in java8-openjdk/trunk (2 files)

[Guillaume Alaux]

    Date: Sunday, June 21, 2015 @ 23:33:13
  Author: guillaume
Revision: 241170

Add upstream patch to fix OOM

Added:
  java8-openjdk/trunk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
Modified:
  java8-openjdk/trunk/PKGBUILD

----------------------------------------------------------------------------+
 JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch |   46 ++++++++++
 PKGBUILD                                                                   |   13 +-
 2 files changed, 55 insertions(+), 4 deletions(-)

Added: JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
===================================================================
--- JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch	                        (rev 0)
+++ JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch	2015-06-21 21:33:13 UTC (rev 241170)
@@ -0,0 +1,46 @@
+
+# HG changeset patch
+# User sgehwolf
+# Date 1430335428 25200
+# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b
+# Parent  cd8fe1a9205aedb6b5a1fc16e664412e48aee565
+8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
+Summary: do the math on the unsigned type where overflows are well defined
+Reviewed-by: kvn, aph
+
+diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp
+--- a/src/share/vm/opto/type.cpp	Wed Jun 10 20:15:29 2015 -0400
++++ b/src/share/vm/opto/type.cpp	Wed Apr 29 12:23:48 2015 -0700
+@@ -1180,11 +1180,11 @@
+   // Certain normalizations keep us sane when comparing types.
+   // The 'SMALLINT' covers constants and also CC and its relatives.
+   if (lo <= hi) {
+-    if ((juint)(hi - lo) <= SMALLINT)  w = Type::WidenMin;
+-    if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
++    if (((juint)hi - lo) <= SMALLINT)  w = Type::WidenMin;
++    if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT
+   } else {
+-    if ((juint)(lo - hi) <= SMALLINT)  w = Type::WidenMin;
+-    if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
++    if (((juint)lo - hi) <= SMALLINT)  w = Type::WidenMin;
++    if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT
+   }
+   return w;
+ }
+@@ -1438,11 +1438,11 @@
+   // Certain normalizations keep us sane when comparing types.
+   // The 'SMALLINT' covers constants.
+   if (lo <= hi) {
+-    if ((julong)(hi - lo) <= SMALLINT)   w = Type::WidenMin;
+-    if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
++    if (((julong)hi - lo) <= SMALLINT)   w = Type::WidenMin;
++    if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG
+   } else {
+-    if ((julong)(lo - hi) <= SMALLINT)   w = Type::WidenMin;
+-    if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
++    if (((julong)lo - hi) <= SMALLINT)   w = Type::WidenMin;
++    if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG
+   }
+   return w;
+ }
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-21 21:13:49 UTC (rev 241169)
+++ PKGBUILD	2015-06-21 21:33:13 UTC (rev 241170)
@@ -29,7 +29,8 @@
         jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
         langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
         nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
-        JDK-8074312-hotspot.patch)
+        JDK-8074312-hotspot.patch
+        JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch)
 
 sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
             '6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
@@ -39,7 +40,8 @@
             'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
             'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
             'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9'
-            '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50')
+            '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50'
+            '8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -63,9 +65,12 @@
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
 
+  cd "${srcdir}/hotspot-${_repo_ver}"
   # https://bugs.openjdk.java.net/browse/JDK-8074312
-  cd "${srcdir}/hotspot-${_repo_ver}"
-  patch -p1 < ${srcdir}/JDK-8074312-hotspot.patch
+  patch -p1 < "${srcdir}"/JDK-8074312-hotspot.patch
+  # https://bugs.archlinux.org/task/45386
+  # https://bugs.openjdk.java.net/browse/JDK-8078666
+  patch -p1 < "${srcdir}"/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch
 }
 
 build() {