Hello community, here is the log from the commit of package java-1_9_0-openjdk for openSUSE:Factory checked in at 2015-03-01 14:47:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_9_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes 2015-02-18 12:09:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes 2015-03-01 14:47:24.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 20 08:42:33 UTC 2015 - fst...@suse.com + +- Upgrade to upstream tag jdk9-b51 +- Updated patches: + * link-with-as-needed.patch + * s390-size_t.patch + - rediff to the new context +- Added patch: + * aarch64-hotspot.patch + - forward-port the symbol JVM_GetNanoTimeAdjustment that is + not part of aarch64 tarball + +------------------------------------------------------------------- Old: ---- 1ccb6ef2f40b.tar.bz2 224f593393e5.tar.bz2 32e48a0d59e1.tar.bz2 45a30e7ee623.tar.bz2 74ead7bddde1.tar.bz2 d1f37d39ff24.tar.bz2 e0947f58c9c1.tar.bz2 f6b8edd397ee.tar.bz2 New: ---- 10b32cc48ccc.tar.bz2 2309c02386d1.tar.bz2 403b9cbadb04.tar.bz2 6207b4b8731c.tar.bz2 7c44d9a33bbe.tar.bz2 7cb3674cbd8c.tar.bz2 a0dad230aeb3.tar.bz2 aarch64-hotspot.patch bb9cf97a5ac6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_9_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.0vX8Wa/_old 2015-03-01 14:47:27.000000000 +0100 +++ /var/tmp/diff_new_pack.0vX8Wa/_new 2015-03-01 14:47:27.000000000 +0100 @@ -33,17 +33,17 @@ %global minorver 9 %global microver 0 %global updatever 0 -%global buildver b50 +%global buildver b51 %global root_project jdk9 %global root_repository jdk9 -%global root_revision d1f37d39ff24 -%global corba_revision 224f593393e5 -%global hotspot_revision e0947f58c9c1 -%global jaxp_revision 74ead7bddde1 -%global jaxws_revision 45a30e7ee623 -%global jdk_revision f6b8edd397ee -%global langtools_revision 1ccb6ef2f40b -%global nashorn_revision 32e48a0d59e1 +%global root_revision 6207b4b8731c +%global corba_revision 2309c02386d1 +%global hotspot_revision 403b9cbadb04 +%global jaxp_revision 7cb3674cbd8c +%global jaxws_revision bb9cf97a5ac6 +%global jdk_revision a0dad230aeb3 +%global langtools_revision 7c44d9a33bbe +%global nashorn_revision 10b32cc48ccc %global aarch64_project aarch64-port %global aarch64_repository stage %global aarch64_hotspot_revision 00f3abb1f174 @@ -205,6 +205,8 @@ Patch5: multiple-pkcs11-library-init.patch # Disable doclint for compatibility Patch6: disable-doclint-by-default.patch +# Missing symbol in aarch64 hotspot tarball +Patch8: aarch64-hotspot.patch # Add missing build bits for AArch64 from the AArch64 branch Patch9: aarch64-misc.patch # From icedtea: Increase default memory limits @@ -501,6 +503,9 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%ifarch %{aarch64} +%patch8 -p1 +%endif %patch9 -p1 %patch10 -p1 %patch12 -p1 ++++++ 1ccb6ef2f40b.tar.bz2 -> 10b32cc48ccc.tar.bz2 ++++++ ++++ 1000300 lines of diff (skipped) ++++++ 1ccb6ef2f40b.tar.bz2 -> 2309c02386d1.tar.bz2 ++++++ ++++ 836785 lines of diff (skipped) ++++++ 1ccb6ef2f40b.tar.bz2 -> 403b9cbadb04.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1ccb6ef2f40b.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/403b9cbadb04.tar.bz2 differ: char 11, line 1 ++++++ 1ccb6ef2f40b.tar.bz2 -> 6207b4b8731c.tar.bz2 ++++++ ++++ 739799 lines of diff (skipped) ++++++ 1ccb6ef2f40b.tar.bz2 -> 7c44d9a33bbe.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/.hg_archival.txt new/langtools-7c44d9a33bbe/.hg_archival.txt --- old/langtools-1ccb6ef2f40b/.hg_archival.txt 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/.hg_archival.txt 2015-02-13 01:38:39.000000000 +0100 @@ -1,4 +1,4 @@ repo: 9a66ca7c79fab293c1bb0534e0d208c7e4f58b01 -node: 1ccb6ef2f40bf9961b27adac390a6fc5181aa1fc +node: 7c44d9a33bbea75f5d91625df9bbccea360aea2a branch: default -tag: jdk9-b50 +tag: jdk9-b51 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/.hgtags new/langtools-7c44d9a33bbe/.hgtags --- old/langtools-1ccb6ef2f40b/.hgtags 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/.hgtags 2015-02-13 01:38:39.000000000 +0100 @@ -292,3 +292,4 @@ 230c139552501e612dd0d4423ac30f94c1201c0d jdk9-b47 5b102fc29edf8b7eee7df208d8a8bba0e0a52f3a jdk9-b48 15c79f28e30a1be561abe0d67674232ad5034d32 jdk9-b49 +1ccb6ef2f40bf9961b27adac390a6fc5181aa1fc jdk9-b50 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java new/langtools-7c44d9a33bbe/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java --- old/langtools-1ccb6ef2f40b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java 2015-02-13 01:38:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. 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 @@ -236,7 +236,8 @@ DeferredStuckPolicy deferredStuckPolicy; if (resultInfo.pt.hasTag(NONE) || resultInfo.pt.isErroneous()) { deferredStuckPolicy = dummyStuckPolicy; - } else if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.SPECULATIVE) { + } else if (resultInfo.checkContext.deferredAttrContext().mode == AttrMode.SPECULATIVE || + resultInfo.checkContext.deferredAttrContext().insideOverloadPhase()) { deferredStuckPolicy = new OverloadStuckPolicy(resultInfo, this); } else { deferredStuckPolicy = new CheckStuckPolicy(resultInfo, this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java new/langtools-7c44d9a33bbe/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java --- old/langtools-1ccb6ef2f40b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JavacMessages.java 2015-02-13 01:38:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. 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 @@ -56,7 +56,7 @@ private Map<Locale, SoftReference<List<ResourceBundle>>> bundleCache; - private List<String> bundleNames; + private List<ResourceBundleHelper> bundleHelpers; private Locale currentLocale; private List<ResourceBundle> currentBundles; @@ -91,7 +91,7 @@ * @param bundleName the name to identify the resource bundle of localized messages. */ public JavacMessages(String bundleName, Locale locale) throws MissingResourceException { - bundleNames = List.nil(); + bundleHelpers = List.nil(); bundleCache = new HashMap<>(); add(bundleName); setCurrentLocale(locale); @@ -101,8 +101,13 @@ this(defaultBundleName); } + @Override public void add(String bundleName) throws MissingResourceException { - bundleNames = bundleNames.prepend(bundleName); + add(locale -> ResourceBundle.getBundle(bundleName, locale)); + } + + public void add(ResourceBundleHelper ma) { + bundleHelpers = bundleHelpers.prepend(ma); if (!bundleCache.isEmpty()) bundleCache.clear(); currentBundles = null; @@ -115,12 +120,13 @@ List<ResourceBundle> bundleList = bundles == null ? null : bundles.get(); if (bundleList == null) { bundleList = List.nil(); - for (String bundleName : bundleNames) { + for (ResourceBundleHelper helper : bundleHelpers) { try { - ResourceBundle rb = ResourceBundle.getBundle(bundleName, locale); + ResourceBundle rb = helper.getResourceBundle(locale); bundleList = bundleList.prepend(rb); } catch (MissingResourceException e) { - throw new InternalError("Cannot find javac resource bundle for locale " + locale); + throw new InternalError("Cannot find requested resource bundle for locale " + + locale, e); } } bundleCache.put(locale, new SoftReference<>(bundleList)); @@ -134,6 +140,7 @@ return getLocalizedString(currentLocale, key, args); } + @Override public String getLocalizedString(Locale l, String key, Object... args) { if (l == null) l = getCurrentLocale(); @@ -146,8 +153,7 @@ * easy access to simple localized strings. */ - private static final String defaultBundleName = - "com.sun.tools.javac.resources.compiler"; + private static final String defaultBundleName = "com.sun.tools.javac.resources.compiler"; private static ResourceBundle defaultBundle; private static JavacMessages defaultMessages; @@ -198,4 +204,17 @@ } return MessageFormat.format(msg, args); } + + /** + * This provides a way for the JavacMessager to retrieve a + * ResourceBundle from another module such as jdk.javadoc. + */ + public interface ResourceBundleHelper { + /** + * Gets the ResourceBundle. + * @param locale the requested bundle's locale + * @return ResourceBundle + */ + ResourceBundle getResourceBundle(Locale locale); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java new/langtools-7c44d9a33bbe/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java --- old/langtools-1ccb6ef2f40b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Messager.java 2015-02-13 01:38:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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 @@ -27,6 +27,7 @@ import java.io.PrintWriter; import java.util.Locale; +import java.util.ResourceBundle; import com.sun.javadoc.*; import com.sun.tools.javac.util.Context; @@ -126,9 +127,11 @@ PrintWriter noticeWriter) { super(context, errWriter, warnWriter, noticeWriter); messages = JavacMessages.instance(context); - messages.add("com.sun.tools.javadoc.resources.javadoc"); + messages.add(locale -> ResourceBundle.getBundle("com.sun.tools.javadoc.resources.javadoc", + locale)); javadocDiags = new JCDiagnostic.Factory(messages, "javadoc"); this.programName = programName; + } public void setLocale(Locale locale) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8016177/T8016177g.java new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8016177/T8016177g.java --- old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8016177/T8016177g.java 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8016177/T8016177g.java 2015-02-13 01:38:39.000000000 +0100 @@ -1,6 +1,6 @@ /* * @test /nodynamiccopyright/ - * @bug 8016081 8016178 + * @bug 8016081 8016178 8069545 * @summary structural most specific and stuckness * @compile/fail/ref=T8016177g.out -XDrawDiagnostics T8016177g.java */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8016177/T8016177g.out new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8016177/T8016177g.out --- old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8016177/T8016177g.out 2015-02-06 00:44:57.000000000 +0100 +++ new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8016177/T8016177g.out 2015-02-13 01:38:39.000000000 +0100 @@ -1,2 +1,3 @@ -T8016177g.java:35:20: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: double, int) -1 error +T8016177g.java:34:14: compiler.err.cant.apply.symbol: kindname.method, print, java.lang.String, Test.Person, kindname.class, Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inferred.do.not.conform.to.upper.bounds: Test.Person, java.lang.String,java.lang.Object)) +T8016177g.java:35:20: compiler.err.cant.apply.symbol: kindname.method, abs, int, java.lang.Double, kindname.class, Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: , R, int)) +2 errors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8068399/T8068399.java new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8068399/T8068399.java --- old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8068399/T8068399.java 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8068399/T8068399.java 2015-02-13 01:38:39.000000000 +0100 @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 8068399 + * @summary structural most specific and stuckness + */ + +import java.util.function.Function; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +public class T8068399 { + + public static class Spectrum { + public double[] getEnergy() { + return new double[0]; + } + } + + protected Spectrum spectrum; + + public static class Ref<T> { + + T value; + + public Ref() { + } + + public Ref(T value) { + this.value = value; + } + + public boolean isNull() { + return value == null; + } + + public T get() { + return value; + } + + public void set(T value) { + this.value = value; + } + } + + public static <T>T maxKey(Stream<T> stream, Function<T, Double> function) { + Ref<Double> max = new Ref<>(); + Ref<T> index = new Ref<>(); + stream.forEach(v -> { + Double value = function.apply(v); + + if (max.isNull() || value > max.get()) { + max.set(value); + index.set(v); + } + }); + + return index.get(); + } + + public static int interpolate(int x, int x0, int x1, int y0, int y1) { + return y0 + (x - x0) * (y1 - y0) / (x1 - x0); + } + + public static double interpolate(double x, double x0, double x1, double y0, double y1) { + return y0 + (x - x0) * (y1 - y0) / (x1 - x0); + } + + protected int getXByFrequency(double frequency) { + return (int) Math.round(interpolate(frequency, + getMinSpectrumCoord(), + getMaxSpectrumCoord(), + 0, getWidth())); + } + + private int getWidth() { + return 0; + } + + private double getMaxSpectrumCoord() { + return 0; + } + + private double getMinSpectrumCoord() { + return 0; + } + + void foo() { + int maxBpmIndex = 0; + int xcur = getXByFrequency(maxKey(IntStream.range(0, maxBpmIndex).boxed(), + i -> Math.abs(spectrum.getEnergy()[i]))); + } + + public static void main(String [] args) { + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8068430/T8068430.java new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8068430/T8068430.java --- old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8068430/T8068430.java 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8068430/T8068430.java 2015-02-13 01:38:39.000000000 +0100 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 8068430 + * @summary structural most specific and stuckness + */ + +import java.util.HashMap; +import java.util.Map; + +public class T8068430 { + public static void main(String[] args) { + Map<Integer, String> mp = new HashMap<>(); + mp.put(1, "a"); + mp.put(2, "b"); + mp.put(3, "c"); + mp.put(4, "d"); + System.out.println(mp.entrySet().stream().reduce(0, + (i, e) -> i + e.getKey(), + (i1, i2) -> i1 + i2)); + } +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8071432/T8071432.java new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8071432/T8071432.java --- old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8071432/T8071432.java 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8071432/T8071432.java 2015-02-13 01:38:39.000000000 +0100 @@ -0,0 +1,50 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8071432 + * @summary structural most specific and stuckness + * @compile/fail/ref=T8071432.out -XDrawDiagnostics T8071432.java + */ + +import java.util.Arrays; +import java.util.Collection; + +class T8071432 { + + static class Point { + + private double x, y; + + public Point(double x, double y) { + this.x = x; + this.y = y; + } + + public double getX() { + return x; + } + + public double getY() { + return y; + } + + public double distance(Point p) { + return Math.sqrt((this.x - p.x) * (this.x - p.x) + + (this.y - p.y) * (this.y - p.y)); + } + + public double distance() { + return Math.sqrt(this.x * this.x + this.y * this.y); + } + + public String toString() { + return "(" + x + ":" + y + ")"; + } + } + + public static void main(String[] args) { + Collection<Point> c = Arrays.asList(new Point(1.0, 0.1)); + System.out.println("------- 1 ---------------"); + System.out.println(c.stream().reduce(0.0, + (s, p) -> s += p.distance(), (d1, d2) -> 0)); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8071432/T8071432.out new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8071432/T8071432.out --- old/langtools-1ccb6ef2f40b/test/tools/javac/lambda/8071432/T8071432.out 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-7c44d9a33bbe/test/tools/javac/lambda/8071432/T8071432.out 2015-02-13 01:38:39.000000000 +0100 @@ -0,0 +1,3 @@ +T8071432.java:47:45: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: U, (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.inconvertible.types: int, java.lang.Double))) +T8071432.java:47:27: compiler.err.cant.apply.symbol: kindname.method, println, java.lang.Object, <any>, kindname.class, java.io.PrintStream, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.assignment.exists: U, (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.inconvertible.types: int, java.lang.Double)))) +2 errors ++++++ 1ccb6ef2f40b.tar.bz2 -> 7cb3674cbd8c.tar.bz2 ++++++ ++++ 1305782 lines of diff (skipped) ++++++ 1ccb6ef2f40b.tar.bz2 -> a0dad230aeb3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/1ccb6ef2f40b.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/a0dad230aeb3.tar.bz2 differ: char 11, line 1 ++++++ aarch64-hotspot.patch ++++++ --- jdk9/hotspot/make/linux/makefiles/mapfile-vers-debug 2015-02-20 14:13:19.887884974 +0100 +++ jdk9/hotspot/make/linux/makefiles/mapfile-vers-debug 2015-02-20 14:17:35.341894500 +0100 @@ -132,6 +132,7 @@ JVM_GetMethodIxSignatureUTF; JVM_GetMethodParameters; JVM_GetMethodTypeAnnotations; + JVM_GetNanoTimeAdjustment; JVM_GetPrimitiveArrayElement; JVM_GetProtectionDomain; JVM_GetStackAccessControlContext; --- jdk9/hotspot/make/linux/makefiles/mapfile-vers-product 2015-02-20 14:13:19.887884974 +0100 +++ jdk9/hotspot/make/linux/makefiles/mapfile-vers-product 2015-02-20 14:17:35.342894477 +0100 @@ -132,6 +132,7 @@ JVM_GetMethodIxSignatureUTF; JVM_GetMethodParameters; JVM_GetMethodTypeAnnotations; + JVM_GetNanoTimeAdjustment; JVM_GetPrimitiveArrayElement; JVM_GetProtectionDomain; JVM_GetStackAccessControlContext; --- jdk9/hotspot/src/os/linux/vm/os_linux.cpp 2015-02-20 14:13:19.909884458 +0100 +++ jdk9/hotspot/src/os/linux/vm/os_linux.cpp 2015-02-20 14:17:35.343894453 +0100 @@ -1324,6 +1324,15 @@ return jlong(time.tv_sec) * 1000 + jlong(time.tv_usec / 1000); } +void os::javaTimeSystemUTC(jlong &seconds, jlong &nanos) { + timeval time; + int status = gettimeofday(&time, NULL); + assert(status != -1, "linux error"); + seconds = jlong(time.tv_sec); + nanos = jlong(time.tv_usec) * 1000; +} + + #ifndef CLOCK_MONOTONIC #define CLOCK_MONOTONIC (1) #endif --- jdk9/hotspot/src/share/vm/prims/jvm.cpp 2015-02-20 14:13:19.966883121 +0100 +++ jdk9/hotspot/src/share/vm/prims/jvm.cpp 2015-02-20 14:17:35.345894406 +0100 @@ -300,6 +300,48 @@ return os::javaTimeNanos(); JVM_END +// The function below is actually exposed by sun.misc.VM and not +// java.lang.System, but we choose to keep it here so that it stays next +// to JVM_CurrentTimeMillis and JVM_NanoTime + +const jlong MAX_DIFF_SECS = 0x0100000000LL; // 2^32 +const jlong MIN_DIFF_SECS = -MAX_DIFF_SECS; // -2^32 + +JVM_LEAF(jlong, JVM_GetNanoTimeAdjustment(JNIEnv *env, jclass ignored, jlong offset_secs)) + JVMWrapper("JVM_GetNanoTimeAdjustment"); + jlong seconds; + jlong nanos; + + os::javaTimeSystemUTC(seconds, nanos); + + // We're going to verify that the result can fit in a long. + // For that we need the difference in seconds between 'seconds' + // and 'offset_secs' to be such that: + // |seconds - offset_secs| < (2^63/10^9) + // We're going to approximate 10^9 ~< 2^30 (1000^3 ~< 1024^3) + // which makes |seconds - offset_secs| < 2^33 + // and we will prefer +/- 2^32 as the maximum acceptable diff + // as 2^32 has a more natural feel than 2^33... + // + // So if |seconds - offset_secs| >= 2^32 - we return a special + // sentinel value (-1) which the caller should take as an + // exception value indicating that the offset given to us is + // too far from range of the current time - leading to too big + // a nano adjustment. The caller is expected to recover by + // computing a more accurate offset and calling this method + // again. (For the record 2^32 secs is ~136 years, so that + // should rarely happen) + // + jlong diff = seconds - offset_secs; + if (diff >= MAX_DIFF_SECS || diff <= MIN_DIFF_SECS) { + return -1; // sentinel value: the offset is too far off the target + } + + // return the adjustment. If you compute a time by adding + // this number of nanoseconds along with the number of seconds + // in the offset you should get the current UTC time. + return (diff * (jlong)1000000000) + nanos; +JVM_END JVM_ENTRY(void, JVM_ArrayCopy(JNIEnv *env, jclass ignored, jobject src, jint src_pos, jobject dst, jint dst_pos, jint length)) --- jdk9/hotspot/src/share/vm/prims/jvm.h 2015-02-20 14:13:19.966883121 +0100 +++ jdk9/hotspot/src/share/vm/prims/jvm.h 2015-02-20 14:17:35.345894406 +0100 @@ -131,6 +131,9 @@ JNIEXPORT jlong JNICALL JVM_NanoTime(JNIEnv *env, jclass ignored); +JNIEXPORT jlong JNICALL +JVM_GetNanoTimeAdjustment(JNIEnv *env, jclass ignored, jlong offset_secs); + JNIEXPORT void JNICALL JVM_ArrayCopy(JNIEnv *env, jclass ignored, jobject src, jint src_pos, jobject dst, jint dst_pos, jint length); --- jdk9/hotspot/src/share/vm/runtime/os.hpp Thu Jan 08 12:08:22 2015 -0800 +++ jdk9/hotspot/src/share/vm/runtime/os.hpp Thu Feb 12 16:39:35 2015 -0800 @@ -172,6 +172,7 @@ static jlong javaTimeMillis(); static jlong javaTimeNanos(); static void javaTimeNanos_info(jvmtiTimerInfo *info_ptr); + static void javaTimeSystemUTC(jlong &seconds, jlong &nanos); static void run_periodic_checks(); static bool supports_monotonic_clock(); ++++++ 1ccb6ef2f40b.tar.bz2 -> bb9cf97a5ac6.tar.bz2 ++++++ ++++ 1177648 lines of diff (skipped) ++++++ link-with-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.0vX8Wa/_old 2015-03-01 14:47:47.000000000 +0100 +++ /var/tmp/diff_new_pack.0vX8Wa/_new 2015-03-01 14:47:47.000000000 +0100 @@ -1,5 +1,5 @@ ---- jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2015-01-21 11:14:03.248758378 +0100 -+++ jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2015-01-21 11:15:33.648665485 +0100 +--- jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2015-02-20 09:57:24.632828688 +0100 ++++ jdk9/jdk/make/launcher/Launcher-jdk.runtime.gmk 2015-02-20 09:58:23.957473787 +0100 @@ -46,7 +46,7 @@ ifeq ($(USE_EXTERNAL_LIBZ), true) @@ -9,8 +9,8 @@ else UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 UNPACKEXE_ZIPOBJS := $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \ -@@ -105,9 +105,9 @@ - LDFLAGS_unix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ +@@ -90,9 +90,9 @@ + $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_linux := -lc, \ @@ -19,11 +19,12 @@ - LDFLAGS_SUFFIX := $(LIBCXX), \ + LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \ - OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \ + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \ PROGRAM := unpack200, \ ---- jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-01-21 11:14:03.248758378 +0100 -+++ jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-01-21 11:15:33.648665485 +0100 -@@ -500,7 +500,7 @@ +Only in jdk9/jdk/make/launcher: Launcher-jdk.runtime.gmk.orig +--- jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-02-20 09:57:24.632828688 +0100 ++++ jdk9/jdk/make/lib/Awt2dLibraries.gmk 2015-02-20 09:58:23.958473764 +0100 +@@ -499,7 +499,7 @@ LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ @@ -32,3 +33,4 @@ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=javajpeg.dll" \ +Only in jdk9/jdk/make/lib: Awt2dLibraries.gmk.orig ++++++ s390-size_t.patch ++++++ --- /var/tmp/diff_new_pack.0vX8Wa/_old 2015-03-01 14:47:48.000000000 +0100 +++ /var/tmp/diff_new_pack.0vX8Wa/_new 2015-03-01 14:47:48.000000000 +0100 @@ -1,21 +1,6 @@ ---- jdk9/hotspot/src/share/vm/code/codeCache.cpp 2014-11-13 10:35:38.014355933 +0100 -+++ jdk9/hotspot/src/share/vm/code/codeCache.cpp 2014-11-16 12:11:02.771465686 +0100 -@@ -204,9 +204,9 @@ - size_t non_profiled_size = ReservedCodeSpace::allocation_align_size_up(NonProfiledCodeHeapSize); - - // Compute initial sizes of CodeHeaps -- size_t init_non_method_size = MIN2(InitialCodeCacheSize, non_method_size); -- size_t init_profiled_size = MIN2(InitialCodeCacheSize, profiled_size); -- size_t init_non_profiled_size = MIN2(InitialCodeCacheSize, non_profiled_size); -+ size_t init_non_method_size = MIN2((size_t)InitialCodeCacheSize, non_method_size); -+ size_t init_profiled_size = MIN2((size_t)InitialCodeCacheSize, profiled_size); -+ size_t init_non_profiled_size = MIN2((size_t)InitialCodeCacheSize, non_profiled_size); - - // Reserve one continuous chunk of memory for CodeHeaps and split it into - // parts for the individual heaps. The memory layout looks like this: ---- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2014-11-13 10:35:38.017355865 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2014-11-16 12:11:02.772465660 +0100 -@@ -2659,7 +2659,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-02-20 14:19:59.901506607 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2015-02-20 14:20:36.722643899 +0100 +@@ -2645,7 +2645,7 @@ if (ResizeOldPLAB && CMSOldPLABResizeQuicker) { size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks); n_blks += CMSOldPLABReactivityFactor*multiple*n_blks; @@ -24,9 +9,9 @@ } assert(n_blks > 0, "Error"); _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); ---- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-11-13 10:35:38.017355865 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-11-16 12:11:02.774465609 +0100 -@@ -939,7 +939,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-02-20 14:19:59.901506607 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-02-20 14:20:36.725643829 +0100 +@@ -853,7 +853,7 @@ if (free_percentage < desired_free_percentage) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); assert(desired_capacity >= capacity(), "invalid expansion size"); @@ -35,7 +20,7 @@ if (PrintGCDetails && Verbose) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); gclog_or_tty->print_cr("\nFrom compute_new_size: "); -@@ -6468,7 +6468,7 @@ +@@ -5809,7 +5809,7 @@ HeapWord* curAddr = _markBitMap.startWord(); while (curAddr < _markBitMap.endWord()) { size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); @@ -44,7 +29,7 @@ _markBitMap.clear_large_range(chunk); if (ConcurrentMarkSweepThread::should_yield() && !foregroundGCIsActive() && -@@ -6767,7 +6767,7 @@ +@@ -6093,7 +6093,7 @@ return; } // Double capacity if possible @@ -53,9 +38,9 @@ // Do not give up existing stack until we have managed to // get the double capacity that we desired. ReservedSpace rs(ReservedSpace::allocation_align_size_up( ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-11-13 10:35:38.018355842 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-11-16 12:11:02.776465559 +0100 -@@ -3848,7 +3848,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-02-20 14:19:59.902506583 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-02-20 14:20:36.726643805 +0100 +@@ -3796,7 +3796,7 @@ // of things to do) or totally (at the very end). size_t target_size; if (partially) { @@ -64,9 +49,9 @@ } else { target_size = 0; } ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-11-13 10:35:38.019355819 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-11-16 12:11:02.778465508 +0100 -@@ -1734,7 +1734,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-02-20 14:19:59.903506560 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-02-20 14:20:36.728643759 +0100 +@@ -1650,7 +1650,7 @@ verify_region_sets_optional(); @@ -75,8 +60,8 @@ ergo_verbose1(ErgoHeapSizing, "attempt heap expansion", ergo_format_reason("allocation request failed") ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2014-11-13 10:35:38.020355797 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2014-11-16 12:11:02.778465508 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-02-20 14:19:59.904506536 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-02-20 14:20:36.728643759 +0100 @@ -39,7 +39,7 @@ _cancel(false), _empty(true), @@ -86,8 +71,8 @@ _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC); for (size_t i = 0; i < _nqueues; i++) { new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size); ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2014-11-13 10:35:38.021355774 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2014-11-16 12:11:02.778465508 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-02-20 14:19:59.904506536 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-02-20 14:20:36.729643735 +0100 @@ -110,7 +110,7 @@ }; @@ -97,9 +82,9 @@ _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists); } ---- jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-11-13 10:35:38.021355774 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-11-16 12:11:02.779465483 +0100 -@@ -148,7 +148,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-02-20 14:19:59.904506536 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-02-20 14:20:36.729643735 +0100 +@@ -110,7 +110,7 @@ if (FLAG_IS_DEFAULT(G1HeapRegionSize)) { size_t average_heap_size = (initial_heap_size + max_heap_size) / 2; region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(), @@ -108,8 +93,8 @@ } int region_size_log = log2_long((jlong) region_size); ---- jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-11-13 10:35:38.023355729 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-11-16 12:11:02.780465458 +0100 +--- jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-02-20 14:19:59.907506466 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-02-20 14:20:36.730643712 +0100 @@ -912,8 +912,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { @@ -121,9 +106,9 @@ _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); DEBUG_ONLY(_dwl_initialized = true;) _dwl_adjustment = normal_distribution(1.0); ---- jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-11-13 10:35:38.022355751 +0100 -+++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-11-16 12:11:02.780465458 +0100 -@@ -195,7 +195,7 @@ +--- jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-02-20 14:19:59.905506513 +0100 ++++ jdk9/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-02-20 14:20:36.731643688 +0100 +@@ -194,7 +194,7 @@ const size_t num_overflow_elems = of_stack->size(); const size_t space_available = queue->max_elems() - queue->size(); const size_t num_take_elems = MIN3(space_available / 4, @@ -132,9 +117,9 @@ num_overflow_elems); // Transfer the most recent num_take_elems from the overflow // stack to our work queue. ---- jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-11-13 10:35:38.028355616 +0100 -+++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-11-16 12:15:10.065860961 +0100 -@@ -384,7 +384,7 @@ +--- jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-02-20 14:19:59.911506373 +0100 ++++ jdk9/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-02-20 14:20:36.731643688 +0100 +@@ -383,7 +383,7 @@ uintx calculated_size = NewSize + OldSize; double shrink_factor = (double) MaxHeapSize / calculated_size; uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment); @@ -143,7 +128,7 @@ _initial_young_size = NewSize; // OldSize is already aligned because above we aligned MaxHeapSize to -@@ -449,7 +449,7 @@ +@@ -448,7 +448,7 @@ // yield a size that is too small) and bound it by MaxNewSize above. // Ergonomics plays here by previously calculating the desired // NewSize and MaxNewSize. @@ -152,7 +137,7 @@ } // Given the maximum young size, determine the initial and -@@ -479,7 +479,7 @@ +@@ -478,7 +478,7 @@ // NewSize as the floor, because if NewRatio is overly large, the resulting // size can be too small. _initial_young_size = @@ -161,9 +146,9 @@ } } ---- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2014-11-13 10:35:38.030355570 +0100 -+++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2014-11-16 12:11:02.781465432 +0100 -@@ -1456,7 +1456,7 @@ +--- jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-02-20 14:19:59.913506326 +0100 ++++ jdk9/hotspot/src/share/vm/memory/metaspace.cpp 2015-02-20 14:20:36.733643642 +0100 +@@ -1458,7 +1458,7 @@ void MetaspaceGC::post_initialize() { // Reset the high-water mark once the VM initialization is done. @@ -172,7 +157,7 @@ } bool MetaspaceGC::can_expand(size_t word_size, bool is_class) { -@@ -1516,7 +1516,7 @@ +@@ -1518,7 +1518,7 @@ (size_t)MIN2(min_tmp, double(max_uintx)); // Don't shrink less than the initial generation size minimum_desired_capacity = MAX2(minimum_desired_capacity, @@ -181,7 +166,7 @@ if (PrintGCDetails && Verbose) { gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: "); -@@ -1575,7 +1575,7 @@ +@@ -1577,7 +1577,7 @@ const double max_tmp = used_after_gc / minimum_used_percentage; size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx)); maximum_desired_capacity = MAX2(maximum_desired_capacity, @@ -190,7 +175,7 @@ if (PrintGCDetails && Verbose) { gclog_or_tty->print_cr(" " " maximum_free_percentage: %6.2f" -@@ -3237,7 +3237,7 @@ +@@ -3269,7 +3269,7 @@ // on the medium chunk list. The next chunk will be small and progress // from there. This size calculated by -version. _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6, @@ -199,19 +184,8 @@ _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size); // Arbitrarily set the initial virtual space to a multiple // of the boot class loader size. ---- jdk9/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-11-13 10:35:38.031355547 +0100 -+++ jdk9/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-11-16 12:11:02.782465407 +0100 -@@ -238,7 +238,7 @@ - size_t init_sz; - - if (TLABSize > 0) { -- init_sz = MIN2(TLABSize / HeapWordSize, max_size()); -+ init_sz = MIN2((size_t)(TLABSize / HeapWordSize), max_size()); - } else if (global_stats() == NULL) { - // Startup issue - main thread initialized before heap initialized. - init_sz = min_size(); ---- jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-11-13 10:35:38.033355502 +0100 -+++ jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2014-11-16 12:11:02.782465407 +0100 +--- jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-02-20 14:19:59.916506255 +0100 ++++ jdk9/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp 2015-02-20 14:20:36.734643618 +0100 @@ -48,7 +48,7 @@ const size_t beg_index = size_t(index); assert(beg_index < len || len == 0, "index too large"); @@ -230,9 +204,9 @@ const size_t end_index = beg_index + stride; T* const base = (T*)a->base(); T* const beg = base + beg_index; ---- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2014-11-13 10:35:38.044355253 +0100 -+++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2014-11-17 05:50:43.714512893 +0100 -@@ -656,7 +656,7 @@ +--- jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-02-20 14:19:59.926506021 +0100 ++++ jdk9/hotspot/src/share/vm/prims/whitebox.cpp 2015-02-20 14:20:36.735643595 +0100 +@@ -724,7 +724,7 @@ WB_END WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name)) @@ -241,9 +215,9 @@ if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) { ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI return longBox(thread, env, result); ---- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2014-11-13 10:35:38.045355230 +0100 -+++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2014-11-16 12:11:02.783465381 +0100 -@@ -1344,7 +1344,7 @@ +--- jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-02-20 14:19:59.927505998 +0100 ++++ jdk9/hotspot/src/share/vm/runtime/arguments.cpp 2015-02-20 14:20:36.736643571 +0100 +@@ -1336,7 +1336,7 @@ // NewSize was set on the command line and it is larger than // preferred_max_new_size. if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line @@ -252,7 +226,7 @@ } else { FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size); } -@@ -1369,8 +1369,8 @@ +@@ -1361,8 +1361,8 @@ // Unless explicitly requested otherwise, make young gen // at least min_new, and at most preferred_max_new_size. if (FLAG_IS_DEFAULT(NewSize)) { @@ -263,7 +237,7 @@ if (PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize); -@@ -1380,7 +1380,7 @@ +@@ -1372,7 +1372,7 @@ // so it's NewRatio x of NewSize. if (FLAG_IS_DEFAULT(OldSize)) { if (max_heap > NewSize) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org