From iris.clark at oracle.com Thu Jun 4 17:38:03 2015 From: iris.clark at oracle.com (Iris Clark) Date: Thu, 4 Jun 2015 10:38:03 -0700 (PDT) Subject: JEP 223: New Version-String Scheme discussion moving to verona-dev Message-ID: <95fd891c-3732-4836-a38d-e704b98390e7@default> Hi. OpenJDK Project Verona [0] was created to implement the new JDK version string as defined in JEP 223 [1]. Please direct future discussion about this JEP to that Project's mailing list, verona-dev [2]. I've updated the JEP's "Discussion" field with this information. Thanks, Iris [0] http://openjdk.java.net/projects/verona/ [1] http://openjdk.java.net/jeps/223 [2] http://mail.openjdk.java.net/mailman/listinfo/verona-dev From iris.clark at oracle.com Fri Jun 5 04:40:16 2015 From: iris.clark at oracle.com (Iris Clark) Date: Thu, 4 Jun 2015 21:40:16 -0700 (PDT) Subject: Verona spec: Add `.` to $OPT Message-ID: <20577130-f303-46d9-8f75-e87050323497@default> Hi. In response to a request to add `.` as a valid character in $OPT, I've modified the specification as follows: < - $OPT, matching `([-a-zA-Z0-9]+)` --- Additional --- > - $OPT, matching `([-a-zA-Z0-9\.]+)` --- Additional Please let me know if there are any concerns. Thanks, iris From magnus.ihse.bursie at oracle.com Fri Jun 5 14:07:20 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 05 Jun 2015 16:07:20 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) Message-ID: <5571AD18.7080701@oracle.com> This review request covers the main part of the work for JEP-223, the new version string format [1]. Basically, we'll call this release Java "9", instead of Java "1.9.0". This patch is a folding of all work that has been done so far in the branch JEP-223-branch in jdk9/sandbox. As you can see, it mostly covers build changes, with some code changes in hotspot, jdk, nashorn and langtools that either are corresponding changes in the product code due to the compiler define flags changing from the build, or follow-up changes to handle the new format. The JEP-223 work is not finished by this patch. In fact, there are known issues remaining even after this patch, typically by code that reads the "java.version" property and tries to parse it. However, this patch is not directly destined for jdk9/dev, but will go into the special verona/stage forest. As for all patches destined for verona/stage it will be code reviewed as if going to jdk9/dev. Once in verona/stage it will bide its time, and it will be complemented with follow-up patches to address remaining issues. When all such issues are resolved and JEP-223 is fully implemented, all changes will be pushed at once (without further code reviews) into jdk9/dev. This patch has been contributed by Magnus Ihse Bursie, Kumar Srinivasan and Alejandro Murillo. Bug: https://bugs.openjdk.java.net/browse/JDK-8085822 WebRev: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 [1] http://openjdk.java.net/jeps/223 From magnus.ihse.bursie at oracle.com Mon Jun 8 12:37:01 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Mon, 8 Jun 2015 14:37:01 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <55756194.3080506@oracle.com> References: <5571AD18.7080701@oracle.com> <55756194.3080506@oracle.com> Message-ID: <1136B10A-72A2-421D-8333-1943353F662C@oracle.com> > 8 jun 2015 kl. 11:34 skrev Alan Bateman : > >> On 05/06/2015 15:07, Magnus Ihse Bursie wrote: >> This review request covers the main part of the work for JEP-223, the new version string format [1]. Basically, we'll call this release Java "9", instead of Java "1.9.0". >> >> This patch is a folding of all work that has been done so far in the branch JEP-223-branch in jdk9/sandbox. As you can see, it mostly covers build changes, with some code changes in hotspot, jdk, nashorn and langtools that either are corresponding changes in the product code due to the compiler define flags changing from the build, or follow-up changes to handle the new format. >> >> The JEP-223 work is not finished by this patch. In fact, there are known issues remaining even after this patch, typically by code that reads the "java.version" property and tries to parse it. However, this patch is not directly destined for jdk9/dev, but will go into the special verona/stage forest. As for all patches destined for verona/stage it will be code reviewed as if going to jdk9/dev. Once in verona/stage it will bide its time, and it will be complemented with follow-up patches to address remaining issues. When all such issues are resolved and JEP-223 is fully implemented, all changes will be pushed at once (without further code reviews) into jdk9/dev. >> >> This patch has been contributed by Magnus Ihse Bursie, Kumar Srinivasan and Alejandro Murillo. >> >> Bug: https://bugs.openjdk.java.net/browse/JDK-8085822 >> WebRev: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 > > I looked through the code changes, skipping most of the make files :-) > > Version.java.template - the comment in jvmSecurityVersion() still talks about 1.6 and newer. Can this be replaced to just say that it returns the security version? > > Will the update_version and special_update_version fields eventually be dropped from the jvm_version_info stricture? Related, there seems to be a typo in the comment in jdk_util.c where it has "specia_update_version". > > The webrev shows a change to this comment in jvm.h: > "Third, this file contains various I/O and network operations needed by the standard Java I/O and network APIs." > I think this comment can be removed because those JVM_* functions were removed some time ago. > > Otherwise looks okay to me. The API functions in Version.java and jvm.h are not finished. The specification in the JEP talks about a java.util.Version, that I presume will replace the sun.misc.Version, and that will fully implement an API to access the version string and all it's parts, according to the JEP definition. Also, the native interface will have to be changed to accommodate a version number with an arbitrarily number of dot separated parts. These changes will be done later on in the verona/stage forest. Are you ok with addressing these concerns at such a later time? /Magnus > > -Alan. From erik.joelsson at oracle.com Mon Jun 8 09:05:02 2015 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Mon, 08 Jun 2015 11:05:02 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5571AD18.7080701@oracle.com> References: <5571AD18.7080701@oracle.com> Message-ID: <55755ABE.9010000@oracle.com> Hello, Looks pretty good. Found some typos: jdk_util.c: 99: specia_update_version jdk-version.m4: 31: assing 124, 132: --with--version-pre-base has a dash too many? I see this pattern consistently used though, am I missing something? /Erik On 2015-06-05 16:07, Magnus Ihse Bursie wrote: > This review request covers the main part of the work for JEP-223, the > new version string format [1]. Basically, we'll call this release Java > "9", instead of Java "1.9.0". > > This patch is a folding of all work that has been done so far in the > branch JEP-223-branch in jdk9/sandbox. As you can see, it mostly > covers build changes, with some code changes in hotspot, jdk, nashorn > and langtools that either are corresponding changes in the product > code due to the compiler define flags changing from the build, or > follow-up changes to handle the new format. > > The JEP-223 work is not finished by this patch. In fact, there are > known issues remaining even after this patch, typically by code that > reads the "java.version" property and tries to parse it. However, this > patch is not directly destined for jdk9/dev, but will go into the > special verona/stage forest. As for all patches destined for > verona/stage it will be code reviewed as if going to jdk9/dev. Once in > verona/stage it will bide its time, and it will be complemented with > follow-up patches to address remaining issues. When all such issues > are resolved and JEP-223 is fully implemented, all changes will be > pushed at once (without further code reviews) into jdk9/dev. > > This patch has been contributed by Magnus Ihse Bursie, Kumar > Srinivasan and Alejandro Murillo. > > Bug: https://bugs.openjdk.java.net/browse/JDK-8085822 > WebRev: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 > > [1] http://openjdk.java.net/jeps/223 > From Alan.Bateman at oracle.com Mon Jun 8 09:34:12 2015 From: Alan.Bateman at oracle.com (Alan Bateman) Date: Mon, 08 Jun 2015 10:34:12 +0100 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5571AD18.7080701@oracle.com> References: <5571AD18.7080701@oracle.com> Message-ID: <55756194.3080506@oracle.com> On 05/06/2015 15:07, Magnus Ihse Bursie wrote: > This review request covers the main part of the work for JEP-223, the > new version string format [1]. Basically, we'll call this release Java > "9", instead of Java "1.9.0". > > This patch is a folding of all work that has been done so far in the > branch JEP-223-branch in jdk9/sandbox. As you can see, it mostly > covers build changes, with some code changes in hotspot, jdk, nashorn > and langtools that either are corresponding changes in the product > code due to the compiler define flags changing from the build, or > follow-up changes to handle the new format. > > The JEP-223 work is not finished by this patch. In fact, there are > known issues remaining even after this patch, typically by code that > reads the "java.version" property and tries to parse it. However, this > patch is not directly destined for jdk9/dev, but will go into the > special verona/stage forest. As for all patches destined for > verona/stage it will be code reviewed as if going to jdk9/dev. Once in > verona/stage it will bide its time, and it will be complemented with > follow-up patches to address remaining issues. When all such issues > are resolved and JEP-223 is fully implemented, all changes will be > pushed at once (without further code reviews) into jdk9/dev. > > This patch has been contributed by Magnus Ihse Bursie, Kumar > Srinivasan and Alejandro Murillo. > > Bug: https://bugs.openjdk.java.net/browse/JDK-8085822 > WebRev: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 I looked through the code changes, skipping most of the make files :-) Version.java.template - the comment in jvmSecurityVersion() still talks about 1.6 and newer. Can this be replaced to just say that it returns the security version? Will the update_version and special_update_version fields eventually be dropped from the jvm_version_info stricture? Related, there seems to be a typo in the comment in jdk_util.c where it has "specia_update_version". The webrev shows a change to this comment in jvm.h: "Third, this file contains various I/O and network operations needed by the standard Java I/O and network APIs." I think this comment can be removed because those JVM_* functions were removed some time ago. Otherwise looks okay to me. -Alan. From sundararajan.athijegannathan at oracle.com Mon Jun 8 12:55:17 2015 From: sundararajan.athijegannathan at oracle.com (A. Sundararajan) Date: Mon, 08 Jun 2015 18:25:17 +0530 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <1136B10A-72A2-421D-8333-1943353F662C@oracle.com> References: <5571AD18.7080701@oracle.com> <55756194.3080506@oracle.com> <1136B10A-72A2-421D-8333-1943353F662C@oracle.com> Message-ID: <557590B5.8090906@oracle.com> +1 on Nashorn changes. -Sundar On Monday 08 June 2015 06:07 PM, Magnus Ihse Bursie wrote: >> 8 jun 2015 kl. 11:34 skrev Alan Bateman : >> >>> On 05/06/2015 15:07, Magnus Ihse Bursie wrote: >>> This review request covers the main part of the work for JEP-223, the new version string format [1]. Basically, we'll call this release Java "9", instead of Java "1.9.0". >>> >>> This patch is a folding of all work that has been done so far in the branch JEP-223-branch in jdk9/sandbox. As you can see, it mostly covers build changes, with some code changes in hotspot, jdk, nashorn and langtools that either are corresponding changes in the product code due to the compiler define flags changing from the build, or follow-up changes to handle the new format. >>> >>> The JEP-223 work is not finished by this patch. In fact, there are known issues remaining even after this patch, typically by code that reads the "java.version" property and tries to parse it. However, this patch is not directly destined for jdk9/dev, but will go into the special verona/stage forest. As for all patches destined for verona/stage it will be code reviewed as if going to jdk9/dev. Once in verona/stage it will bide its time, and it will be complemented with follow-up patches to address remaining issues. When all such issues are resolved and JEP-223 is fully implemented, all changes will be pushed at once (without further code reviews) into jdk9/dev. >>> >>> This patch has been contributed by Magnus Ihse Bursie, Kumar Srinivasan and Alejandro Murillo. >>> >>> Bug: https://bugs.openjdk.java.net/browse/JDK-8085822 >>> WebRev: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >> I looked through the code changes, skipping most of the make files :-) >> >> Version.java.template - the comment in jvmSecurityVersion() still talks about 1.6 and newer. Can this be replaced to just say that it returns the security version? >> >> Will the update_version and special_update_version fields eventually be dropped from the jvm_version_info stricture? Related, there seems to be a typo in the comment in jdk_util.c where it has "specia_update_version". >> >> The webrev shows a change to this comment in jvm.h: >> "Third, this file contains various I/O and network operations needed by the standard Java I/O and network APIs." >> I think this comment can be removed because those JVM_* functions were removed some time ago. >> >> Otherwise looks okay to me. > The API functions in Version.java and jvm.h are not finished. The specification in the JEP talks about a java.util.Version, that I presume will replace the sun.misc.Version, and that will fully implement an API to access the version string and all it's parts, according to the JEP definition. Also, the native interface will have to be changed to accommodate a version number with an arbitrarily number of dot separated parts. These changes will be done later on in the verona/stage forest. > > Are you ok with addressing these concerns at such a later time? > > /Magnus > >> -Alan. From Alan.Bateman at oracle.com Mon Jun 8 20:41:09 2015 From: Alan.Bateman at oracle.com (Alan Bateman) Date: Mon, 08 Jun 2015 21:41:09 +0100 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <1136B10A-72A2-421D-8333-1943353F662C@oracle.com> References: <5571AD18.7080701@oracle.com> <55756194.3080506@oracle.com> <1136B10A-72A2-421D-8333-1943353F662C@oracle.com> Message-ID: <5575FDE5.5020002@oracle.com> On 08/06/2015 13:37, Magnus Ihse Bursie wrote: > : > The API functions in Version.java and jvm.h are not finished. The specification in the JEP talks about a java.util.Version, that I presume will replace the sun.misc.Version, and that will fully implement an API to access the version string and all it's parts, according to the JEP definition. Also, the native interface will have to be changed to accommodate a version number with an arbitrarily number of dot separated parts. These changes will be done later on in the verona/stage forest. > > Are you ok with addressing these concerns at such a later time? > Sure, esp. since my comments are indeed in the area that isn't complete in this webrev. -Alan From daniel.daugherty at oracle.com Mon Jun 8 23:31:20 2015 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Mon, 08 Jun 2015 17:31:20 -0600 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5571AD18.7080701@oracle.com> References: <5571AD18.7080701@oracle.com> Message-ID: <557625C8.5050200@oracle.com> > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 General comment: Not all copyright years were updated. General comment: It looks like support for the 'patch' value is not completely implemented through all the Makefiles. I didn't audit for this, but it's just my impression. common/autoconf/configure.ac No comments. common/autoconf/flags.m4 No comments. common/autoconf/generated-configure.sh There are multiple Copyright notices in this file. Why? L4076: # Verify that a given string represent a valid version number, and assing it to L4077: # a variable. Fixed two typos and reformat a bit: # Verify that a given string represents a valid version number, and # assigning it to a variable. L20186-20189: indent for the block is off L20256-20259: indent for the block is off L20262: as_fn_error $? "--with--version-string must have a value" "$LINENO" 5 The '--with--version...' part doesn't match previous usages where '--with-version...' is used L20275: # Unspecified numerical fields is interpreted as 0. Grammar: 'is interpreted' -> 'are interpreted' L20286: as_fn_error $? "Version string contains + but both 'BUILD' and 'OPT' is missing" "$LINENO" 5 Grammar: 'is missing' -> 'are missing' L20292: as_fn_error $? "--with--version-string fails to parse The '--with--version...' part doesn't match previous usages where '--with-version...' is used L20297-L20302: indent for the block is off L20307: as_fn_error $? "--with--version-pre-base must have a value" "$LINENO" 5 L20315: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with--version-pre-base value... L20316: $as_echo "$as_me: WARNING: --with--version-pre-base value... The '--with--version...' part doesn't match previous usages where '--with-version...' is used L20327-20332: indent for the block is off L20337: as_fn_error $? "--with--version-pre-debuglevel must have... L20345: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with--version-pre-debuglevel value... L20346: $as_echo "$as_me: WARNING: --with--version-pre-debuglevel value The '--with--version...' part doesn't match previous usages where '--with-version...' is used L20361-20366: indent for the block is off L20371: as_fn_error $? "--with--version-opt must have... L20379: { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with--version-opt value L20380: $as_echo "$as_me: WARNING: --with--version-opt value has been The '--with--version...' part doesn't match previous usages where '--with-version...' is used At this point, I'm going to stop pointing out the '--with-version...' and '--with--version...' differences; don't know which usage is right. L20388-L20388: indent is off by one L20388: username=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` This assumes that the "USER" variable is set. Should there be a check for "" and perhaps use "no_user_specified" or something like that? Perhaps the build setup always makes sure that "USER" is set to something. Don't know. L20395-L20400: indent for the block is off L20413-L20431: indent of all blocks in this range are off L20444-L20449: indent for the block is off L20457-L20475: indent of all blocks in this range are off L20486-L20491: indent for the block is off L20504-L20522: indent of all blocks in this range are off L20533-L20538: indent for the block is off L20551-L20569: indent of all blocks in this range are off L20580-L20585: indent for the block is off L20598-L20616: indent of all blocks in this range are off common/autoconf/help.m4 No comments. common/autoconf/jdk-options.m4 Don't know why the 'elliptic curve crypto implementation' support is relocated as part of this changeset, but ... No comments. common/autoconf/spec.gmk.in No comments. common/autoconf/version-numbers No comments. common/nb_native/nbproject/configurations.xml No comments. make/Images.gmk No comments. make/Install.gmk No comments. make/Javadoc.gmk Did you mean to remove the 'clean' target? make/JrtfsJar.gmk No comments. make/MacBundles.gmk No comments. make/jprt.properties No comments. hotspot/make/Makefile No comments. hotspot/make/aix/Makefile No comments. hotspot/make/aix/makefiles/buildtree.make No comments. hotspot/make/aix/makefiles/defs.make No comments. hotspot/make/aix/makefiles/vm.make No comments. hotspot/make/bsd/Makefile No comments. hotspot/make/bsd/makefiles/buildtree.make No comments. hotspot/make/bsd/makefiles/defs.make No comments. hotspot/make/bsd/makefiles/vm.make No comments. hotspot/make/defs.make No comments. hotspot/make/jdk_version No comments. hotspot/make/linux/Makefile No comments. hotspot/make/linux/makefiles/buildtree.make No comments. hotspot/make/linux/makefiles/defs.make No comments. hotspot/make/linux/makefiles/vm.make No comments. hotspot/make/solaris/Makefile No comments. hotspot/make/solaris/makefiles/buildtree.make No comments. hotspot/make/solaris/makefiles/defs.make No comments. hotspot/make/solaris/makefiles/sparcWorks.make No comments. hotspot/make/solaris/makefiles/vm.make No comments. hotspot/make/windows/build.make No comments. hotspot/make/windows/makefiles/compile.make No changes in the frames view. Update: udiff view shows a blank line deleted at the end of the file. hotspot/make/windows/makefiles/debug.make No comments. hotspot/make/windows/makefiles/defs.make No comments. hotspot/make/windows/makefiles/fastdebug.make No comments. hotspot/make/windows/makefiles/product.make No comments. hotspot/make/windows/makefiles/vm.make No comments. hotspot/make/windows/projectfiles/common/Makefile No comments. hotspot/src/share/vm/prims/jvm.h No comments. hotspot/src/share/vm/runtime/arguments.cpp No comments. hotspot/src/share/vm/runtime/java.cpp L661: void JDK_Version::fully_initialize( L662: uint8_t major, uint8_t minor, uint8_t security, uint8_t update) { L663: // This is only called when current is less than 1.6 and we've gotten Since you're ripping out vestigial version support, I think this function can go away since this is version 9 and newer. Don't really know for sure, but based on that comment... hotspot/src/share/vm/runtime/java.hpp No comments. hotspot/src/share/vm/runtime/vmStructs.cpp L1240: please make the 'int' parameter align like the rest. hotspot/src/share/vm/runtime/vm_version.cpp L84: void Abstract_VM_Version::initialize() { L85: // FIXME: Initialization can probably be removed now. I agree, but that would entail also removing the _initialized and the uses of it... Follow on bug fix? hotspot/src/share/vm/runtime/vm_version.hpp No comments. hotspot/test/runtime/6981737/Test6981737.java No comments. jdk/make/CompileDemos.gmk No comments. jdk/make/data/mainmanifest/manifest.mf No comments. jdk/make/gensrc/GensrcMisc.gmk No comments. jdk/make/launcher/Launcher-jdk.accessibility.gmk No comments. jdk/make/launcher/Launcher-jdk.pack200.gmk No comments. jdk/make/launcher/LauncherCommon.gmk No comments. jdk/make/lib/CoreLibraries.gmk No comments. jdk/src/java.base/share/classes/sun/misc/Version.java.template L149: * Returns the security version of the running JVM if it's 1.6 or newer This JavaDoc update is wrong, but it might not be important if sun.misc.Version class is going away. jdk/src/java.base/share/native/include/jvm.h No comments. jdk/src/java.base/share/native/launcher/defines.h No comments. jdk/src/java.base/share/native/launcher/main.c No comments. jdk/src/java.base/share/native/libjava/System.c No comments. jdk/src/java.base/share/native/libjava/Version.c No comments. jdk/src/java.base/share/native/libjava/jdk_util.c No comments. jdk/src/java.base/windows/native/common/version.rc No comments. jdk/src/java.desktop/windows/native/libawt/windows/awt.rc No comments. jdk/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC No comments. jdk/test/sun/misc/Version/Version.java No comments. langtools/make/gensrc/GensrcCommon.gmk No comments. langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java old L171: case "1.9": new L171: case "9": Should this logic support both versions? Will dropping "1.9" here prevent a pre-version changeset JVM from being dropped into a JDK for triage purposes? Granted we don't often triage 'javac' with different JVMs, but... langtools/test/tools/javac/options/modes/InfoOptsTest.java No comments. langtools/test/tools/javac/options/modes/SourceTargetTest.java No comments. nashorn/make/BuildNashorn.gmk No comments. nashorn/make/build.xml No comments. nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java No comments. common/autoconf/jdk-version.m4 No comments. nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template No comments. common/bin/test_builds.sh hotspot/make/jdk6_hotspot_distro No comments. Dan On 6/5/15 8:07 AM, Magnus Ihse Bursie wrote: > This review request covers the main part of the work for JEP-223, the > new version string format [1]. Basically, we'll call this release Java > "9", instead of Java "1.9.0". > > This patch is a folding of all work that has been done so far in the > branch JEP-223-branch in jdk9/sandbox. As you can see, it mostly > covers build changes, with some code changes in hotspot, jdk, nashorn > and langtools that either are corresponding changes in the product > code due to the compiler define flags changing from the build, or > follow-up changes to handle the new format. > > The JEP-223 work is not finished by this patch. In fact, there are > known issues remaining even after this patch, typically by code that > reads the "java.version" property and tries to parse it. However, this > patch is not directly destined for jdk9/dev, but will go into the > special verona/stage forest. As for all patches destined for > verona/stage it will be code reviewed as if going to jdk9/dev. Once in > verona/stage it will bide its time, and it will be complemented with > follow-up patches to address remaining issues. When all such issues > are resolved and JEP-223 is fully implemented, all changes will be > pushed at once (without further code reviews) into jdk9/dev. > > This patch has been contributed by Magnus Ihse Bursie, Kumar > Srinivasan and Alejandro Murillo. > > Bug: https://bugs.openjdk.java.net/browse/JDK-8085822 > WebRev: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 > > [1] http://openjdk.java.net/jeps/223 > From jan.lahoda at oracle.com Tue Jun 9 04:57:58 2015 From: jan.lahoda at oracle.com (Jan Lahoda) Date: Tue, 09 Jun 2015 06:57:58 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <557625C8.5050200@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> Message-ID: <55767256.3030802@oracle.com> On 9.6.2015 01:31, Daniel D. Daugherty wrote: > > > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 > langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java > > old L171: case "1.9": > new L171: case "9": > Should this logic support both versions? Will dropping > "1.9" here prevent a pre-version changeset JVM from > being dropped into a JDK for triage purposes? > > Granted we don't often triage 'javac' with different JVMs, but... > +1 on keeping both "1.9" and "9" here. javac can be used independently on the rest of JDK to some extent, so support for running it on older builds of JDK 9 seems reasonable to me. (I wonder if current JDK 9 javac should be prepared for the new version scheme in advance.) Jan From magnus.ihse.bursie at oracle.com Tue Jun 9 13:12:19 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 09 Jun 2015 15:12:19 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <557625C8.5050200@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> Message-ID: <5576E633.9050503@oracle.com> Hi Daniel, Thank you for your thorough review! On 2015-06-09 01:31, Daniel D. Daugherty wrote: > > > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 > > > General comment: Not all copyright years were updated. > General comment: It looks like support for the 'patch' value is not > completely > implemented through all the Makefiles. I didn't audit for this, > but it's > just my impression. You are basically correct. The makefiles all propagate the patch value where needed, but the actual source code changes in hotspot and jdk ignores the patch field as of now. This will be corrected in a later add-on patch, submitted by someone from the jdk and/or hotspot team rather than the build team. > > common/autoconf/generated-configure.sh > There are multiple Copyright notices in this file. Why? Oh dear, you've reviewed the generated file. :-& I'm really impressed by your effort! However, the generated-configure.sh file is automatically created by the autoconf framework from the rest of the files in common/autoconf/*, so we cannot direcly modify it's contents - only indirectly. The reason it's checked in, is that otherwise every user would need to generate it before being able to run configure. In build reviews, we usually either revert changes to generated-configure.sh before posting a review to hide it (and re-generate it before pushing), or we just ignore it during reviews. I should have done that, or pointed out that it was not needed nor possible to review when I cross-posted. I'm sorry. > > L4076: # Verify that a given string represent a valid version > number, and assing it to > L4077: # a variable. > Fixed two typos and reformat a bit: > # Verify that a given string represents a valid version > number, and > # assigning it to a variable. I'll put that fix in the source .m4 file instead. Thanks. > > L20262: as_fn_error $? "--with--version-string must have a > value" "$LINENO" 5 > The '--with--version...' part doesn't match previous usages where > '--with-version...' is used Yes, you're right. Erik pointed it out as well. It's a typo in the error message. It's all over the place due to copied code. I'll fix it in the source .m4 file. (As a side note, I have a half-finished follow-up patch that will reduce the amount of code duplication, but it requires some framework changes so it'll have to be a separate thing.) > > L20275: # Unspecified numerical fields is interpreted as 0. > Grammar: 'is interpreted' -> 'are interpreted' > > L20286: as_fn_error $? "Version string contains + but both > 'BUILD' and 'OPT' is missing" "$LINENO" 5 > Grammar: 'is missing' -> 'are missing' Those darn English plural forms! Why can't you all do as we sensible Swedes and get rid of them? ;-) (I'll fix) > > L20388: username=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` > This assumes that the "USER" variable is set. Should there > be a check for "" and perhaps use "no_user_specified" or > something like that? Perhaps the build setup always makes > sure that "USER" is set to something. Don't know. Hm. I think the worst thing that'll happen is that the username part of the opt string gets empty. This part is basically copied right off the old build, where we have relied on the $USER variable being present for all the time with no problems, so I think it's quite safe to assume. > > common/autoconf/jdk-options.m4 > Don't know why the 'elliptic curve crypto implementation' support > is relocated as part of this changeset, but ... It was incorrectly placed not at the top indentation level, but in the middle of the function definition where the old versioning code were handled. (Which, mostly by chance, happens to work in autoconf, but is really bad style). > make/Javadoc.gmk > Did you mean to remove the 'clean' target? Yep. Cleaning is done by the top-level Main.gmk makefile nowadays, that's just some dead code. > > hotspot/make/windows/makefiles/compile.make > No changes in the frames view. > Update: udiff view shows a blank line deleted at the end of the file. That's probably the result of some change going forth and then back again during development. But then again, removing extra blank linkes is not a bad thing. (jcheck unfortunately does not enforce any style checks for make files :-( so they tend to detoriate over time.) > > hotspot/src/share/vm/runtime/java.cpp > L661: void JDK_Version::fully_initialize( > L662: uint8_t major, uint8_t minor, uint8_t security, uint8_t > update) { > L663: // This is only called when current is less than 1.6 and > we've gotten > > Since you're ripping out vestigial version support, I think this > function can go away since this is version 9 and newer. Don't > really > know for sure, but based on that comment... It probably can, yes. This and other core changes to the actual .cpp/.java files will be addressed in a follow-up patch. > > hotspot/src/share/vm/runtime/java.hpp > No comments. > > hotspot/src/share/vm/runtime/vmStructs.cpp > L1240: please make the 'int' parameter align like the rest. Are you okay with defering such a change to a follow-up patch? It's likely the entire struct will need changes to be able to handle a theoretically arbitrarily long version number. > > hotspot/src/share/vm/runtime/vm_version.cpp > L84: void Abstract_VM_Version::initialize() { > L85: // FIXME: Initialization can probably be removed now. > I agree, but that would entail also removing the > _initialized and the uses of it... Follow on bug fix? Definitely follow on. > jdk/src/java.base/share/classes/sun/misc/Version.java.template > L149: * Returns the security version of the running JVM if > it's 1.6 or newer > This JavaDoc update is wrong, but it might not be important > if sun.misc.Version class is going away. I'm not sure if it's going to be replaced by, or just complemented by java.util.Version, but in any case it will need a follow-up patch to clean up this and other issues. > langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java > > old L171: case "1.9": > new L171: case "9": > Should this logic support both versions? Will dropping > "1.9" here prevent a pre-version changeset JVM from > being dropped into a JDK for triage purposes? > > Granted we don't often triage 'javac' with different JVMs, but... I'll defer that question to Kumar, who wrote that piece of code. My guess is that when Hotspot express was dropped, the ability to use a JVM from another JDK release bit rotteded away. /Magnus From daniel.daugherty at oracle.com Tue Jun 9 13:20:27 2015 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Tue, 09 Jun 2015 07:20:27 -0600 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5576E633.9050503@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> Message-ID: <5576E81B.8050703@oracle.com> On 6/9/15 7:12 AM, Magnus Ihse Bursie wrote: > Hi Daniel, > > Thank you for your thorough review! This was my (failing) attempt at a "fast pass" review... :-) > > On 2015-06-09 01:31, Daniel D. Daugherty wrote: >> > >> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >> >> >> General comment: Not all copyright years were updated. >> General comment: It looks like support for the 'patch' value is not >> completely >> implemented through all the Makefiles. I didn't audit for this, >> but it's >> just my impression. > > You are basically correct. The makefiles all propagate the patch value > where needed, but the actual source code changes in hotspot and jdk > ignores the patch field as of now. This will be corrected in a later > add-on patch, submitted by someone from the jdk and/or hotspot team > rather than the build team. > >> >> common/autoconf/generated-configure.sh >> There are multiple Copyright notices in this file. Why? > Oh dear, you've reviewed the generated file. :-& I'm really impressed > by your effort! Ahhh... now that you say it... it sounds familiar... I may have made this same mistake before. I'll try to remember next time. > However, the generated-configure.sh file is automatically created by > the autoconf framework from the rest of the files in > common/autoconf/*, so we cannot direcly modify it's contents - only > indirectly. The reason it's checked in, is that otherwise every user > would need to generate it before being able to run configure. In build > reviews, we usually either revert changes to generated-configure.sh > before posting a review to hide it (and re-generate it before > pushing), or we just ignore it during reviews. I should have done > that, or pointed out that it was not needed nor possible to review > when I cross-posted. I'm sorry. > >> >> L4076: # Verify that a given string represent a valid version >> number, and assing it to >> L4077: # a variable. >> Fixed two typos and reformat a bit: >> # Verify that a given string represents a valid version >> number, and >> # assigning it to a variable. > I'll put that fix in the source .m4 file instead. Thanks. >> >> L20262: as_fn_error $? "--with--version-string must have a >> value" "$LINENO" 5 >> The '--with--version...' part doesn't match previous usages >> where >> '--with-version...' is used > Yes, you're right. Erik pointed it out as well. It's a typo in the > error message. It's all over the place due to copied code. I'll fix it > in the source .m4 file. > > (As a side note, I have a half-finished follow-up patch that will > reduce the amount of code duplication, but it requires some framework > changes so it'll have to be a separate thing.) > >> >> L20275: # Unspecified numerical fields is interpreted as 0. >> Grammar: 'is interpreted' -> 'are interpreted' >> >> L20286: as_fn_error $? "Version string contains + but >> both 'BUILD' and 'OPT' is missing" "$LINENO" 5 >> Grammar: 'is missing' -> 'are missing' > Those darn English plural forms! Why can't you all do as we sensible > Swedes and get rid of them? ;-) > > (I'll fix) > >> >> L20388: username=`$ECHO "$USER" | $TR -d -c >> '[a-z][A-Z][0-9]'` >> This assumes that the "USER" variable is set. Should there >> be a check for "" and perhaps use "no_user_specified" or >> something like that? Perhaps the build setup always makes >> sure that "USER" is set to something. Don't know. > Hm. I think the worst thing that'll happen is that the username part > of the opt string gets empty. This part is basically copied right off > the old build, where we have relied on the $USER variable being > present for all the time with no problems, so I think it's quite safe > to assume. >> >> common/autoconf/jdk-options.m4 >> Don't know why the 'elliptic curve crypto implementation' support >> is relocated as part of this changeset, but ... > It was incorrectly placed not at the top indentation level, but in the > middle of the function definition where the old versioning code were > handled. (Which, mostly by chance, happens to work in autoconf, but is > really bad style). > >> make/Javadoc.gmk >> Did you mean to remove the 'clean' target? > Yep. Cleaning is done by the top-level Main.gmk makefile nowadays, > that's just some dead code. > >> >> hotspot/make/windows/makefiles/compile.make >> No changes in the frames view. >> Update: udiff view shows a blank line deleted at the end of the >> file. > > That's probably the result of some change going forth and then back > again during development. But then again, removing extra blank linkes > is not a bad thing. (jcheck unfortunately does not enforce any style > checks for make files :-( so they tend to detoriate over time.) > >> >> hotspot/src/share/vm/runtime/java.cpp >> L661: void JDK_Version::fully_initialize( >> L662: uint8_t major, uint8_t minor, uint8_t security, uint8_t >> update) { >> L663: // This is only called when current is less than 1.6 and >> we've gotten >> >> Since you're ripping out vestigial version support, I think this >> function can go away since this is version 9 and newer. Don't >> really >> know for sure, but based on that comment... > It probably can, yes. This and other core changes to the actual > .cpp/.java files will be addressed in a follow-up patch. >> >> hotspot/src/share/vm/runtime/java.hpp >> No comments. >> >> hotspot/src/share/vm/runtime/vmStructs.cpp >> L1240: please make the 'int' parameter align like the rest. > Are you okay with defering such a change to a follow-up patch? Yes. > It's likely the entire struct will need changes to be able to handle a > theoretically arbitrarily long version number. > >> >> hotspot/src/share/vm/runtime/vm_version.cpp >> L84: void Abstract_VM_Version::initialize() { >> L85: // FIXME: Initialization can probably be removed now. >> I agree, but that would entail also removing the >> _initialized and the uses of it... Follow on bug fix? > Definitely follow on. > >> jdk/src/java.base/share/classes/sun/misc/Version.java.template >> L149: * Returns the security version of the running JVM if >> it's 1.6 or newer >> This JavaDoc update is wrong, but it might not be important >> if sun.misc.Version class is going away. > I'm not sure if it's going to be replaced by, or just complemented by > java.util.Version, but in any case it will need a follow-up patch to > clean up this and other issues. >> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >> >> old L171: case "1.9": >> new L171: case "9": >> Should this logic support both versions? Will dropping >> "1.9" here prevent a pre-version changeset JVM from >> being dropped into a JDK for triage purposes? >> >> Granted we don't often triage 'javac' with different JVMs, >> but... > I'll defer that question to Kumar, who wrote that piece of code. My > guess is that when Hotspot express was dropped, the ability to use a > JVM from another JDK release bit rotteded away. > > /Magnus Dan From claes.redestad at oracle.com Tue Jun 9 13:26:27 2015 From: claes.redestad at oracle.com (Claes Redestad) Date: Tue, 09 Jun 2015 15:26:27 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5576E633.9050503@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> Message-ID: <5576E983.5020902@oracle.com> On 2015-06-09 15:12, Magnus Ihse Bursie wrote: >> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >> >> old L171: case "1.9": >> new L171: case "9": >> Should this logic support both versions? Will dropping >> "1.9" here prevent a pre-version changeset JVM from >> being dropped into a JDK for triage purposes? >> >> Granted we don't often triage 'javac' with different JVMs, >> but... > I'll defer that question to Kumar, who wrote that piece of code. My > guess is that when Hotspot express was dropped, the ability to use a > JVM from another JDK release bit rotteded away. > > /Magnus While we know there's no guarantee that swapping in an older VM will work, in the face of a regression in a promoted build we still routinely (automatically, even) swap out the VM with a recent VM to get a rough estimate of whether the regression was caused by a HotSpot or JDK/tools change, mostly since this currently saves us time in narrowing down the changes to bisect over/investigate. So, there's at least some value in not intentionally breaking build-to-build backwards compatibility, but we don't expect it to always work and wouldn't make much fuss about it breaking. If an extra case "1.9" is all it takes to make it work with last week's VM, however... /Claes From magnus.ihse.bursie at oracle.com Tue Jun 9 13:36:55 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 09 Jun 2015 15:36:55 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5576E983.5020902@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E983.5020902@oracle.com> Message-ID: <5576EBF7.40607@oracle.com> On 2015-06-09 15:26, Claes Redestad wrote: > On 2015-06-09 15:12, Magnus Ihse Bursie wrote: >>> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >>> >>> old L171: case "1.9": >>> new L171: case "9": >>> Should this logic support both versions? Will dropping >>> "1.9" here prevent a pre-version changeset JVM from >>> being dropped into a JDK for triage purposes? >>> >>> Granted we don't often triage 'javac' with different JVMs, >>> but... >> I'll defer that question to Kumar, who wrote that piece of code. My >> guess is that when Hotspot express was dropped, the ability to use a >> JVM from another JDK release bit rotteded away. >> >> /Magnus > > While we know there's no guarantee that swapping in an older VM will > work, in the face of a regression in a promoted build we still > routinely (automatically, even) swap out the VM with a recent VM to > get a rough estimate of whether the regression was caused by a HotSpot > or JDK/tools change, mostly since this currently saves us time in > narrowing down the changes to bisect over/investigate. So, there's at > least some value in not intentionally breaking build-to-build > backwards compatibility, but we don't expect it to always work and > wouldn't make much fuss about it breaking. If an extra case "1.9" is > all it takes to make it work with last week's VM, however... Actually, I think I messed up a bit there. I believe the real question here was not about mixing different versions of Hotspot and the JDK, but mixing different versions of javac and the JDK. I think. :) /Magnus From magnus.ihse.bursie at oracle.com Tue Jun 9 13:52:20 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Tue, 09 Jun 2015 15:52:20 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5576E81B.8050703@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> Message-ID: <5576EF94.3010500@oracle.com> Here's an updated webrev, which fixes the typos that were pointed out by reviewers: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ And here's a (much simpler) delta webrev which shows just these changes: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch-delta-01/webrev.01/ /Magnus On 2015-06-09 15:20, Daniel D. Daugherty wrote: > On 6/9/15 7:12 AM, Magnus Ihse Bursie wrote: >> Hi Daniel, >> >> Thank you for your thorough review! > > This was my (failing) attempt at a "fast pass" review... :-) > > >> >> On 2015-06-09 01:31, Daniel D. Daugherty wrote: >>> > >>> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >>> >>> >>> General comment: Not all copyright years were updated. >>> General comment: It looks like support for the 'patch' value is not >>> completely >>> implemented through all the Makefiles. I didn't audit for this, >>> but it's >>> just my impression. >> >> You are basically correct. The makefiles all propagate the patch >> value where needed, but the actual source code changes in hotspot and >> jdk ignores the patch field as of now. This will be corrected in a >> later add-on patch, submitted by someone from the jdk and/or hotspot >> team rather than the build team. >> >>> >>> common/autoconf/generated-configure.sh >>> There are multiple Copyright notices in this file. Why? >> Oh dear, you've reviewed the generated file. :-& I'm really impressed >> by your effort! > > Ahhh... now that you say it... it sounds familiar... I may have > made this same mistake before. I'll try to remember next time. > > >> However, the generated-configure.sh file is automatically created by >> the autoconf framework from the rest of the files in >> common/autoconf/*, so we cannot direcly modify it's contents - only >> indirectly. The reason it's checked in, is that otherwise every user >> would need to generate it before being able to run configure. In >> build reviews, we usually either revert changes to >> generated-configure.sh before posting a review to hide it (and >> re-generate it before pushing), or we just ignore it during reviews. >> I should have done that, or pointed out that it was not needed nor >> possible to review when I cross-posted. I'm sorry. >> >>> >>> L4076: # Verify that a given string represent a valid version >>> number, and assing it to >>> L4077: # a variable. >>> Fixed two typos and reformat a bit: >>> # Verify that a given string represents a valid version >>> number, and >>> # assigning it to a variable. >> I'll put that fix in the source .m4 file instead. Thanks. >>> >>> L20262: as_fn_error $? "--with--version-string must have a >>> value" "$LINENO" 5 >>> The '--with--version...' part doesn't match previous usages >>> where >>> '--with-version...' is used >> Yes, you're right. Erik pointed it out as well. It's a typo in the >> error message. It's all over the place due to copied code. I'll fix >> it in the source .m4 file. >> >> (As a side note, I have a half-finished follow-up patch that will >> reduce the amount of code duplication, but it requires some framework >> changes so it'll have to be a separate thing.) >> >>> >>> L20275: # Unspecified numerical fields is interpreted as 0. >>> Grammar: 'is interpreted' -> 'are interpreted' >>> >>> L20286: as_fn_error $? "Version string contains + but >>> both 'BUILD' and 'OPT' is missing" "$LINENO" 5 >>> Grammar: 'is missing' -> 'are missing' >> Those darn English plural forms! Why can't you all do as we sensible >> Swedes and get rid of them? ;-) >> >> (I'll fix) >> >>> >>> L20388: username=`$ECHO "$USER" | $TR -d -c >>> '[a-z][A-Z][0-9]'` >>> This assumes that the "USER" variable is set. Should there >>> be a check for "" and perhaps use "no_user_specified" or >>> something like that? Perhaps the build setup always makes >>> sure that "USER" is set to something. Don't know. >> Hm. I think the worst thing that'll happen is that the username part >> of the opt string gets empty. This part is basically copied right off >> the old build, where we have relied on the $USER variable being >> present for all the time with no problems, so I think it's quite safe >> to assume. >>> >>> common/autoconf/jdk-options.m4 >>> Don't know why the 'elliptic curve crypto implementation' support >>> is relocated as part of this changeset, but ... >> It was incorrectly placed not at the top indentation level, but in >> the middle of the function definition where the old versioning code >> were handled. (Which, mostly by chance, happens to work in autoconf, >> but is really bad style). >> >>> make/Javadoc.gmk >>> Did you mean to remove the 'clean' target? >> Yep. Cleaning is done by the top-level Main.gmk makefile nowadays, >> that's just some dead code. >> >>> >>> hotspot/make/windows/makefiles/compile.make >>> No changes in the frames view. >>> Update: udiff view shows a blank line deleted at the end of the >>> file. >> >> That's probably the result of some change going forth and then back >> again during development. But then again, removing extra blank linkes >> is not a bad thing. (jcheck unfortunately does not enforce any style >> checks for make files :-( so they tend to detoriate over time.) >> >>> >>> hotspot/src/share/vm/runtime/java.cpp >>> L661: void JDK_Version::fully_initialize( >>> L662: uint8_t major, uint8_t minor, uint8_t security, >>> uint8_t update) { >>> L663: // This is only called when current is less than 1.6 and >>> we've gotten >>> >>> Since you're ripping out vestigial version support, I think >>> this >>> function can go away since this is version 9 and newer. >>> Don't really >>> know for sure, but based on that comment... >> It probably can, yes. This and other core changes to the actual >> .cpp/.java files will be addressed in a follow-up patch. >>> >>> hotspot/src/share/vm/runtime/java.hpp >>> No comments. >>> >>> hotspot/src/share/vm/runtime/vmStructs.cpp >>> L1240: please make the 'int' parameter align like the rest. >> Are you okay with defering such a change to a follow-up patch? > > Yes. > > >> It's likely the entire struct will need changes to be able to handle >> a theoretically arbitrarily long version number. >> >>> >>> hotspot/src/share/vm/runtime/vm_version.cpp >>> L84: void Abstract_VM_Version::initialize() { >>> L85: // FIXME: Initialization can probably be removed now. >>> I agree, but that would entail also removing the >>> _initialized and the uses of it... Follow on bug fix? >> Definitely follow on. >> >>> jdk/src/java.base/share/classes/sun/misc/Version.java.template >>> L149: * Returns the security version of the running JVM if >>> it's 1.6 or newer >>> This JavaDoc update is wrong, but it might not be important >>> if sun.misc.Version class is going away. >> I'm not sure if it's going to be replaced by, or just complemented by >> java.util.Version, but in any case it will need a follow-up patch to >> clean up this and other issues. >>> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >>> >>> old L171: case "1.9": >>> new L171: case "9": >>> Should this logic support both versions? Will dropping >>> "1.9" here prevent a pre-version changeset JVM from >>> being dropped into a JDK for triage purposes? >>> >>> Granted we don't often triage 'javac' with different JVMs, >>> but... >> I'll defer that question to Kumar, who wrote that piece of code. My >> guess is that when Hotspot express was dropped, the ability to use a >> JVM from another JDK release bit rotteded away. >> >> /Magnus > > Dan From kumar.x.srinivasan at oracle.com Tue Jun 9 14:25:45 2015 From: kumar.x.srinivasan at oracle.com (Kumar Srinivasan) Date: Tue, 09 Jun 2015 07:25:45 -0700 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <55767256.3030802@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <55767256.3030802@oracle.com> Message-ID: <5576F769.3060002@oracle.com> On 6/8/2015 9:57 PM, Jan Lahoda wrote: > On 9.6.2015 01:31, Daniel D. Daugherty wrote: >> > >> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >> >> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >> >> >> old L171: case "1.9": >> new L171: case "9": >> Should this logic support both versions? Will dropping >> "1.9" here prevent a pre-version changeset JVM from >> being dropped into a JDK for triage purposes? >> >> Granted we don't often triage 'javac' with different JVMs, >> but... >> > > +1 on keeping both "1.9" and "9" here. javac can be used independently > on the rest of JDK to some extent, so support for running it on older > builds of JDK 9 seems reasonable to me. (I wonder if current JDK 9 > javac should be prepared for the new version scheme in advance.) Yes, I think for the most part langtools seems to be working in the sandbox repo, with these changes, the remaining work is to align the version and fullversion of langtools/test to be compliant to the JDK version. Kumar > > Jan From erik.joelsson at oracle.com Wed Jun 10 07:18:03 2015 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Wed, 10 Jun 2015 09:18:03 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5576EF94.3010500@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> <5576EF94.3010500@oracle.com> Message-ID: <5577E4AB.4090305@oracle.com> Looks good. /Erik On 2015-06-09 15:52, Magnus Ihse Bursie wrote: > Here's an updated webrev, which fixes the typos that were pointed out > by reviewers: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ > > > And here's a (much simpler) delta webrev which shows just these changes: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch-delta-01/webrev.01/ > > > /Magnus > > On 2015-06-09 15:20, Daniel D. Daugherty wrote: >> On 6/9/15 7:12 AM, Magnus Ihse Bursie wrote: >>> Hi Daniel, >>> >>> Thank you for your thorough review! >> >> This was my (failing) attempt at a "fast pass" review... :-) >> >> >>> >>> On 2015-06-09 01:31, Daniel D. Daugherty wrote: >>>> > >>>> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >>>> >>>> >>>> General comment: Not all copyright years were updated. >>>> General comment: It looks like support for the 'patch' value is not >>>> completely >>>> implemented through all the Makefiles. I didn't audit for this, >>>> but it's >>>> just my impression. >>> >>> You are basically correct. The makefiles all propagate the patch >>> value where needed, but the actual source code changes in hotspot >>> and jdk ignores the patch field as of now. This will be corrected in >>> a later add-on patch, submitted by someone from the jdk and/or >>> hotspot team rather than the build team. >>> >>>> >>>> common/autoconf/generated-configure.sh >>>> There are multiple Copyright notices in this file. Why? >>> Oh dear, you've reviewed the generated file. :-& I'm really >>> impressed by your effort! >> >> Ahhh... now that you say it... it sounds familiar... I may have >> made this same mistake before. I'll try to remember next time. >> >> >>> However, the generated-configure.sh file is automatically created by >>> the autoconf framework from the rest of the files in >>> common/autoconf/*, so we cannot direcly modify it's contents - only >>> indirectly. The reason it's checked in, is that otherwise every user >>> would need to generate it before being able to run configure. In >>> build reviews, we usually either revert changes to >>> generated-configure.sh before posting a review to hide it (and >>> re-generate it before pushing), or we just ignore it during reviews. >>> I should have done that, or pointed out that it was not needed nor >>> possible to review when I cross-posted. I'm sorry. >>> >>>> >>>> L4076: # Verify that a given string represent a valid version >>>> number, and assing it to >>>> L4077: # a variable. >>>> Fixed two typos and reformat a bit: >>>> # Verify that a given string represents a valid version >>>> number, and >>>> # assigning it to a variable. >>> I'll put that fix in the source .m4 file instead. Thanks. >>>> >>>> L20262: as_fn_error $? "--with--version-string must have a >>>> value" "$LINENO" 5 >>>> The '--with--version...' part doesn't match previous usages >>>> where >>>> '--with-version...' is used >>> Yes, you're right. Erik pointed it out as well. It's a typo in the >>> error message. It's all over the place due to copied code. I'll fix >>> it in the source .m4 file. >>> >>> (As a side note, I have a half-finished follow-up patch that will >>> reduce the amount of code duplication, but it requires some >>> framework changes so it'll have to be a separate thing.) >>> >>>> >>>> L20275: # Unspecified numerical fields is interpreted as 0. >>>> Grammar: 'is interpreted' -> 'are interpreted' >>>> >>>> L20286: as_fn_error $? "Version string contains + but >>>> both 'BUILD' and 'OPT' is missing" "$LINENO" 5 >>>> Grammar: 'is missing' -> 'are missing' >>> Those darn English plural forms! Why can't you all do as we sensible >>> Swedes and get rid of them? ;-) >>> >>> (I'll fix) >>> >>>> >>>> L20388: username=`$ECHO "$USER" | $TR -d -c >>>> '[a-z][A-Z][0-9]'` >>>> This assumes that the "USER" variable is set. Should there >>>> be a check for "" and perhaps use "no_user_specified" or >>>> something like that? Perhaps the build setup always makes >>>> sure that "USER" is set to something. Don't know. >>> Hm. I think the worst thing that'll happen is that the username part >>> of the opt string gets empty. This part is basically copied right >>> off the old build, where we have relied on the $USER variable being >>> present for all the time with no problems, so I think it's quite >>> safe to assume. >>>> >>>> common/autoconf/jdk-options.m4 >>>> Don't know why the 'elliptic curve crypto implementation' support >>>> is relocated as part of this changeset, but ... >>> It was incorrectly placed not at the top indentation level, but in >>> the middle of the function definition where the old versioning code >>> were handled. (Which, mostly by chance, happens to work in autoconf, >>> but is really bad style). >>> >>>> make/Javadoc.gmk >>>> Did you mean to remove the 'clean' target? >>> Yep. Cleaning is done by the top-level Main.gmk makefile nowadays, >>> that's just some dead code. >>> >>>> >>>> hotspot/make/windows/makefiles/compile.make >>>> No changes in the frames view. >>>> Update: udiff view shows a blank line deleted at the end of the >>>> file. >>> >>> That's probably the result of some change going forth and then back >>> again during development. But then again, removing extra blank >>> linkes is not a bad thing. (jcheck unfortunately does not enforce >>> any style checks for make files :-( so they tend to detoriate over >>> time.) >>> >>>> >>>> hotspot/src/share/vm/runtime/java.cpp >>>> L661: void JDK_Version::fully_initialize( >>>> L662: uint8_t major, uint8_t minor, uint8_t security, >>>> uint8_t update) { >>>> L663: // This is only called when current is less than 1.6 >>>> and we've gotten >>>> >>>> Since you're ripping out vestigial version support, I think >>>> this >>>> function can go away since this is version 9 and newer. >>>> Don't really >>>> know for sure, but based on that comment... >>> It probably can, yes. This and other core changes to the actual >>> .cpp/.java files will be addressed in a follow-up patch. >>>> >>>> hotspot/src/share/vm/runtime/java.hpp >>>> No comments. >>>> >>>> hotspot/src/share/vm/runtime/vmStructs.cpp >>>> L1240: please make the 'int' parameter align like the rest. >>> Are you okay with defering such a change to a follow-up patch? >> >> Yes. >> >> >>> It's likely the entire struct will need changes to be able to handle >>> a theoretically arbitrarily long version number. >>> >>>> >>>> hotspot/src/share/vm/runtime/vm_version.cpp >>>> L84: void Abstract_VM_Version::initialize() { >>>> L85: // FIXME: Initialization can probably be removed now. >>>> I agree, but that would entail also removing the >>>> _initialized and the uses of it... Follow on bug fix? >>> Definitely follow on. >>> >>>> jdk/src/java.base/share/classes/sun/misc/Version.java.template >>>> L149: * Returns the security version of the running JVM if >>>> it's 1.6 or newer >>>> This JavaDoc update is wrong, but it might not be important >>>> if sun.misc.Version class is going away. >>> I'm not sure if it's going to be replaced by, or just complemented >>> by java.util.Version, but in any case it will need a follow-up patch >>> to clean up this and other issues. >>>> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >>>> >>>> old L171: case "1.9": >>>> new L171: case "9": >>>> Should this logic support both versions? Will dropping >>>> "1.9" here prevent a pre-version changeset JVM from >>>> being dropped into a JDK for triage purposes? >>>> >>>> Granted we don't often triage 'javac' with different JVMs, >>>> but... >>> I'll defer that question to Kumar, who wrote that piece of code. My >>> guess is that when Hotspot express was dropped, the ability to use a >>> JVM from another JDK release bit rotteded away. >>> >>> /Magnus >> >> Dan > From david.holmes at oracle.com Wed Jun 10 09:58:11 2015 From: david.holmes at oracle.com (David Holmes) Date: Wed, 10 Jun 2015 19:58:11 +1000 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <5576EF94.3010500@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> <5576EF94.3010500@oracle.com> Message-ID: <55780A33.1010302@oracle.com> Hi Magnus, Generally looks good - a few comments/queries below. On 9/06/2015 11:52 PM, Magnus Ihse Bursie wrote: > Here's an updated webrev, which fixes the typos that were pointed out by > reviewers: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ common/autoconf/version-numbers Shouldn't there be a DEFAULT_VERSION_XXX for each of the XXX parts of the version info? (Even if all zeroes presently.) --- Looking at hotspot changes I can't convince myself that the new streamlined "version" variables will capture things like "fastdebug". Will that filter through via configure variables? --- make/*/makefiles/vm.make Shouldn't the -DVERSION_XX=$(VERSION_XX) definitions be taken from the VERSION_CFLAGS in spec.gmk? (Or are you still allowing for a stand-alone hotspot build?) --- hotspot/src/share/vm/prims/jvm.h jdk/src/java.base/share/native/include/jvm.h I think this comment is way out of date: /* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER is set to bNN) * It will be zero for internal builds. */ and can be completely removed. Even if still true, mention of an "RE build" has no place in OpenJDK sources. --- hotspot/src/share/vm/runtime/java.cpp I think a lot of the modified code is obsolete post Hotspot Express - which makes it hard to determine if the changes make sense. --- hotspot/src/share/vm/runtime/vmStructs.cpp Please fix the alignment (3 extra spaces on modified line): 1239 static_field(Abstract_VM_Version, _vm_minor_version, int) \ 1240 static_field(Abstract_VM_Version, _vm_security_version, int) \ --- hotspot/test/runtime/6981737/Test6981737.java This test is really only valid for the new version scheme now, so it should probably be rewritten - and in that case it really isn't testing 6981737 but should be replaced by a new test for the new version format. --- jdk/src/java.base/share/classes/sun/misc/Version.java.template This comment is nonsensical: /** ! * Returns the security version of the running JVM if it's 1.6 or newer * or any RE VM build. It will return 0 if it's an internal 1.5 or * 1.4.x build. * @since 1.6 */ as security version does not exist pre 9. Normally you should be adding a new method and deprecating the old one. The new one is @since 9. /** ! * Returns the security version of the running JDK. * @since 1.6 */ Ditto: @since 9 (but again old should be deprecated and new method added) 253 /** 254 * Returns the build number of the running JDK if it's a RE build 255 * It will return 0 if it's an internal build. As with jvm.h this seems obsolete commentary these days - not only RE builds define a build number. Thanks, David > > And here's a (much simpler) delta webrev which shows just these changes: > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch-delta-01/webrev.01/ > > > /Magnus > > On 2015-06-09 15:20, Daniel D. Daugherty wrote: >> On 6/9/15 7:12 AM, Magnus Ihse Bursie wrote: >>> Hi Daniel, >>> >>> Thank you for your thorough review! >> >> This was my (failing) attempt at a "fast pass" review... :-) >> >> >>> >>> On 2015-06-09 01:31, Daniel D. Daugherty wrote: >>>> > >>>> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >>>> >>>> >>>> General comment: Not all copyright years were updated. >>>> General comment: It looks like support for the 'patch' value is not >>>> completely >>>> implemented through all the Makefiles. I didn't audit for this, >>>> but it's >>>> just my impression. >>> >>> You are basically correct. The makefiles all propagate the patch >>> value where needed, but the actual source code changes in hotspot and >>> jdk ignores the patch field as of now. This will be corrected in a >>> later add-on patch, submitted by someone from the jdk and/or hotspot >>> team rather than the build team. >>> >>>> >>>> common/autoconf/generated-configure.sh >>>> There are multiple Copyright notices in this file. Why? >>> Oh dear, you've reviewed the generated file. :-& I'm really impressed >>> by your effort! >> >> Ahhh... now that you say it... it sounds familiar... I may have >> made this same mistake before. I'll try to remember next time. >> >> >>> However, the generated-configure.sh file is automatically created by >>> the autoconf framework from the rest of the files in >>> common/autoconf/*, so we cannot direcly modify it's contents - only >>> indirectly. The reason it's checked in, is that otherwise every user >>> would need to generate it before being able to run configure. In >>> build reviews, we usually either revert changes to >>> generated-configure.sh before posting a review to hide it (and >>> re-generate it before pushing), or we just ignore it during reviews. >>> I should have done that, or pointed out that it was not needed nor >>> possible to review when I cross-posted. I'm sorry. >>> >>>> >>>> L4076: # Verify that a given string represent a valid version >>>> number, and assing it to >>>> L4077: # a variable. >>>> Fixed two typos and reformat a bit: >>>> # Verify that a given string represents a valid version >>>> number, and >>>> # assigning it to a variable. >>> I'll put that fix in the source .m4 file instead. Thanks. >>>> >>>> L20262: as_fn_error $? "--with--version-string must have a >>>> value" "$LINENO" 5 >>>> The '--with--version...' part doesn't match previous usages >>>> where >>>> '--with-version...' is used >>> Yes, you're right. Erik pointed it out as well. It's a typo in the >>> error message. It's all over the place due to copied code. I'll fix >>> it in the source .m4 file. >>> >>> (As a side note, I have a half-finished follow-up patch that will >>> reduce the amount of code duplication, but it requires some framework >>> changes so it'll have to be a separate thing.) >>> >>>> >>>> L20275: # Unspecified numerical fields is interpreted as 0. >>>> Grammar: 'is interpreted' -> 'are interpreted' >>>> >>>> L20286: as_fn_error $? "Version string contains + but >>>> both 'BUILD' and 'OPT' is missing" "$LINENO" 5 >>>> Grammar: 'is missing' -> 'are missing' >>> Those darn English plural forms! Why can't you all do as we sensible >>> Swedes and get rid of them? ;-) >>> >>> (I'll fix) >>> >>>> >>>> L20388: username=`$ECHO "$USER" | $TR -d -c >>>> '[a-z][A-Z][0-9]'` >>>> This assumes that the "USER" variable is set. Should there >>>> be a check for "" and perhaps use "no_user_specified" or >>>> something like that? Perhaps the build setup always makes >>>> sure that "USER" is set to something. Don't know. >>> Hm. I think the worst thing that'll happen is that the username part >>> of the opt string gets empty. This part is basically copied right off >>> the old build, where we have relied on the $USER variable being >>> present for all the time with no problems, so I think it's quite safe >>> to assume. >>>> >>>> common/autoconf/jdk-options.m4 >>>> Don't know why the 'elliptic curve crypto implementation' support >>>> is relocated as part of this changeset, but ... >>> It was incorrectly placed not at the top indentation level, but in >>> the middle of the function definition where the old versioning code >>> were handled. (Which, mostly by chance, happens to work in autoconf, >>> but is really bad style). >>> >>>> make/Javadoc.gmk >>>> Did you mean to remove the 'clean' target? >>> Yep. Cleaning is done by the top-level Main.gmk makefile nowadays, >>> that's just some dead code. >>> >>>> >>>> hotspot/make/windows/makefiles/compile.make >>>> No changes in the frames view. >>>> Update: udiff view shows a blank line deleted at the end of the >>>> file. >>> >>> That's probably the result of some change going forth and then back >>> again during development. But then again, removing extra blank linkes >>> is not a bad thing. (jcheck unfortunately does not enforce any style >>> checks for make files :-( so they tend to detoriate over time.) >>> >>>> >>>> hotspot/src/share/vm/runtime/java.cpp >>>> L661: void JDK_Version::fully_initialize( >>>> L662: uint8_t major, uint8_t minor, uint8_t security, >>>> uint8_t update) { >>>> L663: // This is only called when current is less than 1.6 and >>>> we've gotten >>>> >>>> Since you're ripping out vestigial version support, I think >>>> this >>>> function can go away since this is version 9 and newer. >>>> Don't really >>>> know for sure, but based on that comment... >>> It probably can, yes. This and other core changes to the actual >>> .cpp/.java files will be addressed in a follow-up patch. >>>> >>>> hotspot/src/share/vm/runtime/java.hpp >>>> No comments. >>>> >>>> hotspot/src/share/vm/runtime/vmStructs.cpp >>>> L1240: please make the 'int' parameter align like the rest. >>> Are you okay with defering such a change to a follow-up patch? >> >> Yes. >> >> >>> It's likely the entire struct will need changes to be able to handle >>> a theoretically arbitrarily long version number. >>> >>>> >>>> hotspot/src/share/vm/runtime/vm_version.cpp >>>> L84: void Abstract_VM_Version::initialize() { >>>> L85: // FIXME: Initialization can probably be removed now. >>>> I agree, but that would entail also removing the >>>> _initialized and the uses of it... Follow on bug fix? >>> Definitely follow on. >>> >>>> jdk/src/java.base/share/classes/sun/misc/Version.java.template >>>> L149: * Returns the security version of the running JVM if >>>> it's 1.6 or newer >>>> This JavaDoc update is wrong, but it might not be important >>>> if sun.misc.Version class is going away. >>> I'm not sure if it's going to be replaced by, or just complemented by >>> java.util.Version, but in any case it will need a follow-up patch to >>> clean up this and other issues. >>>> langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java >>>> >>>> old L171: case "1.9": >>>> new L171: case "9": >>>> Should this logic support both versions? Will dropping >>>> "1.9" here prevent a pre-version changeset JVM from >>>> being dropped into a JDK for triage purposes? >>>> >>>> Granted we don't often triage 'javac' with different JVMs, >>>> but... >>> I'll defer that question to Kumar, who wrote that piece of code. My >>> guess is that when Hotspot express was dropped, the ability to use a >>> JVM from another JDK release bit rotteded away. >>> >>> /Magnus >> >> Dan > From magnus.ihse.bursie at oracle.com Wed Jun 10 12:13:16 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Wed, 10 Jun 2015 14:13:16 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <55780A33.1010302@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> <5576EF94.3010500@oracle.com> <55780A33.1010302@oracle.com> Message-ID: <557829DC.8000405@oracle.com> On 2015-06-10 11:58, David Holmes wrote: > Hi Magnus, > > Generally looks good - a few comments/queries below. In general, I believe most issues you found are valid. :-) However, as I said before in this thread, I'd like to see them resolved in the needed follow-up patches. The source code changes in Hotspot and JDK are inadequate to fully implement JEP-223, so these areas will need to be rewritten anyhow. Are you okay with resolving these issues later? > > On 9/06/2015 11:52 PM, Magnus Ihse Bursie wrote: >> Here's an updated webrev, which fixes the typos that were pointed out by >> reviewers: >> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ >> > > common/autoconf/version-numbers > > Shouldn't there be a DEFAULT_VERSION_XXX for each of the XXX parts of > the version info? (Even if all zeroes presently.) So that's a tricky one. :-& The question here is, I think, does it make sense to update version-numbers when we do a security (9.0.1) or minor (9.1.0) release? Looking historically, the version-numbers file have not been changed for the 8u family. The only change was going from 8 to 9 when creating the new jdk9 forest. That was what I based my decition to only have the major number in the file. (The rest of the version string is set by configure flags when building, in Oracle case by the RE team.) If it makes sense to put the minor/security/patch numbers here, I won't oppose it, but I guess we have until the first such release to figure out what's best, and that likely includes discussion with RE and possibly other consumers in the community (RedHat etc). > > --- > > Looking at hotspot changes I can't convince myself that the new > streamlined "version" variables will capture things like "fastdebug". > Will that filter through via configure variables? The "fastdebug" label has been handled as a less valued token in the JEP-223 process. Right now there's no mention of it at all in the version string proposal in the JEP. As I understand it, Iris is about to propose an amendment which will just make fastdebug be a part of the OPT string. I'm not entirely happy with that myself, but that's the way it's decided. So wherever you can see the OPT string, you'll see the debug level tag. Currently, however, that's not how it is implemented in this patch. Since no decision was made on this (and it's still not formally decided), I had to pick a route to go forward. The current patch will instead put the "fastdebug" label as part of the PRE string (that's the reason for the pre-base and pre-debuglevel arguments to configure). If the planned changes goes into the JEP, this'll change to make the debuglevel tag a part of the OPT string instead. > --- > > make/*/makefiles/vm.make > > Shouldn't the -DVERSION_XX=$(VERSION_XX) definitions be taken from the > VERSION_CFLAGS in spec.gmk? (Or are you still allowing for a > stand-alone hotspot build?) The hotspot JEP-223 work initially made by Alejandro kept support for stand-alone hotspot builds. I made additional changes on top of that, which still tried to cater for stand-alone builds. At this very moment I'm not sure if stand-alone hotspot builds are supposed to work or not, but I've tried to not change the situation with this patch. There are two future changes coming down the pipe: One is the additional JEP-223 work needed for Hotspot. I know Alejandro had plans for redesigning the API between Hotspot and the JDK, so no JDK version strings should be compiled into the JVM, but all of it extracted during an API in runtime. That would make most (all?) of the makefile changes in hotspot irrelevant. However, that implementation is not even started, so it's needed for the time being. The second change is the build-infra hotspot makefile rewrite. When that happens, stand-alone builds will definitely disappear, and if Hotspot still needs make support for version strings, then the logical choice is to use VERSION_CFLAGS. Ok? > > --- > > hotspot/src/share/vm/prims/jvm.h > jdk/src/java.base/share/native/include/jvm.h > > I think this comment is way out of date: > > /* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER > is set to bNN) > * It will be zero for internal builds. > */ > > and can be completely removed. Even if still true, mention of an "RE > build" has no place in OpenJDK sources. Yep, agree. Follow-up patch, right? > > --- > > hotspot/src/share/vm/runtime/java.cpp > > I think a lot of the modified code is obsolete post Hotspot Express - > which makes it hard to determine if the changes make sense. Yep, agree. Follow-up patch, right? > > --- > > hotspot/src/share/vm/runtime/vmStructs.cpp > > Please fix the alignment (3 extra spaces on modified line): > > 1239 static_field(Abstract_VM_Version, _vm_minor_version, > int) \ > 1240 static_field(Abstract_VM_Version, > _vm_security_version, int) \ I was about to say "follow-up patch", but ugly indentation really sucks so I can fix this. Ok if I skip redoing the review for that? > > --- > > hotspot/test/runtime/6981737/Test6981737.java > > This test is really only valid for the new version scheme now, so it > should probably be rewritten - and in that case it really isn't > testing 6981737 but should be replaced by a new test for the new > version format. Yep, agree. Follow-up patch, right? > > --- > > jdk/src/java.base/share/classes/sun/misc/Version.java.template > > This comment is nonsensical: > > /** > ! * Returns the security version of the running JVM if it's 1.6 > or newer > * or any RE VM build. It will return 0 if it's an internal 1.5 or > * 1.4.x build. > * @since 1.6 > */ > > as security version does not exist pre 9. Normally you should be > adding a new method and deprecating the old one. The new one is @since 9. Yep, agree. Follow-up patch, right? > > /** > ! * Returns the security version of the running JDK. > * @since 1.6 > */ > > Ditto: @since 9 (but again old should be deprecated and new method added) > > 253 /** > 254 * Returns the build number of the running JDK if it's a RE > build > 255 * It will return 0 if it's an internal build. > > As with jvm.h this seems obsolete commentary these days - not only RE > builds define a build number. Yep, agree. Follow-up patch, right? /Magnus > > Thanks, > David From magnus.ihse.bursie at oracle.com Wed Jun 10 13:44:41 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Wed, 10 Jun 2015 15:44:41 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <557625C8.5050200@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> Message-ID: <55783F49.6030906@oracle.com> On 2015-06-09 01:31, Daniel D. Daugherty wrote: > > > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 > > > General comment: Not all copyright years were updated. I realize I missed that part of the review. :-( I have now updated the copyright years. Here's a delta review: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch-delta-02/webrev.01/ Here's the complete review once again: http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.03 Hopefully this is now the final version to be pushed to verona, and that any additional problems can be resolved with follow-up patches. /Magnus From alejandro.murillo at oracle.com Wed Jun 10 17:21:59 2015 From: alejandro.murillo at oracle.com (Alejandro E Murillo) Date: Wed, 10 Jun 2015 11:21:59 -0600 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <557829DC.8000405@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> <5576EF94.3010500@oracle.com> <55780A33.1010302@oracle.com> <557829DC.8000405@oracle.com> Message-ID: <55787237.20802@oracle.com> On 6/10/2015 6:13 AM, Magnus Ihse Bursie wrote: > On 2015-06-10 11:58, David Holmes wrote: >> Hi Magnus, >> >> Generally looks good - a few comments/queries below. > > In general, I believe most issues you found are valid. :-) However, as > I said before in this thread, I'd like to see them resolved in the > needed follow-up patches. The source code changes in Hotspot and JDK > are inadequate to fully implement JEP-223, so these areas will need to > be rewritten anyhow. Are you okay with resolving these issues later? > >> >> On 9/06/2015 11:52 PM, Magnus Ihse Bursie wrote: >>> Here's an updated webrev, which fixes the typos that were pointed >>> out by >>> reviewers: >>> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ >>> >> >> common/autoconf/version-numbers >> >> Shouldn't there be a DEFAULT_VERSION_XXX for each of the XXX parts of >> the version info? (Even if all zeroes presently.) > So that's a tricky one. :-& The question here is, I think, does it > make sense to update version-numbers when we do a security (9.0.1) or > minor (9.1.0) release? Looking historically, the version-numbers file > have not been changed for the 8u family. The only change was going > from 8 to 9 when creating the new jdk9 forest. That was what I based > my decition to only have the major number in the file. (The rest of > the version string is set by configure flags when building, in Oracle > case by the RE team.) > > If it makes sense to put the minor/security/patch numbers here, I > won't oppose it, but I guess we have until the first such release to > figure out what's best, and that likely includes discussion with RE > and possibly other consumers in the community (RedHat etc). > >> >> --- >> >> Looking at hotspot changes I can't convince myself that the new >> streamlined "version" variables will capture things like "fastdebug". >> Will that filter through via configure variables? > > The "fastdebug" label has been handled as a less valued token in the > JEP-223 process. Right now there's no mention of it at all in the > version string proposal in the JEP. As I understand it, Iris is about > to propose an amendment which will just make fastdebug be a part of > the OPT string. I'm not entirely happy with that myself, but that's > the way it's decided. So wherever you can see the OPT string, you'll > see the debug level tag. > > Currently, however, that's not how it is implemented in this patch. > Since no decision was made on this (and it's still not formally > decided), I had to pick a route to go forward. The current patch will > instead put the "fastdebug" label as part of the PRE string (that's > the reason for the pre-base and pre-debuglevel arguments to > configure). If the planned changes goes into the JEP, this'll change > to make the debuglevel tag a part of the OPT string instead. > >> --- >> >> make/*/makefiles/vm.make >> >> Shouldn't the -DVERSION_XX=$(VERSION_XX) definitions be taken from >> the VERSION_CFLAGS in spec.gmk? (Or are you still allowing for a >> stand-alone hotspot build?) > The hotspot JEP-223 work initially made by Alejandro kept support for > stand-alone hotspot builds. I made additional changes on top of that, > which still tried to cater for stand-alone builds. At this very moment > I'm not sure if stand-alone hotspot builds are supposed to work or > not, but I've tried to not change the situation with this patch. > > There are two future changes coming down the pipe: One is the > additional JEP-223 work needed for Hotspot. I know Alejandro had plans > for redesigning the API between Hotspot and the JDK, so no JDK version > strings should be compiled into the JVM, but all of it extracted > during an API in runtime. That would make most (all?) of the makefile > changes in hotspot irrelevant. However, that implementation is not > even started, so it's needed for the time being. There's already an API used by Hotspot to get JDK version values. I'm investigating using that and extend it if required. yes, there is a lot stuff in the hotspot code that should be removed (mostly in the makefiles) and I'm not against making those changes now, I just think they are somewhat out of the scope of this project. And should be done as individual RFEs or as part of the upcoming hotspot makefile refactoring. Alejandro > > The second change is the build-infra hotspot makefile rewrite. When > that happens, stand-alone builds will definitely disappear, and if > Hotspot still needs make support for version strings, then the logical > choice is to use VERSION_CFLAGS. > > Ok? > >> >> --- >> >> hotspot/src/share/vm/prims/jvm.h >> jdk/src/java.base/share/native/include/jvm.h >> >> I think this comment is way out of date: >> >> /* Build number is available only for RE build (i.e. >> JDK_BUILD_NUMBER is set to bNN) >> * It will be zero for internal builds. >> */ >> >> and can be completely removed. Even if still true, mention of an "RE >> build" has no place in OpenJDK sources. > Yep, agree. Follow-up patch, right? > >> >> --- >> >> hotspot/src/share/vm/runtime/java.cpp >> >> I think a lot of the modified code is obsolete post Hotspot Express - >> which makes it hard to determine if the changes make sense. > Yep, agree. Follow-up patch, right? >> >> --- >> >> hotspot/src/share/vm/runtime/vmStructs.cpp >> >> Please fix the alignment (3 extra spaces on modified line): >> >> 1239 static_field(Abstract_VM_Version, _vm_minor_version, >> int) \ >> 1240 static_field(Abstract_VM_Version, _vm_security_version, >> int) \ > > I was about to say "follow-up patch", but ugly indentation really > sucks so I can fix this. Ok if I skip redoing the review for that? > >> >> --- >> >> hotspot/test/runtime/6981737/Test6981737.java >> >> This test is really only valid for the new version scheme now, so it >> should probably be rewritten - and in that case it really isn't >> testing 6981737 but should be replaced by a new test for the new >> version format. > Yep, agree. Follow-up patch, right? >> >> --- >> >> jdk/src/java.base/share/classes/sun/misc/Version.java.template >> >> This comment is nonsensical: >> >> /** >> ! * Returns the security version of the running JVM if it's 1.6 >> or newer >> * or any RE VM build. It will return 0 if it's an internal 1.5 or >> * 1.4.x build. >> * @since 1.6 >> */ >> >> as security version does not exist pre 9. Normally you should be >> adding a new method and deprecating the old one. The new one is >> @since 9. > Yep, agree. Follow-up patch, right? >> >> /** >> ! * Returns the security version of the running JDK. >> * @since 1.6 >> */ >> >> Ditto: @since 9 (but again old should be deprecated and new method >> added) >> >> 253 /** >> 254 * Returns the build number of the running JDK if it's a RE >> build >> 255 * It will return 0 if it's an internal build. >> >> As with jvm.h this seems obsolete commentary these days - not only RE >> builds define a build number. > Yep, agree. Follow-up patch, right? > > /Magnus > >> >> Thanks, >> David > -- Alejandro From david.holmes at oracle.com Thu Jun 11 04:52:53 2015 From: david.holmes at oracle.com (David Holmes) Date: Thu, 11 Jun 2015 14:52:53 +1000 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <557829DC.8000405@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> <5576EF94.3010500@oracle.com> <55780A33.1010302@oracle.com> <557829DC.8000405@oracle.com> Message-ID: <55791425.8070709@oracle.com> Hi Magnus, On 10/06/2015 10:13 PM, Magnus Ihse Bursie wrote: > On 2015-06-10 11:58, David Holmes wrote: >> Hi Magnus, >> >> Generally looks good - a few comments/queries below. > > In general, I believe most issues you found are valid. :-) However, as I > said before in this thread, I'd like to see them resolved in the needed > follow-up patches. The source code changes in Hotspot and JDK are > inadequate to fully implement JEP-223, so these areas will need to be > rewritten anyhow. Are you okay with resolving these issues later? Given this is going to a staging repo I'm okay with deferring things - I just have a concern whether such things may be overlooked given that the integration with the staging repo will not be undergoing a final review. I would prefer to see the Version.java.template doc comments corrected, even if the issue of whether to add and deprecate is deferred, but again as this is to a staging area I can let it slide for now. I saw the fix to hotspot/src/share/vm/runtime/vmStructs.cpp. Thanks, David >> >> On 9/06/2015 11:52 PM, Magnus Ihse Bursie wrote: >>> Here's an updated webrev, which fixes the typos that were pointed out by >>> reviewers: >>> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ >>> >> >> common/autoconf/version-numbers >> >> Shouldn't there be a DEFAULT_VERSION_XXX for each of the XXX parts of >> the version info? (Even if all zeroes presently.) > So that's a tricky one. :-& The question here is, I think, does it make > sense to update version-numbers when we do a security (9.0.1) or minor > (9.1.0) release? Looking historically, the version-numbers file have not > been changed for the 8u family. The only change was going from 8 to 9 > when creating the new jdk9 forest. That was what I based my decition to > only have the major number in the file. (The rest of the version string > is set by configure flags when building, in Oracle case by the RE team.) > > If it makes sense to put the minor/security/patch numbers here, I won't > oppose it, but I guess we have until the first such release to figure > out what's best, and that likely includes discussion with RE and > possibly other consumers in the community (RedHat etc). > >> >> --- >> >> Looking at hotspot changes I can't convince myself that the new >> streamlined "version" variables will capture things like "fastdebug". >> Will that filter through via configure variables? > > The "fastdebug" label has been handled as a less valued token in the > JEP-223 process. Right now there's no mention of it at all in the > version string proposal in the JEP. As I understand it, Iris is about to > propose an amendment which will just make fastdebug be a part of the OPT > string. I'm not entirely happy with that myself, but that's the way it's > decided. So wherever you can see the OPT string, you'll see the debug > level tag. > > Currently, however, that's not how it is implemented in this patch. > Since no decision was made on this (and it's still not formally > decided), I had to pick a route to go forward. The current patch will > instead put the "fastdebug" label as part of the PRE string (that's the > reason for the pre-base and pre-debuglevel arguments to configure). If > the planned changes goes into the JEP, this'll change to make the > debuglevel tag a part of the OPT string instead. > >> --- >> >> make/*/makefiles/vm.make >> >> Shouldn't the -DVERSION_XX=$(VERSION_XX) definitions be taken from the >> VERSION_CFLAGS in spec.gmk? (Or are you still allowing for a >> stand-alone hotspot build?) > The hotspot JEP-223 work initially made by Alejandro kept support for > stand-alone hotspot builds. I made additional changes on top of that, > which still tried to cater for stand-alone builds. At this very moment > I'm not sure if stand-alone hotspot builds are supposed to work or not, > but I've tried to not change the situation with this patch. > > There are two future changes coming down the pipe: One is the additional > JEP-223 work needed for Hotspot. I know Alejandro had plans for > redesigning the API between Hotspot and the JDK, so no JDK version > strings should be compiled into the JVM, but all of it extracted during > an API in runtime. That would make most (all?) of the makefile changes > in hotspot irrelevant. However, that implementation is not even started, > so it's needed for the time being. > > The second change is the build-infra hotspot makefile rewrite. When that > happens, stand-alone builds will definitely disappear, and if Hotspot > still needs make support for version strings, then the logical choice is > to use VERSION_CFLAGS. > > Ok? > >> >> --- >> >> hotspot/src/share/vm/prims/jvm.h >> jdk/src/java.base/share/native/include/jvm.h >> >> I think this comment is way out of date: >> >> /* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER >> is set to bNN) >> * It will be zero for internal builds. >> */ >> >> and can be completely removed. Even if still true, mention of an "RE >> build" has no place in OpenJDK sources. > Yep, agree. Follow-up patch, right? > >> >> --- >> >> hotspot/src/share/vm/runtime/java.cpp >> >> I think a lot of the modified code is obsolete post Hotspot Express - >> which makes it hard to determine if the changes make sense. > Yep, agree. Follow-up patch, right? >> >> --- >> >> hotspot/src/share/vm/runtime/vmStructs.cpp >> >> Please fix the alignment (3 extra spaces on modified line): >> >> 1239 static_field(Abstract_VM_Version, _vm_minor_version, >> int) \ >> 1240 static_field(Abstract_VM_Version, >> _vm_security_version, int) \ > > I was about to say "follow-up patch", but ugly indentation really sucks > so I can fix this. Ok if I skip redoing the review for that? > >> >> --- >> >> hotspot/test/runtime/6981737/Test6981737.java >> >> This test is really only valid for the new version scheme now, so it >> should probably be rewritten - and in that case it really isn't >> testing 6981737 but should be replaced by a new test for the new >> version format. > Yep, agree. Follow-up patch, right? >> >> --- >> >> jdk/src/java.base/share/classes/sun/misc/Version.java.template >> >> This comment is nonsensical: >> >> /** >> ! * Returns the security version of the running JVM if it's 1.6 >> or newer >> * or any RE VM build. It will return 0 if it's an internal 1.5 or >> * 1.4.x build. >> * @since 1.6 >> */ >> >> as security version does not exist pre 9. Normally you should be >> adding a new method and deprecating the old one. The new one is @since 9. > Yep, agree. Follow-up patch, right? >> >> /** >> ! * Returns the security version of the running JDK. >> * @since 1.6 >> */ >> >> Ditto: @since 9 (but again old should be deprecated and new method added) >> >> 253 /** >> 254 * Returns the build number of the running JDK if it's a RE >> build >> 255 * It will return 0 if it's an internal build. >> >> As with jvm.h this seems obsolete commentary these days - not only RE >> builds define a build number. > Yep, agree. Follow-up patch, right? > > /Magnus > >> >> Thanks, >> David > From erik.joelsson at oracle.com Thu Jun 11 06:58:41 2015 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Thu, 11 Jun 2015 08:58:41 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <55783F49.6030906@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <55783F49.6030906@oracle.com> Message-ID: <557931A1.6030406@oracle.com> Looks good. /Erik On 2015-06-10 15:44, Magnus Ihse Bursie wrote: > On 2015-06-09 01:31, Daniel D. Daugherty wrote: >> > >> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.01 >> >> >> General comment: Not all copyright years were updated. > > I realize I missed that part of the review. :-( > > I have now updated the copyright years. Here's a delta review: > > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch-delta-02/webrev.01/ > > > Here's the complete review once again: > > http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.03 > > > Hopefully this is now the final version to be pushed to verona, and > that any additional problems can be resolved with follow-up patches. > > /Magnus From magnus.ihse.bursie at oracle.com Thu Jun 11 12:14:59 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Thu, 11 Jun 2015 14:14:59 +0200 Subject: RFR: JDK-8085822 JEP 223: New Version-String Scheme (initial integration) In-Reply-To: <55791425.8070709@oracle.com> References: <5571AD18.7080701@oracle.com> <557625C8.5050200@oracle.com> <5576E633.9050503@oracle.com> <5576E81B.8050703@oracle.com> <5576EF94.3010500@oracle.com> <55780A33.1010302@oracle.com> <557829DC.8000405@oracle.com> <55791425.8070709@oracle.com> Message-ID: <55797BC3.9080202@oracle.com> On 2015-06-11 06:52, David Holmes wrote: > Hi Magnus, > > On 10/06/2015 10:13 PM, Magnus Ihse Bursie wrote: >> On 2015-06-10 11:58, David Holmes wrote: >>> Hi Magnus, >>> >>> Generally looks good - a few comments/queries below. >> >> In general, I believe most issues you found are valid. :-) However, as I >> said before in this thread, I'd like to see them resolved in the needed >> follow-up patches. The source code changes in Hotspot and JDK are >> inadequate to fully implement JEP-223, so these areas will need to be >> rewritten anyhow. Are you okay with resolving these issues later? > > Given this is going to a staging repo I'm okay with deferring things - > I just have a concern whether such things may be overlooked given that > the integration with the staging repo will not be undergoing a final > review. I agree completely with your concern. I have summarized the issues that were raised but not addressed during this review, and created JBS bugs, one per component. I will do my best to make sure that fixing them does not get lost from the Verona project agenda. The three bugs are: https://bugs.openjdk.java.net/browse/JDK-8087202 https://bugs.openjdk.java.net/browse/JDK-8087203 https://bugs.openjdk.java.net/browse/JDK-8087205 Here's the core content of them. If I have missed something, please add it to the bug reports: HOTSPOT: Alan Bateman: Will the update_version and special_update_version fields eventually be dropped from the jvm_version_info structure? The webrev shows a change to this comment in jvm.h: "Third, this file contains various I/O and network operations needed by the standard Java I/O and network APIs." I think this comment can be removed because those JVM_* functions were removed some time ago. Daniel D. Daugherty: General comment: It looks like support for the 'patch' value is not completely implemented through all the Makefiles. I didn't audit for this, but it's just my impression. hotspot/src/share/vm/runtime/java.cpp L661: void JDK_Version::fully_initialize( L662: uint8_t major, uint8_t minor, uint8_t security, uint8_t update) { L663: // This is only called when current is less than 1.6 and we've gotten Since you're ripping out vestigial version support, I think this function can go away since this is version 9 and newer. Don't really know for sure, but based on that comment... hotspot/src/share/vm/runtime/vm_version.cpp L84: void Abstract_VM_Version::initialize() { L85: // FIXME: Initialization can probably be removed now. I agree, but that would entail also removing the _initialized and the uses of it... Follow on bug fix? David Holmes: make/*/makefiles/vm.make Shouldn't the -DVERSION_XX=$(VERSION_XX) definitions be taken from the VERSION_CFLAGS in spec.gmk? (Or are you still allowing for a stand-alone hotspot build?) hotspot/src/share/vm/prims/jvm.h I think this comment is way out of date: /* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER is set to bNN) * It will be zero for internal builds. */ and can be completely removed. Even if still true, mention of an "RE build" has no place in OpenJDK sources. hotspot/src/share/vm/runtime/java.cpp I think a lot of the modified code is obsolete post Hotspot Express - which makes it hard to determine if the changes make sense. hotspot/test/runtime/6981737/Test6981737.java This test is really only valid for the new version scheme now, so it should probably be rewritten - and in that case it really isn't testing 6981737 but should be replaced by a new test for the new version format. JDK: Alan Bateman: Version.java.template - the comment in jvmSecurityVersion() still talks about 1.6 and newer. Can this be replaced to just say that it returns the security version? Daniel D. Daugherty: jdk/src/java.base/share/classes/sun/misc/Version.java.template L149: * Returns the security version of the running JVM if it's 1.6 or newer This JavaDoc update is wrong, but it might not be important if sun.misc.Version class is going away. David Holmes: jdk/src/java.base/share/classes/sun/misc/Version.java.template This comment is nonsensical: /** ! * Returns the security version of the running JVM if it's 1.6 or newer * or any RE VM build. It will return 0 if it's an internal 1.5 or * 1.4.x build. * @since 1.6 */ as security version does not exist pre 9. Normally you should be adding a new method and deprecating the old one. The new one is @since 9. /** ! * Returns the security version of the running JDK. * @since 1.6 */ Ditto: @since 9 (but again old should be deprecated and new method added) 253 /** 254 * Returns the build number of the running JDK if it's a RE build 255 * It will return 0 if it's an internal build. As with jvm.h this seems obsolete commentary these days - not only RE builds define a build number. LANGTOOLS: Daniel D. Daugherty: langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java old L171: case "1.9": new L171: case "9": Should this logic support both versions? Will dropping "1.9" here prevent a pre-version changeset JVM from being dropped into a JDK for triage purposes? Granted we don't often triage 'javac' with different JVMs, but... Jan Lahoda: +1 on keeping both "1.9" and "9" here. javac can be used independently on the rest of JDK to some extent, so support for running it on older builds of JDK 9 seems reasonable to me. (I wonder if current JDK 9 javac should be prepared for the new version scheme in advance.) /Magnus > > I would prefer to see the Version.java.template doc comments > corrected, even if the issue of whether to add and deprecate is > deferred, but again as this is to a staging area I can let it slide > for now. > > I saw the fix to hotspot/src/share/vm/runtime/vmStructs.cpp. > > Thanks, > David > >>> >>> On 9/06/2015 11:52 PM, Magnus Ihse Bursie wrote: >>>> Here's an updated webrev, which fixes the typos that were pointed >>>> out by >>>> reviewers: >>>> http://cr.openjdk.java.net/~ihse/JDK-8085822-JEP-223-initial-patch/webrev.02/ >>>> >>>> >>> >>> common/autoconf/version-numbers >>> >>> Shouldn't there be a DEFAULT_VERSION_XXX for each of the XXX parts of >>> the version info? (Even if all zeroes presently.) >> So that's a tricky one. :-& The question here is, I think, does it make >> sense to update version-numbers when we do a security (9.0.1) or minor >> (9.1.0) release? Looking historically, the version-numbers file have not >> been changed for the 8u family. The only change was going from 8 to 9 >> when creating the new jdk9 forest. That was what I based my decition to >> only have the major number in the file. (The rest of the version string >> is set by configure flags when building, in Oracle case by the RE team.) >> >> If it makes sense to put the minor/security/patch numbers here, I won't >> oppose it, but I guess we have until the first such release to figure >> out what's best, and that likely includes discussion with RE and >> possibly other consumers in the community (RedHat etc). >> >>> >>> --- >>> >>> Looking at hotspot changes I can't convince myself that the new >>> streamlined "version" variables will capture things like "fastdebug". >>> Will that filter through via configure variables? >> >> The "fastdebug" label has been handled as a less valued token in the >> JEP-223 process. Right now there's no mention of it at all in the >> version string proposal in the JEP. As I understand it, Iris is about to >> propose an amendment which will just make fastdebug be a part of the OPT >> string. I'm not entirely happy with that myself, but that's the way it's >> decided. So wherever you can see the OPT string, you'll see the debug >> level tag. >> >> Currently, however, that's not how it is implemented in this patch. >> Since no decision was made on this (and it's still not formally >> decided), I had to pick a route to go forward. The current patch will >> instead put the "fastdebug" label as part of the PRE string (that's the >> reason for the pre-base and pre-debuglevel arguments to configure). If >> the planned changes goes into the JEP, this'll change to make the >> debuglevel tag a part of the OPT string instead. >> >>> --- >>> >>> make/*/makefiles/vm.make >>> >>> Shouldn't the -DVERSION_XX=$(VERSION_XX) definitions be taken from the >>> VERSION_CFLAGS in spec.gmk? (Or are you still allowing for a >>> stand-alone hotspot build?) >> The hotspot JEP-223 work initially made by Alejandro kept support for >> stand-alone hotspot builds. I made additional changes on top of that, >> which still tried to cater for stand-alone builds. At this very moment >> I'm not sure if stand-alone hotspot builds are supposed to work or not, >> but I've tried to not change the situation with this patch. >> >> There are two future changes coming down the pipe: One is the additional >> JEP-223 work needed for Hotspot. I know Alejandro had plans for >> redesigning the API between Hotspot and the JDK, so no JDK version >> strings should be compiled into the JVM, but all of it extracted during >> an API in runtime. That would make most (all?) of the makefile changes >> in hotspot irrelevant. However, that implementation is not even started, >> so it's needed for the time being. >> >> The second change is the build-infra hotspot makefile rewrite. When that >> happens, stand-alone builds will definitely disappear, and if Hotspot >> still needs make support for version strings, then the logical choice is >> to use VERSION_CFLAGS. >> >> Ok? >> >>> >>> --- >>> >>> hotspot/src/share/vm/prims/jvm.h >>> jdk/src/java.base/share/native/include/jvm.h >>> >>> I think this comment is way out of date: >>> >>> /* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER >>> is set to bNN) >>> * It will be zero for internal builds. >>> */ >>> >>> and can be completely removed. Even if still true, mention of an "RE >>> build" has no place in OpenJDK sources. >> Yep, agree. Follow-up patch, right? >> >>> >>> --- >>> >>> hotspot/src/share/vm/runtime/java.cpp >>> >>> I think a lot of the modified code is obsolete post Hotspot Express - >>> which makes it hard to determine if the changes make sense. >> Yep, agree. Follow-up patch, right? >>> >>> --- >>> >>> hotspot/src/share/vm/runtime/vmStructs.cpp >>> >>> Please fix the alignment (3 extra spaces on modified line): >>> >>> 1239 static_field(Abstract_VM_Version, _vm_minor_version, >>> int) \ >>> 1240 static_field(Abstract_VM_Version, >>> _vm_security_version, int) \ >> >> I was about to say "follow-up patch", but ugly indentation really sucks >> so I can fix this. Ok if I skip redoing the review for that? >> >>> >>> --- >>> >>> hotspot/test/runtime/6981737/Test6981737.java >>> >>> This test is really only valid for the new version scheme now, so it >>> should probably be rewritten - and in that case it really isn't >>> testing 6981737 but should be replaced by a new test for the new >>> version format. >> Yep, agree. Follow-up patch, right? >>> >>> --- >>> >>> jdk/src/java.base/share/classes/sun/misc/Version.java.template >>> >>> This comment is nonsensical: >>> >>> /** >>> ! * Returns the security version of the running JVM if it's 1.6 >>> or newer >>> * or any RE VM build. It will return 0 if it's an internal >>> 1.5 or >>> * 1.4.x build. >>> * @since 1.6 >>> */ >>> >>> as security version does not exist pre 9. Normally you should be >>> adding a new method and deprecating the old one. The new one is >>> @since 9. >> Yep, agree. Follow-up patch, right? >>> >>> /** >>> ! * Returns the security version of the running JDK. >>> * @since 1.6 >>> */ >>> >>> Ditto: @since 9 (but again old should be deprecated and new method >>> added) >>> >>> 253 /** >>> 254 * Returns the build number of the running JDK if it's a RE >>> build >>> 255 * It will return 0 if it's an internal build. >>> >>> As with jvm.h this seems obsolete commentary these days - not only RE >>> builds define a build number. >> Yep, agree. Follow-up patch, right? >> >> /Magnus >> >>> >>> Thanks, >>> David >> From magnus.ihse.bursie at oracle.com Fri Jun 12 06:22:35 2015 From: magnus.ihse.bursie at oracle.com (magnus.ihse.bursie at oracle.com) Date: Fri, 12 Jun 2015 06:22:35 +0000 Subject: hg: verona/stage: 2 new changesets Message-ID: <201506120622.t5C6MZCg025271@aojmv0008.oracle.com> Changeset: 4999895b3a44 Author: ihse Date: 2015-06-11 00:21 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/4999895b3a44 8085822: JEP 223: New Version-String Scheme (initial integration) Reviewed-by: erikj, dcubed, dholmes Contributed-by: Magnus Ihse Bursie ! common/autoconf/configure.ac ! common/autoconf/flags.m4 ! common/autoconf/generated-configure.sh ! common/autoconf/help.m4 ! common/autoconf/jdk-options.m4 + common/autoconf/jdk-version.m4 ! common/autoconf/spec.gmk.in ! common/autoconf/version-numbers - common/bin/test_builds.sh ! common/nb_native/nbproject/configurations.xml ! make/Images.gmk ! make/Install.gmk ! make/Javadoc.gmk ! make/JrtfsJar.gmk ! make/MacBundles.gmk ! make/jprt.properties Changeset: 5064fbd94e61 Author: ihse Date: 2015-06-11 00:30 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/5064fbd94e61 Merge ! common/autoconf/flags.m4 ! common/autoconf/generated-configure.sh From magnus.ihse.bursie at oracle.com Fri Jun 12 06:23:58 2015 From: magnus.ihse.bursie at oracle.com (magnus.ihse.bursie at oracle.com) Date: Fri, 12 Jun 2015 06:23:58 +0000 Subject: hg: verona/stage/jdk: 2 new changesets Message-ID: <201506120623.t5C6Nw71025720@aojmv0008.oracle.com> Changeset: 474db9ef5ee7 Author: ihse Date: 2015-06-11 00:23 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/474db9ef5ee7 8085822: JEP 223: New Version-String Scheme (initial integration) Reviewed-by: erikj, dcubed, dholmes, alanb Contributed-by: Magnus Ihse Bursie , Alejandro E Murillo , Kumar Srinivasan ! make/CompileDemos.gmk ! make/data/mainmanifest/manifest.mf ! make/gensrc/GensrcMisc.gmk ! make/launcher/Launcher-jdk.accessibility.gmk ! make/launcher/Launcher-jdk.pack200.gmk ! make/launcher/LauncherCommon.gmk ! make/lib/CoreLibraries.gmk ! src/java.base/share/classes/sun/misc/Version.java.template ! src/java.base/share/native/include/jvm.h ! src/java.base/share/native/launcher/defines.h ! src/java.base/share/native/launcher/main.c ! src/java.base/share/native/libjava/System.c ! src/java.base/share/native/libjava/Version.c ! src/java.base/share/native/libjava/jdk_util.c ! src/java.base/windows/native/common/version.rc ! src/java.desktop/windows/native/libawt/windows/awt.rc ! src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC ! test/sun/misc/Version/Version.java Changeset: d937975320cc Author: ihse Date: 2015-06-11 00:51 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/d937975320cc Merge - src/java.base/share/classes/sun/misc/JavaBeansIntrospectorAccess.java - src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java - src/java.base/share/classes/sun/security/ssl/EngineArgs.java - src/java.base/share/classes/sun/security/ssl/EngineInputRecord.java - src/java.base/share/classes/sun/security/ssl/EngineOutputRecord.java - src/java.base/share/classes/sun/security/ssl/EngineWriter.java - src/java.base/share/classes/sun/security/ssl/KerberosClientKeyExchange.java - src/java.base/share/classes/sun/security/ssl/Krb5Helper.java - src/java.base/share/classes/sun/security/ssl/Krb5Proxy.java - src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java - src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java - src/java.security.jgss/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java - test/java/lang/Character/UnicodeBlock/NonOptimalMapSize.java From magnus.ihse.bursie at oracle.com Fri Jun 12 06:24:24 2015 From: magnus.ihse.bursie at oracle.com (magnus.ihse.bursie at oracle.com) Date: Fri, 12 Jun 2015 06:24:24 +0000 Subject: hg: verona/stage/langtools: 2 new changesets Message-ID: <201506120624.t5C6OOB3025833@aojmv0008.oracle.com> Changeset: 404f1956145b Author: ihse Date: 2015-06-11 00:23 +0200 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/404f1956145b 8085822: JEP 223: New Version-String Scheme (initial integration) Reviewed-by: erikj, dcubed, dholmes, alanb Contributed-by: Kumar Srinivasan , Magnus Ihse Bursie ! make/gensrc/GensrcCommon.gmk ! src/java.compiler/share/classes/javax/lang/model/SourceVersion.java ! test/tools/javac/options/modes/InfoOptsTest.java ! test/tools/javac/options/modes/SourceTargetTest.java Changeset: 09b36c8c6bce Author: ihse Date: 2015-06-11 00:50 +0200 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/09b36c8c6bce Merge - test/tools/javac/7153958/pkg/ClassToBeStaticallyImported.java From magnus.ihse.bursie at oracle.com Fri Jun 12 06:24:30 2015 From: magnus.ihse.bursie at oracle.com (magnus.ihse.bursie at oracle.com) Date: Fri, 12 Jun 2015 06:24:30 +0000 Subject: hg: verona/stage/nashorn: 2 new changesets Message-ID: <201506120624.t5C6OUDt025890@aojmv0008.oracle.com> Changeset: aad920be350a Author: ihse Date: 2015-06-11 00:23 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/aad920be350a 8085822: JEP 223: New Version-String Scheme (initial integration) Reviewed-by: erikj, dcubed, dholmes, alanb, sundar Contributed-by: Magnus Ihse Bursie ! make/BuildNashorn.gmk ! make/build.xml ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java - src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template + src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template Changeset: 3fc9a15406c9 Author: ihse Date: 2015-06-11 00:50 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/3fc9a15406c9 Merge ! make/build.xml From magnus.ihse.bursie at oracle.com Fri Jun 12 06:30:41 2015 From: magnus.ihse.bursie at oracle.com (magnus.ihse.bursie at oracle.com) Date: Fri, 12 Jun 2015 06:30:41 +0000 Subject: hg: verona/stage/hotspot: 2 new changesets Message-ID: <201506120630.t5C6UfLr026801@aojmv0008.oracle.com> Changeset: 5b88604f11a1 Author: ihse Date: 2015-06-12 08:31 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/5b88604f11a1 8085822: JEP 223: New Version-String Scheme (initial integration) Reviewed-by: erikj, dcubed, dholmes, alanb Contributed-by: Magnus Ihse Bursie , Alejandro E Murillo ! make/Makefile ! make/aix/Makefile ! make/aix/makefiles/buildtree.make ! make/aix/makefiles/defs.make ! make/aix/makefiles/vm.make ! make/bsd/Makefile ! make/bsd/makefiles/buildtree.make ! make/bsd/makefiles/defs.make ! make/bsd/makefiles/vm.make ! make/defs.make - make/jdk6_hotspot_distro ! make/jdk_version ! make/linux/Makefile ! make/linux/makefiles/buildtree.make ! make/linux/makefiles/defs.make ! make/linux/makefiles/vm.make ! make/solaris/Makefile ! make/solaris/makefiles/buildtree.make ! make/solaris/makefiles/defs.make ! make/solaris/makefiles/sparcWorks.make ! make/solaris/makefiles/vm.make ! make/windows/build.make ! make/windows/makefiles/compile.make ! make/windows/makefiles/debug.make ! make/windows/makefiles/defs.make ! make/windows/makefiles/fastdebug.make ! make/windows/makefiles/product.make ! make/windows/makefiles/vm.make ! make/windows/projectfiles/common/Makefile ! src/share/vm/prims/jvm.h ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/java.cpp ! src/share/vm/runtime/java.hpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vm_version.cpp ! src/share/vm/runtime/vm_version.hpp ! test/runtime/6981737/Test6981737.java Changeset: befaf8025423 Author: ihse Date: 2015-06-12 08:32 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/befaf8025423 Merge ! src/share/vm/runtime/arguments.cpp From alejandro.murillo at oracle.com Tue Jun 16 22:55:15 2015 From: alejandro.murillo at oracle.com (Alejandro E Murillo) Date: Tue, 16 Jun 2015 16:55:15 -0600 Subject: [verona.stage] RFR 8087203: Add support for PATCH field and remove unused fields of new version string Message-ID: <5580A953.8090905@oracle.com> Please review these changes: Bug: https://bugs.openjdk.java.net/browse/JDK-8087202 Webrev: http://cr.openjdk.java.net/~amurillo/9/8087202 These are intended to: (1) Add support for the patch field of the new version string format (2) Remove unused fields remaining from the old version string format (3) Patch some jaxp initialization code to be able to handle the new version string. this will be pushed under a different bug number, but is required to be able to run and pass all the tests associated with "-testset hotspot" (for JFR tests the VM can't be started without that). These will be pushed under this sub-task: https://bugs.openjdk.java.net/browse/JDK-8098588 (4) Additional notes: (a) Some pieces of code, only necessary for 1.5 or older, were removed (b) update_version and special_update_version were removed (c) The code to parse the version string in jdk/test/sun/misc/Version/Version.java will probably change when the Version.java class is available. (d) As with the changes for 8085822, this is all being pushed to [1] and then later to jdk9/dev (e) These changes should address most, if not all, of the issues raised during the code review for JDK-8085822 (see also https://bugs.openjdk.java.net/browse/JDK-8087203) (f) All builds and tests pass for "-testset hotspot". [1] http://hg.openjdk.java.net/verona/stage Thanks -- Alejandro From david.holmes at oracle.com Thu Jun 18 07:40:04 2015 From: david.holmes at oracle.com (David Holmes) Date: Thu, 18 Jun 2015 17:40:04 +1000 Subject: [verona.stage] RFR 8087203: Add support for PATCH field and remove unused fields of new version string In-Reply-To: <5580A953.8090905@oracle.com> References: <5580A953.8090905@oracle.com> Message-ID: <558275D4.6030306@oracle.com> Hi Alejandro, I looked at the hotspot and JDK changes. On 17/06/2015 8:55 AM, Alejandro E Murillo wrote: > > Please review these changes: > > Bug: https://bugs.openjdk.java.net/browse/JDK-8087202 > Webrev: http://cr.openjdk.java.net/~amurillo/9/8087202 hotspot/make/Makefile + # VERSION_PATCH Security number for version (e.g. 0) Comment is wrong. --- hotspot/src/share/vm/prims/jvm.cpp 3659 info->patch_version = 0; Why is this hard-wired to zero? Surely this should be a build variable. --- hotspot/src/share/vm/prims/jvm.h jdk/src/java.base/share/native/include/jvm.h These two files should be identical, but now have different comments in places. 1188 unsigned int patch_version : 8; 1215 unsigned int patch_version : 8; In each case you removed two 8 bit fields and added one 8 bit field so your bitfields no longer add up to 32 (8+8+16). But these structs seem obsolete (due to no hotspot-express) even before the new version changes. So I think there is still a bit of follow up work to do here. --- hotspot/src/share/vm/runtime/java.hpp 110 _partially_initialized(false), Isn't the whole partially vs fully initialized issue dead now? Else why delete the other code pertaining to that? --- jdk/src/java.base/share/classes/sun/misc/Version.java.template * @since JDK9 Is that the right format? I would have expected @since 9. 248 private static native boolean getJvmVersionInfo(); Does that method still need to return a boolean ? See next comment --- jdk/src/java.base/share/native/libjava/Version.c 50 if (!JDK_InitJvmHandle()) { 51 JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup"); 52 return JNI_FALSE; 53 } 54 func_p = (GetJvmVersionInfo_fp) JDK_FindJvmEntry("JVM_GetVersionInfo"); 55 if (func_p == NULL) { 56 return JNI_FALSE; 57 } this seems dead code now and so the method can't fail or throw an exception. Thanks, David ----- > These are intended to: > > (1) Add support for the patch field of the new version string format > (2) Remove unused fields remaining from the old version string format > (3) Patch some jaxp initialization code to be able to handle the new > version string. > this will be pushed under a different bug number, but is required > to be able to run and pass all the tests associated with > "-testset hotspot" > (for JFR tests the VM can't be started without that). > These will be pushed under this sub-task: > https://bugs.openjdk.java.net/browse/JDK-8098588 > > (4) Additional notes: > (a) Some pieces of code, only necessary for 1.5 or older, were removed > (b) update_version and special_update_version were removed > (c) The code to parse the version string in > jdk/test/sun/misc/Version/Version.java > will probably change when the Version.java class is available. > (d) As with the changes for 8085822, this is all being pushed to [1] and > then later to jdk9/dev > (e) These changes should address most, if not all, of the issues raised > during > the code review for JDK-8085822 (see also > https://bugs.openjdk.java.net/browse/JDK-8087203) > (f) All builds and tests pass for "-testset hotspot". > > [1] http://hg.openjdk.java.net/verona/stage > > Thanks > From Alan.Bateman at oracle.com Thu Jun 18 13:41:49 2015 From: Alan.Bateman at oracle.com (Alan Bateman) Date: Thu, 18 Jun 2015 14:41:49 +0100 Subject: [verona.stage] RFR 8087203: Add support for PATCH field and remove unused fields of new version string In-Reply-To: <5580A953.8090905@oracle.com> References: <5580A953.8090905@oracle.com> Message-ID: <5582CA9D.9070207@oracle.com> On 16/06/2015 23:55, Alejandro E Murillo wrote: > > Please review these changes: > > Bug: https://bugs.openjdk.java.net/browse/JDK-8087202 > Webrev: http://cr.openjdk.java.net/~amurillo/9/8087202 The implementation of isJavaVersionAtLeast in the JAXP classes look okay although I think this is code that could be removed. Joe Wang can confirm but I think it dates back to when the JAXP API was a standalone API and there was an attempt to keep the code in sync across major versions. I'll create a separate bug re-examine this as it looks like some clean-up can be done here. Just on the comment "In JDK9 the version string was changed ..." will date quickly and would be nice to say that "In JDK 8 and older then it assumes 1.N and for JDK 9 and newer it assumes N. In sun.misc.Version.initVersions then InternalError instead of RuntimeException might be more appropriate as something is really broken if that happens. Also as David pointed out, it shouldn't be @since JDK9 in the new method. This reminds me to check if the JEP says anything about @since tags because we already have quite a few @since 1.9. In the Version.java test then the line with the pattern is really long, maybe that could be split up to make future side-by-side views easier to read. Otherwise looks okay to me. -Alan. From iris.clark at oracle.com Thu Jun 18 19:46:18 2015 From: iris.clark at oracle.com (Iris Clark) Date: Thu, 18 Jun 2015 12:46:18 -0700 (PDT) Subject: Verona spec: Mercurial tags (for jcheck) Message-ID: Hi. We need to update our Hg stags to comply with the new version string. Minimally, the set of allowable/expected tags needs to be updated in jcheck. I've modified the specification as follows: - Add a section defining the Mercurial tag schema of `jdk\-$VNUM\+$BUILD` and providing examples of different release types. - The section references jcheck as a tool which requires alteration. I've appended complete diffs. Please let me know if there are any concerns. Thanks, iris ---- > > ### Tools > > #### Mercurial Tags > > Mercurial tags are used to identify a promotion's changesets. Tools such as > [Code Tool's][codetools] [jcheck][jcheck] which is used to validate all > changesets which are pushed to JDK release forests will be altered to support > tags using the new version scheme. > > The general syntax for Mercurial tags is `jdk\-$VNUM\+$BUILD`. The following > table shows the proposed values for different release types: > > Release Type Proposed > ---------------- ----------- > Major (GA) jdk-9+100 > Minor #1 (GA) jdk-9.1.2+27 > Security #1 (GA) jdk-9.0.1+3 > > Some tools may need to support both existing and proposed tag formats. > > [codetools]: http://openjdk.java.net/code-tools > [jcheck]: http://hg.openjdk.java.net/code-tools/jcheck/file/tip/jcheck.py From alejandro.murillo at oracle.com Thu Jun 18 22:56:04 2015 From: alejandro.murillo at oracle.com (Alejandro E Murillo) Date: Thu, 18 Jun 2015 16:56:04 -0600 Subject: [verona.stage] RFR 8087203: Add support for PATCH field and remove unused fields of new version string In-Reply-To: <558275D4.6030306@oracle.com> References: <5580A953.8090905@oracle.com> <558275D4.6030306@oracle.com> Message-ID: <55834C84.8010408@oracle.com> Hi David, thanks for the review, see below On 6/18/2015 1:40 AM, David Holmes wrote: > Hi Alejandro, > > I looked at the hotspot and JDK changes. > > On 17/06/2015 8:55 AM, Alejandro E Murillo wrote: >> >> Please review these changes: >> >> Bug: https://bugs.openjdk.java.net/browse/JDK-8087202 >> Webrev: http://cr.openjdk.java.net/~amurillo/9/8087202 > > hotspot/make/Makefile > > + # VERSION_PATCH Security number for version (e.g. 0) > > Comment is wrong. cut and paste. Will fix > > --- > > hotspot/src/share/vm/prims/jvm.cpp > > 3659 info->patch_version = 0; > > Why is this hard-wired to zero? Surely this should be a build variable. good catch! That should be initialized from VM_Version as well (was mimicking update version, but that was always zero for hotspot which is not the case for patch). New webrev: http://cr.openjdk.java.net/~amurillo/9/8087202.v2/hotspot/src/share/vm/prims/jvm.cpp.udiff.html > > --- > > hotspot/src/share/vm/prims/jvm.h > jdk/src/java.base/share/native/include/jvm.h > > These two files should be identical, but now have different comments > in places. will add the missing comments > > 1188 unsigned int patch_version : 8; > 1215 unsigned int patch_version : 8; > > In each case you removed two 8 bit fields and added one 8 bit field so > your bitfields no longer add up to 32 (8+8+16). But these structs seem > obsolete (due to no hotspot-express) even before the new version > changes. So I think there is still a bit of follow up work to do here. oh yes, looks like I need to keep the size of the whole structure, to avoid any misalignment that may impact performance. I thought about declaring patch to be short (16) instead, but I ended up adding a padding member, reserved3, size 8, to keep the structure size unchanged. I guess I could have changed reserved2 to 24, let me know if there's any advantage using either of those. New webrev: http://cr.openjdk.java.net/~amurillo/9/8087202.v2/hotspot/src/share/vm/prims/jvm.h.udiff.html > > --- > > hotspot/src/share/vm/runtime/java.hpp > > 110 _partially_initialized(false), > > Isn't the whole partially vs fully initialized issue dead now? Else > why delete the other code pertaining to that? yeah, I should have removed the remaining uses of that. It's gone now. > > --- > > jdk/src/java.base/share/classes/sun/misc/Version.java.template > > * @since JDK9 > > Is that the right format? I would have expected @since 9. I meant to double check that. I changed it > > 248 private static native boolean getJvmVersionInfo(); > > Does that method still need to return a boolean ? See next comment > > --- > > jdk/src/java.base/share/native/libjava/Version.c > > 50 if (!JDK_InitJvmHandle()) { > 51 JNU_ThrowInternalError(env, "Handle for JVM not found for > symbol lookup"); > 52 return JNI_FALSE; > 53 } > 54 func_p = (GetJvmVersionInfo_fp) > JDK_FindJvmEntry("JVM_GetVersionInfo"); > 55 if (func_p == NULL) { -- > 56 return JNI_FALSE; > 57 } > > this seems dead code now and so the method can't fail or throw an > exception. I thought about changing that, but I prefer if it's done as a separate change for now. will file a follow up bug, Are you ok with that? New webrev here (I tested these with JPRT, testsets hotspot and pit): http://cr.openjdk.java.net/~amurillo/9/8087202.v2/ Thanks Alejandro > > Thanks, > David > ----- > >> These are intended to: >> >> (1) Add support for the patch field of the new version string format >> (2) Remove unused fields remaining from the old version string format >> (3) Patch some jaxp initialization code to be able to handle the new >> version string. >> this will be pushed under a different bug number, but is required >> to be able to run and pass all the tests associated with >> "-testset hotspot" >> (for JFR tests the VM can't be started without that). >> These will be pushed under this sub-task: >> https://bugs.openjdk.java.net/browse/JDK-8098588 >> >> (4) Additional notes: >> (a) Some pieces of code, only necessary for 1.5 or older, were removed >> (b) update_version and special_update_version were removed >> (c) The code to parse the version string in >> jdk/test/sun/misc/Version/Version.java >> will probably change when the Version.java class is available. >> (d) As with the changes for 8085822, this is all being pushed to [1] and >> then later to jdk9/dev >> (e) These changes should address most, if not all, of the issues raised >> during >> the code review for JDK-8085822 (see also >> https://bugs.openjdk.java.net/browse/JDK-8087203) >> (f) All builds and tests pass for "-testset hotspot". >> >> [1] http://hg.openjdk.java.net/verona/stage >> >> Thanks >> -- Alejandro From alejandro.murillo at oracle.com Thu Jun 18 22:56:11 2015 From: alejandro.murillo at oracle.com (Alejandro E Murillo) Date: Thu, 18 Jun 2015 16:56:11 -0600 Subject: [verona.stage] RFR 8087203: Add support for PATCH field and remove unused fields of new version string In-Reply-To: <5582CA9D.9070207@oracle.com> References: <5580A953.8090905@oracle.com> <5582CA9D.9070207@oracle.com> Message-ID: <55834C8B.2060803@oracle.com> Thanks Alan, see below On 6/18/2015 7:41 AM, Alan Bateman wrote: > > > On 16/06/2015 23:55, Alejandro E Murillo wrote: >> >> Please review these changes: >> >> Bug: https://bugs.openjdk.java.net/browse/JDK-8087202 >> Webrev: http://cr.openjdk.java.net/~amurillo/9/8087202 > > The implementation of isJavaVersionAtLeast in the JAXP classes look > okay although I think this is code that could be removed. Joe Wang can > confirm but I think it dates back to when the JAXP API was a > standalone API and there was an attempt to keep the code in sync > across major versions. I'll create a separate bug re-examine this as > it looks like some clean-up can be done here. sounds good, in general, that code can be called a lot, so changes need to be carefully done as to avoid perf impact. So it might be better if that check can be removed > > Just on the comment "In JDK9 the version string was changed ..." will > date quickly and would be nice to say that "In JDK 8 and older then it > assumes 1.N and for JDK 9 and newer it assumes N. > > In sun.misc.Version.initVersions then InternalError instead of > RuntimeException might be more appropriate as something is really > broken if that happens. Indeed. Changed. > > Also as David pointed out, it shouldn't be @since JDK9 in the new > method. This reminds me to check if the JEP says anything about @since > tags because we already have quite a few @since 1.9. yeah, I had meant to double check that. Will change it to 9 > > In the Version.java test then the line with the pattern is really > long, maybe that could be split up to make future side-by-side views > easier to read. sure, will make it into several lines, based on components, like this: String jep223Pattern = "^([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?(\\.([0-9]+))?" + // $VNUM "(-([a-zA-Z]+))?(\\.([a-zA-Z]+))?" + // $PRE "(\\+([0-9]+))?" + // Build Number "(([-a-zA-Z0-9.]+))?$"; // $OPT see new webrev: http://cr.openjdk.java.net/~amurillo/9/8087202.v2/jdk/src/java.base/share/classes/sun/misc/Version.java.template.udiff.html > > Otherwise looks okay to me. great, thanks! Here's the new webrev (I tested these with JPRT, testsets hotspot and pit): http://cr.openjdk.java.net/~amurillo/9/8087202.v2/ Thanks! -- Alejandro From david.holmes at oracle.com Thu Jun 18 23:58:34 2015 From: david.holmes at oracle.com (David Holmes) Date: Fri, 19 Jun 2015 09:58:34 +1000 Subject: [verona.stage] RFR 8087203: Add support for PATCH field and remove unused fields of new version string In-Reply-To: <55834C84.8010408@oracle.com> References: <5580A953.8090905@oracle.com> <558275D4.6030306@oracle.com> <55834C84.8010408@oracle.com> Message-ID: <55835B2A.5060809@oracle.com> On 19/06/2015 8:56 AM, Alejandro E Murillo wrote: > > Hi David, > thanks for the review, see below > > On 6/18/2015 1:40 AM, David Holmes wrote: >> Hi Alejandro, >> >> I looked at the hotspot and JDK changes. >> >> On 17/06/2015 8:55 AM, Alejandro E Murillo wrote: >>> >>> Please review these changes: >>> >>> Bug: https://bugs.openjdk.java.net/browse/JDK-8087202 >>> Webrev: http://cr.openjdk.java.net/~amurillo/9/8087202 >> >> hotspot/make/Makefile >> >> + # VERSION_PATCH Security number for version (e.g. 0) >> >> Comment is wrong. > cut and paste. Will fix >> >> --- >> >> hotspot/src/share/vm/prims/jvm.cpp >> >> 3659 info->patch_version = 0; >> >> Why is this hard-wired to zero? Surely this should be a build variable. > good catch! That should be initialized from VM_Version as well > (was mimicking update version, but that was always zero for hotspot > which is not the case for patch). New webrev: > http://cr.openjdk.java.net/~amurillo/9/8087202.v2/hotspot/src/share/vm/prims/jvm.cpp.udiff.html Looks good. >> hotspot/src/share/vm/prims/jvm.h >> jdk/src/java.base/share/native/include/jvm.h >> >> These two files should be identical, but now have different comments >> in places. > will add the missing comments Ok. >> >> 1188 unsigned int patch_version : 8; >> 1215 unsigned int patch_version : 8; >> >> In each case you removed two 8 bit fields and added one 8 bit field so >> your bitfields no longer add up to 32 (8+8+16). But these structs seem >> obsolete (due to no hotspot-express) even before the new version >> changes. So I think there is still a bit of follow up work to do here. > oh yes, looks like I need to keep the size of the whole structure, > to avoid any misalignment that may impact performance. > I thought about declaring patch to be short (16) instead, > but I ended up adding a padding member, reserved3, size 8, > to keep the structure size unchanged. I guess I could have changed > reserved2 to 24, let me know if there's any advantage using either of > those. > New webrev: > http://cr.openjdk.java.net/~amurillo/9/8087202.v2/hotspot/src/share/vm/prims/jvm.h.udiff.html Looks okay, but I still think there is scope to revisit the whole purpose of this struct and the use of the reserved fields etc. Adding the 8-bit padding was the right call. >> hotspot/src/share/vm/runtime/java.hpp >> >> 110 _partially_initialized(false), >> >> Isn't the whole partially vs fully initialized issue dead now? Else >> why delete the other code pertaining to that? > yeah, I should have removed the remaining uses of that. > It's gone now. Looks good. >> jdk/src/java.base/share/classes/sun/misc/Version.java.template >> >> * @since JDK9 >> >> Is that the right format? I would have expected @since 9. > I meant to double check that. I changed it Ok. As Alan says the use of 9 versus 1.9 will need to be sorted out but that's a separate issue. >> >> 248 private static native boolean getJvmVersionInfo(); >> >> Does that method still need to return a boolean ? See next comment >> >> --- >> >> jdk/src/java.base/share/native/libjava/Version.c >> >> 50 if (!JDK_InitJvmHandle()) { >> 51 JNU_ThrowInternalError(env, "Handle for JVM not found for >> symbol lookup"); >> 52 return JNI_FALSE; >> 53 } >> 54 func_p = (GetJvmVersionInfo_fp) >> JDK_FindJvmEntry("JVM_GetVersionInfo"); >> 55 if (func_p == NULL) { -- >> 56 return JNI_FALSE; >> 57 } >> >> this seems dead code now and so the method can't fail or throw an >> exception. > I thought about changing that, but I prefer if it's done > as a separate change for now. will file a follow up bug, > Are you ok with that? Follow up RFE is fine. > New webrev here (I tested these with JPRT, testsets hotspot and pit): > > http://cr.openjdk.java.net/~amurillo/9/8087202.v2/ No further comments from me. Thanks, David > Thanks > Alejandro > >> >> Thanks, >> David >> ----- >> >>> These are intended to: >>> >>> (1) Add support for the patch field of the new version string format >>> (2) Remove unused fields remaining from the old version string format >>> (3) Patch some jaxp initialization code to be able to handle the new >>> version string. >>> this will be pushed under a different bug number, but is required >>> to be able to run and pass all the tests associated with >>> "-testset hotspot" >>> (for JFR tests the VM can't be started without that). >>> These will be pushed under this sub-task: >>> https://bugs.openjdk.java.net/browse/JDK-8098588 >>> >>> (4) Additional notes: >>> (a) Some pieces of code, only necessary for 1.5 or older, were removed >>> (b) update_version and special_update_version were removed >>> (c) The code to parse the version string in >>> jdk/test/sun/misc/Version/Version.java >>> will probably change when the Version.java class is available. >>> (d) As with the changes for 8085822, this is all being pushed to [1] and >>> then later to jdk9/dev >>> (e) These changes should address most, if not all, of the issues raised >>> during >>> the code review for JDK-8085822 (see also >>> https://bugs.openjdk.java.net/browse/JDK-8087203) >>> (f) All builds and tests pass for "-testset hotspot". >>> >>> [1] http://hg.openjdk.java.net/verona/stage >>> >>> Thanks >>> > From iris.clark at oracle.com Fri Jun 19 03:20:37 2015 From: iris.clark at oracle.com (Iris Clark) Date: Thu, 18 Jun 2015 20:20:37 -0700 (PDT) Subject: Verona spec: System properties Message-ID: Hi. The original draft of the JEP did not include specification for the format of returned values for the version-related system properties. We take a low-risk, minimum impact approach defining the pre-existing implementation in terms of the new version string components. I've added a section for System properties containing the following: - A general syntax is defined for each of the five affected system properties: java{.vm}?.version, java.runtime.version, java{.vm}?.specification.version . - Examples for each of the release types is provided. - A warning that all system properties for major releases will NOT contain `.` is provided. Complete diffs are appended to this message. Please let me know if there are any concerns. Thanks, iris ---- 155c155 < A _version string_ consists of a version number `$VNUM`, as described --- > A _version string_ `$VSTR` consists of a version number `$VNUM`, as described 306a307,361 > ### System properties > > The values returned by the following [system properties][props] are modified > by this JEP. The general syntax is as follows: > > Name Syntax > ------------------------------ -------------- > java.version $VNUM(\-$PRE)? > java.runtime.version $VSTR > java.vm.version $VSTR > java.specification.version $VNUM > java.vm.specification.version $VNUM > > The system property `java.class.version` is not affected. > > The following table shows the existing and proposed values for different > release types: > > System Property Existing Proposed > ------------------------------- ------------ -------- > Early Access > java.version 1.9.0-ea 9-ea > java.runtime.version 1.9.0-ea-b73 9-ea+73 > java.vm.version 1.9.0-ea-b73 9-ea+73 > java.specification.version 1.9 9 > java.vm.specification.version 1.9 9 > > Major (GA) > java.version 1.9.0 9 > java.runtime.version 1.9.0-b100 9+100 > java.vm.version 1.9.0-b100 9+100 > java.specification.version 1.9 9 > java.vm.specification.version 1.9 9 > > Minor #1 (GA) > java.version 1.9.0_20 9.1.2 > java.runtime.version 1.9.0_20-b62 9.1.2+62 > java.vm.version 1.9.0_20-b62 9.1.2+62 > java.specification.version 1.9 9 > java.vm.specification.version 1.9 9 > > Security #1 (GA) > java.version 1.9.0_5 9.0.1 > java.runtime.version 1.9.0_5-b20 9.0.1+20 > java.vm.version 1.9.0_5-b20 9.0.1+20 > java.specification.version 1.9 9 > java.vm.specification.version 1.9 9 > > Note that all code which has historically detected `.` in any of these system > properties as part of version identification will need to be examined and > potentially modified. For example, > `System.getProperty("java.version").indexof('.')` will return `-1` for major > releases. > > [props]: http://docs.oracle.com/javase/8/docs/api/java/lang/System.html#getPro perties-- From kumar.x.srinivasan at oracle.com Mon Jun 22 19:19:37 2015 From: kumar.x.srinivasan at oracle.com (kumar.x.srinivasan at oracle.com) Date: Mon, 22 Jun 2015 19:19:37 +0000 Subject: hg: verona/stage/langtools: 8087205: Follow-up fix in langtools for JDK-8085822 Message-ID: <201506221919.t5MJJbMc026772@aojmv0008.oracle.com> Changeset: 89ba2a17ce41 Author: ksrini Date: 2015-06-22 11:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/89ba2a17ce41 8087205: Follow-up fix in langtools for JDK-8085822 Reviewed-by: darcy ! src/java.compiler/share/classes/javax/lang/model/SourceVersion.java From alejandro.murillo at oracle.com Mon Jun 22 20:08:41 2015 From: alejandro.murillo at oracle.com (alejandro.murillo at oracle.com) Date: Mon, 22 Jun 2015 20:08:41 +0000 Subject: hg: verona/stage/hotspot: 8087202: Add support for PATCH field and remove unused fields of new version string Message-ID: <201506222008.t5MK8fhY004529@aojmv0008.oracle.com> Changeset: dc45a1d895ff Author: amurillo Date: 2015-06-19 10:34 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/dc45a1d895ff 8087202: Add support for PATCH field and remove unused fields of new version string Reviewed-by: dholmes, alanb ! make/Makefile ! make/aix/makefiles/vm.make ! make/bsd/makefiles/vm.make ! make/linux/makefiles/vm.make ! make/solaris/makefiles/vm.make ! make/windows/makefiles/defs.make ! make/windows/makefiles/vm.make ! src/share/vm/memory/universe.cpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/jvm.h ! src/share/vm/runtime/java.cpp ! src/share/vm/runtime/java.hpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vm_version.cpp ! src/share/vm/runtime/vm_version.hpp ! src/share/vm/services/diagnosticCommand.cpp ! src/share/vm/services/management.cpp ! src/share/vm/services/runtimeService.cpp From alejandro.murillo at oracle.com Mon Jun 22 20:08:50 2015 From: alejandro.murillo at oracle.com (alejandro.murillo at oracle.com) Date: Mon, 22 Jun 2015 20:08:50 +0000 Subject: hg: verona/stage/jaxp: 8098588: Allow for parsing jdk9 new version string Message-ID: <201506222008.t5MK8oIW004578@aojmv0008.oracle.com> Changeset: 1ba7abcb360a Author: amurillo Date: 2015-06-22 13:04 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/1ba7abcb360a 8098588: Allow for parsing jdk9 new version string Reviewed-by: alanb, joehw, dtitov ! src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java ! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java From alejandro.murillo at oracle.com Mon Jun 22 20:08:56 2015 From: alejandro.murillo at oracle.com (alejandro.murillo at oracle.com) Date: Mon, 22 Jun 2015 20:08:56 +0000 Subject: hg: verona/stage/jdk: 8087202: Add support for PATCH field and remove unused fields of new version string Message-ID: <201506222008.t5MK8uqo004701@aojmv0008.oracle.com> Changeset: 60387e5d6822 Author: amurillo Date: 2015-06-19 10:58 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/60387e5d6822 8087202: Add support for PATCH field and remove unused fields of new version string Reviewed-by: dholmes, alanb ! make/mapfiles/libjava/mapfile-vers ! src/java.base/share/classes/sun/misc/Version.java.template ! src/java.base/share/native/include/jvm.h ! src/java.base/share/native/libjava/Version.c ! src/java.base/share/native/libjava/jdk_util.c ! test/sun/misc/Version/Version.java From magnus.ihse.bursie at oracle.com Thu Jun 25 22:46:19 2015 From: magnus.ihse.bursie at oracle.com (Magnus Ihse Bursie) Date: Fri, 26 Jun 2015 00:46:19 +0200 Subject: RFR: JDK-8087328: Move debuglevel info in version string from PRE to OPT In-Reply-To: <558C014A.5030807@oracle.com> References: <558C014A.5030807@oracle.com> Message-ID: <558C84BB.1030601@oracle.com> On 2015-06-25 15:25, Erik Joelsson wrote: > Hello, > > Please review this change to the new build number implementation in > project Verona. This change is intended to go into the verona forest > for now until it's time for integration into jdk9. > > In Magnus' original version string implementation, the debuglevel > information is encoded into the PRE string. According to the latest > status of JEP-223, it should rather be a part of the OPT string. In > this patch, I have made that move. > > This means that the (relevant) configure options have changed from: > > --with-version-pre-base > --with-version-pre-debuglevel > --with-version-opt > > into: > > --with-version-pre > --with-version-opt-base > --with-version-opt-debuglevel > > I also had to introduce some way of telling the OPT_BASE string apart > from the OPT_DEBUGLEVEL string when parsing a full version string. In > the PRE string, the separator was a '.' but since that character is a > valid part of the OPT string, something else is needed. I went with > underscore '_' for now. > > Bug: https://bugs.openjdk.java.net/browse/JDK-8087328 > Webrev: http://cr.openjdk.java.net/~erikj/8087328/webrev.01/ Looks good to me. Note that this solution will require an update to the JEP-223 spec, to allow underscore (_) to be an allowed character in the OPT string. (Since, from the spec's point, both OPT_BASE and OPT_DEBUGLEVEL are arbitrary divisions of the formal OPT string.) /Magnus From iris.clark at oracle.com Fri Jun 26 17:24:56 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Fri, 26 Jun 2015 17:24:56 +0000 Subject: hg: verona/stage: 2 new changesets Message-ID: <201506261724.t5QHOubS015671@aojmv0008.oracle.com> Changeset: b0f70258d774 Author: erikj Date: 2015-06-26 10:02 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/b0f70258d774 8087328: Move debuglevel info in version string from PRE to OPT Reviewed-by: ihse ! common/autoconf/generated-configure.sh ! common/autoconf/jdk-version.m4 ! make/jprt.properties Changeset: c05542651555 Author: erikj Date: 2015-06-26 10:09 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/c05542651555 8087329: Introduce VERSION_IS_GA Reviewed-by: ihse ! common/autoconf/jdk-version.m4 ! common/autoconf/spec.gmk.in ! make/Javadoc.gmk From kumar.x.srinivasan at oracle.com Fri Jun 26 22:16:50 2015 From: kumar.x.srinivasan at oracle.com (kumar.x.srinivasan at oracle.com) Date: Fri, 26 Jun 2015 22:16:50 +0000 Subject: hg: verona/stage/jdk: 8129601: [launcher] test VersionCheck.java fails with new version string Message-ID: <201506262216.t5QMGoLd026956@aojmv0008.oracle.com> Changeset: 6e98b46d77cc Author: ksrini Date: 2015-06-26 15:15 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/6e98b46d77cc 8129601: [launcher] test VersionCheck.java fails with new version string Reviewed-by: alanb ! src/java.base/share/native/launcher/defines.h ! src/java.base/share/native/libjli/java.c ! src/java.base/share/native/libjli/java.h ! test/tools/launcher/VersionCheck.java From iris.clark at oracle.com Tue Jun 30 19:11:52 2015 From: iris.clark at oracle.com (Iris Clark) Date: Tue, 30 Jun 2015 12:11:52 -0700 (PDT) Subject: Verona spec: Trailing zeros Message-ID: <9cca5df9-1557-4412-ac68-7eb995bf53fa@default> Hi. The JEP is inconsistent with regard to trailing zeros in the version number. I've made the following modifications: - The definition of the version number is modified to remove trailing zeros. - The paragraph defining the short version string `$SVSTR`, in the "Version string" section was split. The examples of trailing zero elimination were moved to the earlier "Version number" section. The definition of the short version string remains in the original location. - Examples were adjusted to remove trailing zeros as necessary. I've appended complete diffs. As always, please let me know if there are any concersn. Regards, iris ----- 102,103c102,103 < A _version number_ is a non-empty sequence of non-negative integer < numerals, without leading zeroes, separated by period characters --- > A _version number_, `$VNUM`, is a non-empty sequence of non-negative integer > numerals, without leading or trailing zeroes, separated by period characters 105c105 < `[1-9][0-9]*(\.(0|[1-9][0-9]*))*`. The sequence may be of arbitrary --- > `^[1-9][0-9]*(((\.0)*\.[1-9][0-9]*)*)*$`. The sequence may be of arbitrary 145a146,149 > The version number does not include trailing zero elements; _i.e._, > `$SECURITY` is omitted if it has the value zero, and `$MINOR` is omitted > if both `$MINOR` and `$SECURITY` have the value zero. > 187,191c191,192 < A _short version string_, often useful in less formal contexts, is simply < `$MAJOR.$MINOR.$SECURITY` with trailing zero elements omitted; _i.e._, < `$SECURITY` is omitted if it has the value zero, and `$MINOR` is omitted < if both `$MINOR` and `$SECURITY` have the value zero. A short version < string may optionally end with `-$PRE`. --- > A _short version string_ (`$SVSTR`), often useful in less formal contexts, is simply > `$VNUM` optionally ended with `-$PRE`. 199,200c200,201 < Early Access 1.9.0-ea-b19 9-ea 9.0.0-ea+19 9-ea < Major 1.9.0-b100 9 9.0.0+100 9 --- > Early Access 1.9.0-ea-b19 9-ea 9-ea+19 9-ea > Major 1.9.0-b100 9 9+100 9 From iris.clark at oracle.com Tue Jun 30 21:33:45 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:33:45 +0000 Subject: hg: verona/stage: 15 new changesets Message-ID: <201506302133.t5ULXjfH015565@aojmv0008.oracle.com> Changeset: 1c108ef5166c Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/1c108ef5166c Added tag jdk9-b68 for changeset 70e4272790b6 ! .hgtags Changeset: 609627f9db3f Author: ykantser Date: 2015-05-28 16:31 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/609627f9db3f 8081037: serviceability/sa/ tests time out on Windows Reviewed-by: jbachorik, sla, dsamersoff + test/lib-test/jdk/test/lib/apps/LingeredAppTest.java ! test/lib/Makefile + test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java Changeset: cd00a294f85b Author: amurillo Date: 2015-06-04 15:37 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/cd00a294f85b Merge Changeset: e8592d0ee9e3 Author: amurillo Date: 2015-06-08 11:11 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/e8592d0ee9e3 Merge Changeset: 64127d0dca36 Author: alundblad Date: 2015-06-09 16:08 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/64127d0dca36 8054717: SJavac should track changes in the public apis of classpath classes! Summary: Adjusted Java compilation to accomodate for changes to sjavac. Reviewed-by: erikj ! make/CompileJavaModules.gmk ! make/common/JavaCompilation.gmk Changeset: b42f35b0dbff Author: omajid Date: 2015-06-11 10:37 -0400 URL: http://hg.openjdk.java.net/verona/stage/rev/b42f35b0dbff 8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files Reviewed-by: erikj ! make/common/NativeCompilation.gmk Changeset: 1bcfd6b87265 Author: lana Date: 2015-06-11 20:18 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/1bcfd6b87265 Merge Changeset: 259220e988ca Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/259220e988ca Added tag jdk9-b69 for changeset 1bcfd6b87265 ! .hgtags Changeset: 704d642602d3 Author: darcy Date: 2015-06-16 16:11 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/704d642602d3 8098579: Remove non-existent javax.tools.annotation package from CORE_PKGS.gmk Reviewed-by: jjg ! make/common/CORE_PKGS.gmk Changeset: 206dae1f6320 Author: erikj Date: 2015-06-18 10:08 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/206dae1f6320 8087193: Support building with devkits on Macosx Reviewed-by: ihse ! common/autoconf/basics.m4 ! common/autoconf/build-aux/config.guess ! common/autoconf/generated-configure.sh + make/devkit/createMacosxDevkit.sh Changeset: 1179a2aea1fa Author: erikj Date: 2015-06-18 10:15 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/1179a2aea1fa 8087208: Add devkit creation script for windows Reviewed-by: ihse + make/devkit/createWindowsDevkit.sh Changeset: cba23c240bb3 Author: erikj Date: 2015-06-18 17:00 +0200 URL: http://hg.openjdk.java.net/verona/stage/rev/cba23c240bb3 8080915: [macosx] JDK 9 installation does not add java info to the java_home plist Reviewed-by: tbell ! make/MacBundles.gmk Changeset: eed77fcd7771 Author: lana Date: 2015-06-18 10:23 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/eed77fcd7771 Merge Changeset: 6d1e100d3687 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/6d1e100d3687 Added tag jdk9-b70 for changeset eed77fcd7771 ! .hgtags Changeset: d9a9395e80b6 Author: iris Date: 2015-06-29 13:35 -0700 URL: http://hg.openjdk.java.net/verona/stage/rev/d9a9395e80b6 Merge ! common/autoconf/generated-configure.sh - common/bin/test_builds.sh ! make/MacBundles.gmk From iris.clark at oracle.com Tue Jun 30 21:34:01 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:34:01 +0000 Subject: hg: verona/stage/corba: 7 new changesets Message-ID: <201506302134.t5ULY1iX015621@aojmv0008.oracle.com> Changeset: 230f393dbe3f Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/230f393dbe3f Added tag jdk9-b68 for changeset 8efad64f40eb ! .hgtags Changeset: e57aa88c63c1 Author: robm Date: 2015-06-08 21:32 +0100 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/e57aa88c63c1 7130985: Four helper classes missing in Sun JDK Reviewed-by: coffeys, msheppar + src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java + src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java + src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java + src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java Changeset: de8acedcb5b5 Author: lana Date: 2015-06-11 20:19 -0700 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/de8acedcb5b5 Merge Changeset: 055e8b15628c Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/055e8b15628c Added tag jdk9-b69 for changeset de8acedcb5b5 ! .hgtags Changeset: c43da2a11652 Author: darcy Date: 2015-06-12 17:33 -0700 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/c43da2a11652 8086029: Fix doclint reference warnings in org.omg.CORBA Reviewed-by: lancea, alanb ! src/java.corba/share/classes/org/omg/CORBA/DynAny.java ! src/java.corba/share/classes/org/omg/CORBA/DynArray.java ! src/java.corba/share/classes/org/omg/CORBA/DynSequence.java ! src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java Changeset: e7cf01990ed3 Author: lana Date: 2015-06-18 10:24 -0700 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/e7cf01990ed3 Merge Changeset: cd39ed501fb0 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/corba/rev/cd39ed501fb0 Added tag jdk9-b70 for changeset e7cf01990ed3 ! .hgtags From iris.clark at oracle.com Tue Jun 30 21:34:28 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:34:28 +0000 Subject: hg: verona/stage/jaxp: 11 new changesets Message-ID: <201506302134.t5ULYS70015763@aojmv0008.oracle.com> Changeset: 9a5a17025007 Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/9a5a17025007 Added tag jdk9-b68 for changeset 82aae947938e ! .hgtags Changeset: 48585e5e65d2 Author: joehw Date: 2015-06-08 21:59 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/48585e5e65d2 8080906: Develop test for Xerces Update: DOM L3 Serializer Reviewed-by: lancea, joehw Contributed-by: frank.yuan at oracle.com ! test/javax/xml/jaxp/functional/TEST.properties ! test/javax/xml/jaxp/unittest/TEST.properties ! test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java Changeset: f424712eaede Author: joehw Date: 2015-06-08 22:08 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/f424712eaede 8080908: Develop test for Xerces Update: XPointer Reviewed-by: lancea, joehw Contributed-by: frank.yuan at oracle.com ! test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java Changeset: f844a908d330 Author: lana Date: 2015-06-11 20:18 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/f844a908d330 Merge Changeset: 22ae200ce8a2 Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/22ae200ce8a2 Added tag jdk9-b69 for changeset f844a908d330 ! .hgtags Changeset: c494d4d1c5a1 Author: mullan Date: 2015-06-12 16:36 -0400 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/c494d4d1c5a1 8087283: Add support for the XML Signature here() function to the JDK XPath implementation Reviewed-by: alanb, joehw ! src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java ! src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java + src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java Changeset: 1b8665c5aa91 Author: mullan Date: 2015-06-12 16:39 -0400 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/1b8665c5aa91 Merge Changeset: 06e3ee9962f6 Author: joehw Date: 2015-06-15 09:25 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/06e3ee9962f6 8080907: Develop test for Xerces Update: XML Schema Validation Reviewed-by: lancea, joehw Contributed-by: frank.yuan at oracle.com ! test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java ! test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java + test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java + test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml + test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml + test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd Changeset: 42180703e0a3 Author: lana Date: 2015-06-18 10:25 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/42180703e0a3 Merge Changeset: eaf71890d8a0 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/eaf71890d8a0 Added tag jdk9-b70 for changeset 42180703e0a3 ! .hgtags Changeset: ac13455e4d91 Author: iris Date: 2015-06-29 11:27 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxp/rev/ac13455e4d91 Merge From iris.clark at oracle.com Tue Jun 30 21:34:41 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:34:41 +0000 Subject: hg: verona/stage/jaxws: 5 new changesets Message-ID: <201506302134.t5ULYfOX015819@aojmv0008.oracle.com> Changeset: 53993d421b2b Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxws/rev/53993d421b2b Added tag jdk9-b68 for changeset b5878b03d1b2 ! .hgtags Changeset: 884d98e00032 Author: mkos Date: 2015-06-05 15:05 +0200 URL: http://hg.openjdk.java.net/verona/stage/jaxws/rev/884d98e00032 8072839: JAX-B Plugability Layer: using java.util.ServiceLoader Reviewed-by: alanb ! src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java ! src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java + src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java ! src/java.xml.bind/share/classes/javax/xml/bind/ServiceLoaderUtil.java Changeset: f5911c6155c2 Author: lana Date: 2015-06-11 20:20 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxws/rev/f5911c6155c2 Merge Changeset: 94084caa27a3 Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxws/rev/94084caa27a3 Added tag jdk9-b69 for changeset f5911c6155c2 ! .hgtags Changeset: 48152db798f9 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/jaxws/rev/48152db798f9 Added tag jdk9-b70 for changeset 94084caa27a3 ! .hgtags From iris.clark at oracle.com Tue Jun 30 21:35:23 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:35:23 +0000 Subject: hg: verona/stage/langtools: 12 new changesets Message-ID: <201506302135.t5ULZNpA016059@aojmv0008.oracle.com> Changeset: 6b73cefc3b06 Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/6b73cefc3b06 Added tag jdk9-b68 for changeset c71857c93f57 ! .hgtags Changeset: 8d7f82e6d1b5 Author: sadayapalam Date: 2015-06-05 18:43 +0530 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/8d7f82e6d1b5 8081521: Compiler has trouble compiling nested diamond allocation constructs involving anonymous classes. Reviewed-by: mcimadamore ! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java + test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java Changeset: 098657cc98c9 Author: jlahoda Date: 2015-06-09 11:52 +0200 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/098657cc98c9 8082311: NPE when compiling expression with \"^\" Summary: Using BinaryNumericOperator for numeric bitwise operators and BinaryBooleanOperator for boolean bitwise operators, as the common BinaryBitwiseOperator allowed to incorrectly combine numeric and boolean operands Reviewed-by: mcimadamore ! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Operators.java + test/tools/javac/resolve/BitWiseOperators.java Changeset: 27da0c3ac83a Author: alundblad Date: 2015-06-09 15:57 +0200 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/27da0c3ac83a 8054717: SJavac should track changes in the public apis of classpath classes! Summary: Added functionality for tracking changes in public APIs of classpath classes. Reviewed-by: jlahoda, erikj ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/BuildState.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/CleanProperties.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileProperties.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/CopyFile.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/JavacState.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/Source.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/ClientMain.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubAPIs.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/Dependency.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/DependencyCollector.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/DependencyScanner.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/NewDependencyCollector.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PackageDependency.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PublicApiCollector.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/TypeAndSupertypesDependency.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApiTypeParam.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java + src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/ServerMain.java + test/tools/sjavac/ApiExtraction.java + test/tools/sjavac/ClasspathDependencies.java ! test/tools/sjavac/CompileCircularSources.java ! test/tools/sjavac/CompileExcludingDependency.java ! test/tools/sjavac/CompileWithAtFile.java ! test/tools/sjavac/CompileWithInvisibleSources.java ! test/tools/sjavac/CompileWithOverrideSources.java - test/tools/sjavac/DependencyCollection.java ! test/tools/sjavac/IncCompInheritance.java ! test/tools/sjavac/IncCompileChangeNative.java ! test/tools/sjavac/IncCompileDropClasses.java ! test/tools/sjavac/IncCompileFullyQualifiedRef.java ! test/tools/sjavac/IncCompileNoChanges.java ! test/tools/sjavac/IncCompileUpdateNative.java ! test/tools/sjavac/IncCompileWithChanges.java ! test/tools/sjavac/JavacOptionPrep.java ! test/tools/sjavac/PermittedArtifact.java ! test/tools/sjavac/SJavacTester.java ! test/tools/sjavac/SjavacBase.java ! test/tools/sjavac/StateDir.java - test/tools/sjavac/test-input/src/nondependency/pkg26/Cls26.java - test/tools/sjavac/test-input/src/pkg/Test.java - test/tools/sjavac/test-input/src/pkg10/Cls10.java - test/tools/sjavac/test-input/src/pkg11/Cls11.java - test/tools/sjavac/test-input/src/pkg12/Cls12.java - test/tools/sjavac/test-input/src/pkg13/Cls13.java - test/tools/sjavac/test-input/src/pkg14/Cls14.java - test/tools/sjavac/test-input/src/pkg15/Cls15.java - test/tools/sjavac/test-input/src/pkg16/Cls16.java - test/tools/sjavac/test-input/src/pkg17/Cls17.java - test/tools/sjavac/test-input/src/pkg18/Cls18.java - test/tools/sjavac/test-input/src/pkg19/Cls19.java - test/tools/sjavac/test-input/src/pkg2/Cls2.java - test/tools/sjavac/test-input/src/pkg20/Anno20.java - test/tools/sjavac/test-input/src/pkg21/Cls21.java - test/tools/sjavac/test-input/src/pkg22/Anno22.java - test/tools/sjavac/test-input/src/pkg23/Cls23.java - test/tools/sjavac/test-input/src/pkg24/Cls24.java - test/tools/sjavac/test-input/src/pkg25/Cls25.java - test/tools/sjavac/test-input/src/pkg27/Cls27.java - test/tools/sjavac/test-input/src/pkg28/Cls28.java - test/tools/sjavac/test-input/src/pkg29/Cls29.java - test/tools/sjavac/test-input/src/pkg3/Cls3.java - test/tools/sjavac/test-input/src/pkg30/Cls30.java - test/tools/sjavac/test-input/src/pkg4/Cls4.java - test/tools/sjavac/test-input/src/pkg5/Anno5.java - test/tools/sjavac/test-input/src/pkg6/Cls6.java - test/tools/sjavac/test-input/src/pkg7/Cls7.java - test/tools/sjavac/test-input/src/pkg8/Cls8.java - test/tools/sjavac/test-input/src/pkg9/Cls9.java Changeset: 5021d414632a Author: alundblad Date: 2015-06-10 11:18 +0200 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/5021d414632a 8087115: Due to a javac type inference issue, sjavac doesn't compile with 8u31 Summary: Added explicit type arguments. Reviewed-by: jlahoda ! src/jdk.compiler/share/classes/com/sun/tools/sjavac/Util.java Changeset: 931ec7dd6cd9 Author: lana Date: 2015-06-11 20:19 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/931ec7dd6cd9 Merge - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/Dependencies.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/Dependency.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/DependencyCollector.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/DependencyScanner.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/PackageDependency.java - src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/dependencies/TypeAndSupertypesDependency.java - test/tools/sjavac/DependencyCollection.java - test/tools/sjavac/test-input/src/nondependency/pkg26/Cls26.java - test/tools/sjavac/test-input/src/pkg/Test.java - test/tools/sjavac/test-input/src/pkg10/Cls10.java - test/tools/sjavac/test-input/src/pkg11/Cls11.java - test/tools/sjavac/test-input/src/pkg12/Cls12.java - test/tools/sjavac/test-input/src/pkg13/Cls13.java - test/tools/sjavac/test-input/src/pkg14/Cls14.java - test/tools/sjavac/test-input/src/pkg15/Cls15.java - test/tools/sjavac/test-input/src/pkg16/Cls16.java - test/tools/sjavac/test-input/src/pkg17/Cls17.java - test/tools/sjavac/test-input/src/pkg18/Cls18.java - test/tools/sjavac/test-input/src/pkg19/Cls19.java - test/tools/sjavac/test-input/src/pkg2/Cls2.java - test/tools/sjavac/test-input/src/pkg20/Anno20.java - test/tools/sjavac/test-input/src/pkg21/Cls21.java - test/tools/sjavac/test-input/src/pkg22/Anno22.java - test/tools/sjavac/test-input/src/pkg23/Cls23.java - test/tools/sjavac/test-input/src/pkg24/Cls24.java - test/tools/sjavac/test-input/src/pkg25/Cls25.java - test/tools/sjavac/test-input/src/pkg27/Cls27.java - test/tools/sjavac/test-input/src/pkg28/Cls28.java - test/tools/sjavac/test-input/src/pkg29/Cls29.java - test/tools/sjavac/test-input/src/pkg3/Cls3.java - test/tools/sjavac/test-input/src/pkg30/Cls30.java - test/tools/sjavac/test-input/src/pkg4/Cls4.java - test/tools/sjavac/test-input/src/pkg5/Anno5.java - test/tools/sjavac/test-input/src/pkg6/Cls6.java - test/tools/sjavac/test-input/src/pkg7/Cls7.java - test/tools/sjavac/test-input/src/pkg8/Cls8.java - test/tools/sjavac/test-input/src/pkg9/Cls9.java Changeset: 4a25f748d584 Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/4a25f748d584 Added tag jdk9-b69 for changeset 931ec7dd6cd9 ! .hgtags Changeset: c6f2ffcc44b9 Author: sadayapalam Date: 2015-06-16 09:39 +0530 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/c6f2ffcc44b9 8074346: Type annotation on a qualified type causes spurious 'cannot find symbol' errors Summary: Issue clear diagostic when package names in a qualified type name are illegally annotated Reviewed-by: mcimadamore, jlahoda ! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java ! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java ! test/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out + test/tools/javac/annotations/typeAnnotations/failures/T8074346.java + test/tools/javac/annotations/typeAnnotations/failures/T8074346.out Changeset: 5032dfdc37be Author: sogoel Date: 2015-06-17 13:20 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/5032dfdc37be 8080826: Group 15: golden files for tests in tools/javac/generics/type* dirs Reviewed-by: jjg ! test/tools/javac/generics/typeargs/Metharg1.java + test/tools/javac/generics/typeargs/Metharg1.out ! test/tools/javac/generics/typeargs/Metharg2.java + test/tools/javac/generics/typeargs/Metharg2.out ! test/tools/javac/generics/typeargs/Newarg1.java + test/tools/javac/generics/typeargs/Newarg1.out ! test/tools/javac/generics/typeargs/Newarg2.java + test/tools/javac/generics/typeargs/Newarg2.out ! test/tools/javac/generics/typeargs/Superarg1.java + test/tools/javac/generics/typeargs/Superarg1.out ! test/tools/javac/generics/typeargs/Superarg2.java + test/tools/javac/generics/typeargs/Superarg2.out ! test/tools/javac/generics/typeargs/ThisArg.java + test/tools/javac/generics/typeargs/ThisArg.out ! test/tools/javac/generics/typevars/4856983/T4856983.java ! test/tools/javac/generics/typevars/4856983/T4856983a.java + test/tools/javac/generics/typevars/4856983/T4856983a.out ! test/tools/javac/generics/typevars/4856983/T4856983b.java + test/tools/javac/generics/typevars/4856983/T4856983b.out ! test/tools/javac/generics/typevars/6182630/T6182630.java + test/tools/javac/generics/typevars/6182630/T6182630.out - test/tools/javac/generics/typevars/6182630/T6182630a.java - test/tools/javac/generics/typevars/6182630/T6182630b.java - test/tools/javac/generics/typevars/6182630/T6182630c.java - test/tools/javac/generics/typevars/6182630/T6182630d.java - test/tools/javac/generics/typevars/6182630/T6182630e.java - test/tools/javac/generics/typevars/6182630/T6182630f.java Changeset: d732d6dfa727 Author: lana Date: 2015-06-18 10:24 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/d732d6dfa727 Merge - test/tools/javac/generics/typevars/6182630/T6182630a.java - test/tools/javac/generics/typevars/6182630/T6182630b.java - test/tools/javac/generics/typevars/6182630/T6182630c.java - test/tools/javac/generics/typevars/6182630/T6182630d.java - test/tools/javac/generics/typevars/6182630/T6182630e.java - test/tools/javac/generics/typevars/6182630/T6182630f.java Changeset: f499b0395ae8 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/f499b0395ae8 Added tag jdk9-b70 for changeset d732d6dfa727 ! .hgtags Changeset: 3dcd49bf840c Author: iris Date: 2015-06-29 11:28 -0700 URL: http://hg.openjdk.java.net/verona/stage/langtools/rev/3dcd49bf840c Merge From iris.clark at oracle.com Tue Jun 30 21:35:40 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:35:40 +0000 Subject: hg: verona/stage/nashorn: 23 new changesets Message-ID: <201506302135.t5ULZeSH016165@aojmv0008.oracle.com> Changeset: 179b3de401eb Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/179b3de401eb Added tag jdk9-b68 for changeset dd6dd848b854 ! .hgtags Changeset: 0eeaadd17fff Author: mhaupt Date: 2015-06-05 12:38 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/0eeaadd17fff 8080087: Nashorn $ENV.PWD is originally undefined Summary: On Windows, the PWD environment variable does not exist and cannot be imported in scripting mode, so it is set explicitly. Reviewed-by: lagergren, sundar ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java + test/script/nosecurity/JDK-8080087.js Changeset: 15a67b4f8935 Author: sundar Date: 2015-06-05 19:05 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/15a67b4f8935 8085810: Return value of Objects.requireNonNull call can be used Reviewed-by: lagergren, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ParserImpl.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompileUnit.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java Changeset: 09d538ef34f2 Author: sundar Date: 2015-06-08 13:57 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/09d538ef34f2 8085802: Nashorn -nse option causes parse error on anonymous function definition Reviewed-by: lagergren, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java + test/script/basic/JDK-8085802.js Changeset: b8ea01a76cbc Author: sundar Date: 2015-06-08 14:10 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/b8ea01a76cbc 8085937: add autoimports sample script to easily explore Java classes in interactive mode Reviewed-by: lagergren, attila + samples/autoimports.js + samples/dateconversion.js + samples/secondssince.js Changeset: d1689c1df3aa Author: mhaupt Date: 2015-06-08 10:28 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/d1689c1df3aa 8085885: address Javadoc warnings in Nashorn source code Reviewed-by: hannesw, lagergren ! src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/DynamicLinker.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ClassEmitter.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Constructor.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Function.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Getter.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/ScriptClass.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/Setter.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/JSONParser.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/TokenType.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java Changeset: 87f156db0b42 Author: sundar Date: 2015-06-09 14:19 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/87f156db0b42 8086032: Add compiler error tests when syntax extensions are used with --no-syntax-extensions option Reviewed-by: attila, hannesw + samples/javahelp.js + test/script/error/anon_func_stat_nse.js + test/script/error/anon_func_stat_nse.js.EXPECTED + test/script/error/backquote_string_nse.js + test/script/error/backquote_string_nse.js.EXPECTED + test/script/error/conditional_catch_nse.js + test/script/error/conditional_catch_nse.js.EXPECTED + test/script/error/expr_closure_nse.js + test/script/error/expr_closure_nse.js.EXPECTED + test/script/error/for_each_nse.js + test/script/error/for_each_nse.js.EXPECTED + test/script/error/hash_comment_nse.js + test/script/error/hash_comment_nse.js.EXPECTED + test/script/error/heredoc_nse.js + test/script/error/heredoc_nse.js.EXPECTED + test/script/error/object_literal_in_new_nse.js + test/script/error/object_literal_in_new_nse.js.EXPECTED Changeset: a24cb0bf79bc Author: mhaupt Date: 2015-06-09 09:27 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/a24cb0bf79bc 8080490: add $EXECV command to Nashorn scripting mode Summary: Additional arguments to the command line can be passed as a single array, or as a sequence of varargs. Reviewed-by: attila, hannesw + samples/exec.js ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java Changeset: 2e50107b1738 Author: sundar Date: 2015-06-11 13:33 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/2e50107b1738 8087136: regression: apply on $EXEC fails with ClassCastException Reviewed-by: hannesw, lagergren ! samples/exec.js ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java Changeset: 194b74467afc Author: lana Date: 2015-06-11 20:19 -0700 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/194b74467afc Merge Changeset: faf853661f14 Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/faf853661f14 Added tag jdk9-b69 for changeset 194b74467afc ! .hgtags Changeset: 5808c1886a90 Author: sundar Date: 2015-06-12 16:55 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/5808c1886a90 8087211: Indirect evals should be strict with -strict option Reviewed-by: lagergren, hannesw ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFunction.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/DebuggerSupport.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java + test/script/basic/JDK-8087211.js + test/script/basic/JDK-8087211_2.js ! test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java Changeset: bd783ddc4333 Author: hannesw Date: 2015-06-15 15:37 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/bd783ddc4333 8086052: Script evaluation should not return last function declaration Reviewed-by: sundar, attila ! samples/javahelp.js ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java ! test/script/basic/evalreturn.js ! test/script/basic/evalreturn.js.EXPECTED ! test/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java Changeset: 0e28af5ee013 Author: hannesw Date: 2015-06-15 15:49 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/0e28af5ee013 8098546: eval within a 'with' leaks definitions into global scope Reviewed-by: sundar, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java + test/script/basic/JDK-8098546.js Changeset: 8f389acf77f0 Author: hannesw Date: 2015-06-16 13:25 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/8f389acf77f0 8098807: Strict eval throws ClassCastException with large scripts Reviewed-by: sundar, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Compiler.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java + test/script/basic/JDK-8098807-payload.js + test/script/basic/JDK-8098807.js Changeset: 87f7ef8273bc Author: sundar Date: 2015-06-16 18:26 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/87f7ef8273bc 8098578: Global scope is not accessible with indirect load call Reviewed-by: attila, hannesw ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java + test/script/basic/JDK-8098578.js Changeset: 93e4c151d6cc Author: hannesw Date: 2015-06-17 09:10 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/93e4c151d6cc 8087312: PropertyMapWrapper.equals should compare className Reviewed-by: sundar, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/ConstantData.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/PropertyMap.java + test/script/basic/JDK-8087312.js Changeset: 7e06231229fd Author: sundar Date: 2015-06-17 14:21 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/7e06231229fd 8098847: obj."prop" and obj.'prop' should result in SyntaxError Reviewed-by: hannesw, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/BooleanType.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/AbstractParser.java + test/script/error/JDK-8098847.js + test/script/error/JDK-8098847.js.EXPECTED Changeset: cd94e97584a0 Author: hannesw Date: 2015-06-17 13:56 +0200 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/cd94e97584a0 8098808: Convert Scope from interface to class Reviewed-by: sundar, attila ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/Global.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDebug.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/FunctionScope.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Scope.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java Changeset: a35490e96dc5 Author: sundar Date: 2015-06-18 19:20 +0530 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/a35490e96dc5 8117883: nasgen prototype, instance member count calculation is wrong Reviewed-by: hannesw, lagergren ! buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java ! buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java ! buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java ! buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java ! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java Changeset: 3379235149c0 Author: lana Date: 2015-06-18 10:24 -0700 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/3379235149c0 Merge Changeset: 3951ff3b5272 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/3951ff3b5272 Added tag jdk9-b70 for changeset 3379235149c0 ! .hgtags Changeset: 364d69b6e2aa Author: iris Date: 2015-06-29 11:28 -0700 URL: http://hg.openjdk.java.net/verona/stage/nashorn/rev/364d69b6e2aa Merge - src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template From iris.clark at oracle.com Tue Jun 30 21:34:18 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:34:18 +0000 Subject: hg: verona/stage/hotspot: 50 new changesets Message-ID: <201506302134.t5ULYIPM015709@aojmv0008.oracle.com> Changeset: c25bfaaed7f2 Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/c25bfaaed7f2 Added tag jdk9-b68 for changeset 11af3990d56c ! .hgtags Changeset: 2ece51774dfa Author: ykantser Date: 2015-05-27 14:13 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/2ece51774dfa 8081037: serviceability/sa/ tests time out on Windows Reviewed-by: jbachorik, sla, dsamersoff ! test/serviceability/sa/TestClassLoaderStats.java ! test/serviceability/sa/TestStackTrace.java Changeset: 6b9feb52df5d Author: coleenp Date: 2015-05-29 11:35 -0400 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/6b9feb52df5d 8029567: Clean up linkResolver code Summary: Moved non-const reference return values to actual return values, refactored error handling code, remove oop from Method* variable names. Reviewed-by: jiangli, lfoltan, acorn ! src/share/vm/ci/ciEnv.cpp ! src/share/vm/ci/ciField.cpp ! src/share/vm/ci/ciMethod.cpp ! src/share/vm/interpreter/bytecode.cpp ! src/share/vm/interpreter/linkResolver.cpp ! src/share/vm/interpreter/linkResolver.hpp ! src/share/vm/oops/klassVtable.cpp ! src/share/vm/prims/methodHandles.cpp ! src/share/vm/runtime/javaCalls.cpp ! src/share/vm/runtime/reflection.cpp Changeset: 6c95d9792c36 Author: coleenp Date: 2015-05-29 21:49 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/6c95d9792c36 Merge Changeset: d8483508f78e Author: hseigel Date: 2015-05-29 15:23 -0400 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/d8483508f78e 8076319: jstat verified class fix Summary: Move verify perf data so that it only counts classes that actually get verified. Reviewed-by: acorn, coleenp, gtriantafill ! src/share/vm/classfile/verifier.cpp ! src/share/vm/oops/instanceKlass.cpp Changeset: 8320c1c5826c Author: hseigel Date: 2015-05-29 23:19 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/8320c1c5826c Merge Changeset: b1379cdd6933 Author: ysuenaga Date: 2015-05-29 22:29 +0900 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/b1379cdd6933 8081475: SystemTap does not work when JDK is compiled with GCC 5 Summary: libjvm.so which is generated by GCC 5 does not have .note.stapsdt section as dtrace was disabled due to incorrect version check Reviewed-by: dholmes, coleenp ! make/linux/makefiles/dtrace.make Changeset: e236fc2b593e Author: sla Date: 2015-05-29 09:48 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/e236fc2b593e 8080928: Uninitialised variable in hotspot/src/share/vm/prims/jvmtiEnvBase.cpp Reviewed-by: mgronlun, sspitsyn ! src/share/vm/prims/jvmtiEnvBase.cpp Changeset: 1be53aada8de Author: ctornqvi Date: 2015-06-01 14:01 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/1be53aada8de 8080446: The change for 8074354 removed the server check when creating minidumps on Windows Reviewed-by: sla, hseigel ! src/os/windows/vm/os_windows.cpp Changeset: 0d3c3c622f96 Author: ctornqvi Date: 2015-06-01 14:02 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/0d3c3c622f96 8080718: Make -XX:CreateCoredumpOnCrash control core dumping in all cases Reviewed-by: sla, dholmes, gtriantafill ! src/os/aix/vm/os_aix.cpp ! src/os/bsd/vm/os_bsd.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/runtime/os.cpp Changeset: 3cd78165832b Author: aeriksso Date: 2015-06-02 10:41 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/3cd78165832b 8072588: JVM crashes in JNI if toString is declared as an interface method Summary: Check for a valid itable index instead of checking if the holder is an interface Reviewed-by: dsimms, dholmes ! make/test/JtregNative.gmk ! src/share/vm/prims/jni.cpp + test/runtime/jni/ToStringInInterfaceTest/ImplementationOfWithToString.java + test/runtime/jni/ToStringInInterfaceTest/InterfaceWithToString.java + test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java + test/runtime/jni/ToStringInInterfaceTest/libToStringTest.c Changeset: 93db43e47ad9 Author: jprovino Date: 2015-05-29 10:44 -0400 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/93db43e47ad9 8081508: metaspace/shrink_grow/CompressedClassSpaceSize fails with OOM: Compressed class space Summary: OOME is thrown even though there is metaspace available. Reviewed-by: jmasa, kbarrett ! src/share/vm/memory/metaspace.cpp Changeset: c8577f487c9e Author: kbarrett Date: 2015-06-02 19:19 -0400 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/c8577f487c9e 8076613: gc/TestSmallHeap.java failed with OOME Summary: Disable test when compressed oops are disabled. Reviewed-by: tschatzl, brutisso ! test/gc/TestSmallHeap.java Changeset: cb355530d9d5 Author: stefank Date: 2015-06-03 11:46 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/cb355530d9d5 8081682: AbstractWorkGang::_terminate is never used Reviewed-by: kbarrett, pliden, brutisso ! src/share/vm/gc/cms/yieldingWorkgroup.cpp ! src/share/vm/gc/cms/yieldingWorkgroup.hpp ! src/share/vm/gc/shared/workgroup.cpp ! src/share/vm/gc/shared/workgroup.hpp Changeset: bf8bc7afe941 Author: stefank Date: 2015-06-03 13:29 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/bf8bc7afe941 Merge Changeset: f08536ebf811 Author: ysuenaga Date: 2015-06-03 08:49 +0900 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/f08536ebf811 8072913: [REDO] GCCause should distinguish jcmd GC.run from System.gc() Summary: GCCause which is caused by GC.run diagnostic command should be different from System.gc() . Reviewed-by: jmasa, jwilhelm ! src/share/vm/gc/cms/vmCMSOperations.cpp ! src/share/vm/gc/g1/g1CollectedHeap.cpp ! src/share/vm/gc/g1/g1CollectedHeap.hpp ! src/share/vm/gc/g1/vm_operations_g1.cpp ! src/share/vm/gc/parallel/psAdaptiveSizePolicy.cpp ! src/share/vm/gc/parallel/psMarkSweep.cpp ! src/share/vm/gc/parallel/psParallelCompact.cpp ! src/share/vm/gc/parallel/psScavenge.cpp ! src/share/vm/gc/serial/defNewGeneration.cpp ! src/share/vm/gc/shared/adaptiveSizePolicy.cpp ! src/share/vm/gc/shared/gcCause.cpp ! src/share/vm/gc/shared/gcCause.hpp ! src/share/vm/gc/shared/genCollectedHeap.cpp ! src/share/vm/services/diagnosticCommand.cpp ! test/serviceability/dcmd/gc/RunGCTest.java Changeset: 41e47efcd333 Author: kbarrett Date: 2015-06-03 14:38 -0400 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/41e47efcd333 8079093: Remove FakeRttiSupport workaround for gcc -Wtype-limits Summary: Remove the no longer needed workaround. Reviewed-by: jmasa, david, simonis ! src/share/vm/utilities/fakeRttiSupport.hpp Changeset: a42faf811ff3 Author: jwilhelm Date: 2015-06-04 14:19 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/a42faf811ff3 Merge Changeset: ed9cc6871da2 Author: roland Date: 2015-05-21 13:54 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/ed9cc6871da2 8077504: Unsafe load can loose control dependency and cause crash Summary: Node::depends_only_on_test() should return false for Unsafe loads Reviewed-by: kvn, adinn ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/loopPredicate.cpp ! src/share/vm/opto/matcher.cpp ! src/share/vm/opto/memnode.cpp ! src/share/vm/opto/memnode.hpp ! src/share/vm/opto/parse3.cpp ! src/share/vm/opto/superword.cpp ! src/share/vm/opto/superword.hpp ! src/share/vm/opto/vectornode.cpp ! src/share/vm/opto/vectornode.hpp + test/compiler/unsafe/TestUnsafeLoadControl.java Changeset: 8dcc6e989b05 Author: vlivanov Date: 2015-05-15 19:21 +0300 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/8dcc6e989b05 8079135: C2 disables some optimizations when a large number of unique nodes exist Reviewed-by: kvn ! src/share/vm/opto/loopopts.cpp Changeset: 54b7b0210ad6 Author: vlivanov Date: 2015-05-15 19:23 +0300 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/54b7b0210ad6 8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared Reviewed-by: roland, psandoz, plevart, kbarrett, jrose ! src/share/vm/ci/ciCallSite.cpp ! src/share/vm/ci/ciCallSite.hpp ! src/share/vm/ci/ciInstanceKlass.cpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/classfile/javaClasses.inline.hpp ! src/share/vm/classfile/systemDictionary.hpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/code/codeCache.cpp ! src/share/vm/code/codeCache.hpp ! src/share/vm/code/dependencies.cpp ! src/share/vm/code/dependencies.hpp ! src/share/vm/code/nmethod.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/prims/methodHandles.cpp ! src/share/vm/prims/methodHandles.hpp ! test/compiler/jsr292/CallSiteDepContextTest.java Changeset: 9882a38fa0d2 Author: vlivanov Date: 2015-05-21 18:22 +0300 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/9882a38fa0d2 8059340: ConstantPool::_resolved_references is missing in heap dump Reviewed-by: sspitsyn, stefank, twisti ! src/cpu/aarch64/vm/interp_masm_aarch64.cpp ! src/cpu/aarch64/vm/interp_masm_aarch64.hpp ! src/cpu/sparc/vm/interp_masm_sparc.cpp ! src/cpu/sparc/vm/interp_masm_sparc.hpp ! src/cpu/x86/vm/interp_masm_x86.cpp ! src/cpu/x86/vm/interp_masm_x86.hpp ! src/share/vm/ci/ciStreams.cpp ! src/share/vm/classfile/classLoaderData.cpp ! src/share/vm/classfile/classLoaderData.hpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/oops/constantPool.cpp ! src/share/vm/oops/constantPool.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/prims/jvmtiRedefineClasses.cpp ! src/share/vm/runtime/vmStructs.cpp Changeset: 53707cf9a443 Author: aeriksso Date: 2015-05-21 16:49 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/53707cf9a443 8060036: C2: CmpU nodes can end up with wrong type information Summary: CmpU needs to be reprocessed by CCP when an AddI/SubI input's input type change Reviewed-by: mcberg, kvn, roland Contributed-by: andreas.eriksson at oracle.com ! src/share/vm/opto/phaseX.cpp Changeset: 99e126eedebb Author: roland Date: 2015-05-21 20:29 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/99e126eedebb Merge Changeset: 968044dba2a5 Author: thartmann Date: 2015-05-22 09:50 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/968044dba2a5 Merge - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java - agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java - agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java - agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java - agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java - agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java - agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java - agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/Space.java - agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java - agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java ! src/cpu/x86/vm/interp_masm_x86.cpp ! src/share/vm/classfile/classLoaderData.cpp ! src/share/vm/code/codeCache.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp - src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp - src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp - src/share/vm/gc_implementation/g1/collectionSetChooser.cpp - src/share/vm/gc_implementation/g1/collectionSetChooser.hpp - src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp - src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp - src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp - src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp - src/share/vm/gc_implementation/g1/concurrentMark.cpp - src/share/vm/gc_implementation/g1/concurrentMark.hpp - src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp - src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp - src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp - src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp - src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp - src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp - src/share/vm/gc_implementation/g1/evacuationInfo.hpp - src/share/vm/gc_implementation/g1/g1AllocRegion.cpp - src/share/vm/gc_implementation/g1/g1AllocRegion.hpp - src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp - src/share/vm/gc_implementation/g1/g1AllocationContext.hpp - src/share/vm/gc_implementation/g1/g1Allocator.cpp - src/share/vm/gc_implementation/g1/g1Allocator.hpp - src/share/vm/gc_implementation/g1/g1Allocator_ext.cpp - src/share/vm/gc_implementation/g1/g1BiasedArray.cpp - src/share/vm/gc_implementation/g1/g1BiasedArray.hpp - src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp - src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp - src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp - src/share/vm/gc_implementation/g1/g1CardCounts.cpp - src/share/vm/gc_implementation/g1/g1CardCounts.hpp - src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp - src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.hpp - src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp - src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp - src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp - src/share/vm/gc_implementation/g1/g1CollectedHeap_ext.cpp - src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp - src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp - src/share/vm/gc_implementation/g1/g1CollectorPolicy_ext.hpp - src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp - src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp - src/share/vm/gc_implementation/g1/g1EvacFailure.cpp - src/share/vm/gc_implementation/g1/g1EvacFailure.hpp - src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp - src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp - src/share/vm/gc_implementation/g1/g1HRPrinter.cpp - src/share/vm/gc_implementation/g1/g1HRPrinter.hpp - src/share/vm/gc_implementation/g1/g1HotCardCache.cpp - src/share/vm/gc_implementation/g1/g1HotCardCache.hpp - src/share/vm/gc_implementation/g1/g1InCSetState.hpp - src/share/vm/gc_implementation/g1/g1Log.cpp - src/share/vm/gc_implementation/g1/g1Log.hpp - src/share/vm/gc_implementation/g1/g1MMUTracker.cpp - src/share/vm/gc_implementation/g1/g1MMUTracker.hpp - src/share/vm/gc_implementation/g1/g1MarkSweep.cpp - src/share/vm/gc_implementation/g1/g1MarkSweep.hpp - src/share/vm/gc_implementation/g1/g1MarkSweep_ext.cpp - src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp - src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp - src/share/vm/gc_implementation/g1/g1OopClosures.cpp - src/share/vm/gc_implementation/g1/g1OopClosures.hpp - src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp - src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp - src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp - src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp - src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp - src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp - src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp - src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.hpp - src/share/vm/gc_implementation/g1/g1RemSet.cpp - src/share/vm/gc_implementation/g1/g1RemSet.hpp - src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp - src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp - src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp - src/share/vm/gc_implementation/g1/g1RootProcessor.cpp - src/share/vm/gc_implementation/g1/g1RootProcessor.hpp - src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp - src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp - src/share/vm/gc_implementation/g1/g1StringDedup.cpp - src/share/vm/gc_implementation/g1/g1StringDedup.hpp - src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp - src/share/vm/gc_implementation/g1/g1StringDedupQueue.hpp - src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp - src/share/vm/gc_implementation/g1/g1StringDedupStat.hpp - src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp - src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp - src/share/vm/gc_implementation/g1/g1StringDedupThread.cpp - src/share/vm/gc_implementation/g1/g1StringDedupThread.hpp - src/share/vm/gc_implementation/g1/g1YCTypes.hpp - src/share/vm/gc_implementation/g1/g1_globals.cpp - src/share/vm/gc_implementation/g1/g1_globals.hpp - src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp - src/share/vm/gc_implementation/g1/heapRegion.cpp - src/share/vm/gc_implementation/g1/heapRegion.hpp - src/share/vm/gc_implementation/g1/heapRegion.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionBounds.hpp - src/share/vm/gc_implementation/g1/heapRegionBounds.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionManager.cpp - src/share/vm/gc_implementation/g1/heapRegionManager.hpp - src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp - src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp - src/share/vm/gc_implementation/g1/heapRegionSet.cpp - src/share/vm/gc_implementation/g1/heapRegionSet.hpp - src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionType.cpp - src/share/vm/gc_implementation/g1/heapRegionType.hpp - src/share/vm/gc_implementation/g1/ptrQueue.cpp - src/share/vm/gc_implementation/g1/ptrQueue.hpp - src/share/vm/gc_implementation/g1/satbQueue.cpp - src/share/vm/gc_implementation/g1/satbQueue.hpp - src/share/vm/gc_implementation/g1/sparsePRT.cpp - src/share/vm/gc_implementation/g1/sparsePRT.hpp - src/share/vm/gc_implementation/g1/survRateGroup.cpp - src/share/vm/gc_implementation/g1/survRateGroup.hpp - src/share/vm/gc_implementation/g1/vmStructs_g1.hpp - src/share/vm/gc_implementation/g1/vm_operations_g1.cpp - src/share/vm/gc_implementation/g1/vm_operations_g1.hpp - src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp - src/share/vm/gc_implementation/parNew/parNewGeneration.cpp - src/share/vm/gc_implementation/parNew/parNewGeneration.hpp - src/share/vm/gc_implementation/parNew/parOopClosures.cpp - src/share/vm/gc_implementation/parNew/parOopClosures.hpp - src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp - src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp - src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp - src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp - src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp - src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp - src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp - src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp - src/share/vm/gc_implementation/parallelScavenge/generationSizer.cpp - src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp - src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp - src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp - src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp - src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp - src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp - src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp - src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp - src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp - src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp - src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp - src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp - src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp - src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp - src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp - src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp - src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp - src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp - src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp - src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp - src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp - src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp - src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp - src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp - src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp - src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp - src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp - src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp - src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp - src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp - src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp - src/share/vm/gc_implementation/shared/ageTable.cpp - src/share/vm/gc_implementation/shared/ageTable.hpp - src/share/vm/gc_implementation/shared/allocationStats.cpp - src/share/vm/gc_implementation/shared/allocationStats.hpp - src/share/vm/gc_implementation/shared/cSpaceCounters.cpp - src/share/vm/gc_implementation/shared/cSpaceCounters.hpp - src/share/vm/gc_implementation/shared/collectorCounters.cpp - src/share/vm/gc_implementation/shared/collectorCounters.hpp - src/share/vm/gc_implementation/shared/concurrentGCThread.cpp - src/share/vm/gc_implementation/shared/concurrentGCThread.hpp - src/share/vm/gc_implementation/shared/copyFailedInfo.hpp - src/share/vm/gc_implementation/shared/gSpaceCounters.cpp - src/share/vm/gc_implementation/shared/gSpaceCounters.hpp - src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp - src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp - src/share/vm/gc_implementation/shared/gcHeapSummary.hpp - src/share/vm/gc_implementation/shared/gcId.cpp - src/share/vm/gc_implementation/shared/gcId.hpp - src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp - src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp - src/share/vm/gc_implementation/shared/gcStats.cpp - src/share/vm/gc_implementation/shared/gcStats.hpp - src/share/vm/gc_implementation/shared/gcTimer.cpp - src/share/vm/gc_implementation/shared/gcTimer.hpp - src/share/vm/gc_implementation/shared/gcTrace.cpp - src/share/vm/gc_implementation/shared/gcTrace.hpp - src/share/vm/gc_implementation/shared/gcTraceSend.cpp - src/share/vm/gc_implementation/shared/gcTraceTime.cpp - src/share/vm/gc_implementation/shared/gcTraceTime.hpp - src/share/vm/gc_implementation/shared/gcUtil.cpp - src/share/vm/gc_implementation/shared/gcUtil.hpp - src/share/vm/gc_implementation/shared/gcWhen.hpp - src/share/vm/gc_implementation/shared/generationCounters.cpp - src/share/vm/gc_implementation/shared/generationCounters.hpp - src/share/vm/gc_implementation/shared/hSpaceCounters.cpp - src/share/vm/gc_implementation/shared/hSpaceCounters.hpp - src/share/vm/gc_implementation/shared/immutableSpace.cpp - src/share/vm/gc_implementation/shared/immutableSpace.hpp - src/share/vm/gc_implementation/shared/isGCActiveMark.hpp - src/share/vm/gc_implementation/shared/liveRange.hpp - src/share/vm/gc_implementation/shared/markSweep.cpp - src/share/vm/gc_implementation/shared/markSweep.hpp - src/share/vm/gc_implementation/shared/markSweep.inline.hpp - src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp - src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp - src/share/vm/gc_implementation/shared/mutableSpace.cpp - src/share/vm/gc_implementation/shared/mutableSpace.hpp - src/share/vm/gc_implementation/shared/objectCountEventSender.cpp - src/share/vm/gc_implementation/shared/objectCountEventSender.hpp - src/share/vm/gc_implementation/shared/plab.cpp - src/share/vm/gc_implementation/shared/plab.hpp - src/share/vm/gc_implementation/shared/plab.inline.hpp - src/share/vm/gc_implementation/shared/spaceCounters.cpp - src/share/vm/gc_implementation/shared/spaceCounters.hpp - src/share/vm/gc_implementation/shared/spaceDecorator.cpp - src/share/vm/gc_implementation/shared/spaceDecorator.hpp - src/share/vm/gc_implementation/shared/suspendibleThreadSet.cpp - src/share/vm/gc_implementation/shared/suspendibleThreadSet.hpp - src/share/vm/gc_implementation/shared/vmGCOperations.cpp - src/share/vm/gc_implementation/shared/vmGCOperations.hpp - src/share/vm/gc_interface/allocTracer.cpp - src/share/vm/gc_interface/allocTracer.hpp - src/share/vm/gc_interface/collectedHeap.cpp - src/share/vm/gc_interface/collectedHeap.hpp - src/share/vm/gc_interface/collectedHeap.inline.hpp - src/share/vm/gc_interface/gcCause.cpp - src/share/vm/gc_interface/gcCause.hpp - src/share/vm/gc_interface/gcName.hpp - src/share/vm/memory/barrierSet.cpp - src/share/vm/memory/barrierSet.hpp - src/share/vm/memory/barrierSet.inline.hpp - src/share/vm/memory/blockOffsetTable.cpp - src/share/vm/memory/blockOffsetTable.hpp - src/share/vm/memory/blockOffsetTable.inline.hpp - src/share/vm/memory/cardGeneration.cpp - src/share/vm/memory/cardGeneration.hpp - src/share/vm/memory/cardGeneration.inline.hpp - src/share/vm/memory/cardTableModRefBS.cpp - src/share/vm/memory/cardTableModRefBS.hpp - src/share/vm/memory/cardTableModRefBS.inline.hpp - src/share/vm/memory/cardTableRS.cpp - src/share/vm/memory/cardTableRS.hpp - src/share/vm/memory/collectorPolicy.cpp - src/share/vm/memory/collectorPolicy.hpp - src/share/vm/memory/defNewGeneration.cpp - src/share/vm/memory/defNewGeneration.hpp - src/share/vm/memory/defNewGeneration.inline.hpp - src/share/vm/memory/gcLocker.cpp - src/share/vm/memory/gcLocker.hpp - src/share/vm/memory/gcLocker.inline.hpp - src/share/vm/memory/genCollectedHeap.cpp - src/share/vm/memory/genCollectedHeap.hpp - src/share/vm/memory/genMarkSweep.cpp - src/share/vm/memory/genMarkSweep.hpp - src/share/vm/memory/genOopClosures.cpp - src/share/vm/memory/genOopClosures.hpp - src/share/vm/memory/genOopClosures.inline.hpp - src/share/vm/memory/genRemSet.cpp - src/share/vm/memory/genRemSet.hpp - src/share/vm/memory/genRemSet.inline.hpp - src/share/vm/memory/generation.cpp - src/share/vm/memory/generation.hpp - src/share/vm/memory/generationSpec.cpp - src/share/vm/memory/generationSpec.hpp - src/share/vm/memory/modRefBarrierSet.hpp - src/share/vm/memory/referencePolicy.cpp - src/share/vm/memory/referencePolicy.hpp - src/share/vm/memory/referenceProcessor.cpp - src/share/vm/memory/referenceProcessor.hpp - src/share/vm/memory/referenceProcessorStats.hpp - src/share/vm/memory/space.cpp - src/share/vm/memory/space.hpp - src/share/vm/memory/space.inline.hpp - src/share/vm/memory/specialized_oop_closures.hpp - src/share/vm/memory/strongRootsScope.cpp - src/share/vm/memory/strongRootsScope.hpp - src/share/vm/memory/tenuredGeneration.cpp - src/share/vm/memory/tenuredGeneration.hpp - src/share/vm/memory/tenuredGeneration.inline.hpp - src/share/vm/memory/threadLocalAllocBuffer.cpp - src/share/vm/memory/threadLocalAllocBuffer.hpp - src/share/vm/memory/threadLocalAllocBuffer.inline.hpp - src/share/vm/memory/watermark.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/prims/jvmtiRedefineClasses.cpp ! src/share/vm/runtime/vmStructs.cpp - src/share/vm/utilities/taskqueue.cpp - src/share/vm/utilities/taskqueue.hpp - src/share/vm/utilities/taskqueue.inline.hpp - src/share/vm/utilities/workgroup.cpp - src/share/vm/utilities/workgroup.hpp - src/share/vm/utilities/yieldingWorkgroup.cpp - src/share/vm/utilities/yieldingWorkgroup.hpp - test/gc/concurrentMarkSweep/DisableResizePLAB.java - test/gc/concurrentMarkSweep/GuardShrinkWarning.java - test/gc/defnew/HeapChangeLogging.java - test/gc/parallelScavenge/AdaptiveGCBoundary.java - test/gc/parallelScavenge/TestDynShrinkHeap.java Changeset: b2e3cbd555fc Author: thartmann Date: 2015-05-22 13:02 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/b2e3cbd555fc 8080156: Integer.toString(int value) sometimes throws NPE Summary: Added test to check correctness of type propagation to CmpUNodes. Reviewed-by: kvn + test/compiler/types/TestTypePropagationToCmpU.java Changeset: c22344afe2a2 Author: thartmann Date: 2015-05-22 13:08 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/c22344afe2a2 Merge - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1Allocator.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1HeapRegionTable.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionManager.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetCount.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java - agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/G1YCType.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCCause.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCName.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/GCWhen.java - agent/src/share/classes/sun/jvm/hotspot/gc_interface/ReferenceType.java - agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java - agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java - agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java - agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java - agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java - agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java - agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java - agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java - agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/Space.java - agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java - agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java - agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java - src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp - src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp - src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp - src/share/vm/gc_implementation/g1/collectionSetChooser.cpp - src/share/vm/gc_implementation/g1/collectionSetChooser.hpp - src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp - src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp - src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp - src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp - src/share/vm/gc_implementation/g1/concurrentMark.cpp - src/share/vm/gc_implementation/g1/concurrentMark.hpp - src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp - src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp - src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp - src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp - src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp - src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp - src/share/vm/gc_implementation/g1/evacuationInfo.hpp - src/share/vm/gc_implementation/g1/g1AllocRegion.cpp - src/share/vm/gc_implementation/g1/g1AllocRegion.hpp - src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp - src/share/vm/gc_implementation/g1/g1AllocationContext.hpp - src/share/vm/gc_implementation/g1/g1Allocator.cpp - src/share/vm/gc_implementation/g1/g1Allocator.hpp - src/share/vm/gc_implementation/g1/g1Allocator_ext.cpp - src/share/vm/gc_implementation/g1/g1BiasedArray.cpp - src/share/vm/gc_implementation/g1/g1BiasedArray.hpp - src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp - src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp - src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp - src/share/vm/gc_implementation/g1/g1CardCounts.cpp - src/share/vm/gc_implementation/g1/g1CardCounts.hpp - src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp - src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.hpp - src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp - src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp - src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp - src/share/vm/gc_implementation/g1/g1CollectedHeap_ext.cpp - src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp - src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp - src/share/vm/gc_implementation/g1/g1CollectorPolicy_ext.hpp - src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp - src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp - src/share/vm/gc_implementation/g1/g1EvacFailure.cpp - src/share/vm/gc_implementation/g1/g1EvacFailure.hpp - src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp - src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp - src/share/vm/gc_implementation/g1/g1HRPrinter.cpp - src/share/vm/gc_implementation/g1/g1HRPrinter.hpp - src/share/vm/gc_implementation/g1/g1HotCardCache.cpp - src/share/vm/gc_implementation/g1/g1HotCardCache.hpp - src/share/vm/gc_implementation/g1/g1InCSetState.hpp - src/share/vm/gc_implementation/g1/g1Log.cpp - src/share/vm/gc_implementation/g1/g1Log.hpp - src/share/vm/gc_implementation/g1/g1MMUTracker.cpp - src/share/vm/gc_implementation/g1/g1MMUTracker.hpp - src/share/vm/gc_implementation/g1/g1MarkSweep.cpp - src/share/vm/gc_implementation/g1/g1MarkSweep.hpp - src/share/vm/gc_implementation/g1/g1MarkSweep_ext.cpp - src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp - src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp - src/share/vm/gc_implementation/g1/g1OopClosures.cpp - src/share/vm/gc_implementation/g1/g1OopClosures.hpp - src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp - src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp - src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.hpp - src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp - src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp - src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp - src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp - src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.hpp - src/share/vm/gc_implementation/g1/g1RemSet.cpp - src/share/vm/gc_implementation/g1/g1RemSet.hpp - src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp - src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp - src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp - src/share/vm/gc_implementation/g1/g1RootProcessor.cpp - src/share/vm/gc_implementation/g1/g1RootProcessor.hpp - src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp - src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp - src/share/vm/gc_implementation/g1/g1StringDedup.cpp - src/share/vm/gc_implementation/g1/g1StringDedup.hpp - src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp - src/share/vm/gc_implementation/g1/g1StringDedupQueue.hpp - src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp - src/share/vm/gc_implementation/g1/g1StringDedupStat.hpp - src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp - src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp - src/share/vm/gc_implementation/g1/g1StringDedupThread.cpp - src/share/vm/gc_implementation/g1/g1StringDedupThread.hpp - src/share/vm/gc_implementation/g1/g1YCTypes.hpp - src/share/vm/gc_implementation/g1/g1_globals.cpp - src/share/vm/gc_implementation/g1/g1_globals.hpp - src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp - src/share/vm/gc_implementation/g1/heapRegion.cpp - src/share/vm/gc_implementation/g1/heapRegion.hpp - src/share/vm/gc_implementation/g1/heapRegion.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionBounds.hpp - src/share/vm/gc_implementation/g1/heapRegionBounds.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionManager.cpp - src/share/vm/gc_implementation/g1/heapRegionManager.hpp - src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp - src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp - src/share/vm/gc_implementation/g1/heapRegionSet.cpp - src/share/vm/gc_implementation/g1/heapRegionSet.hpp - src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp - src/share/vm/gc_implementation/g1/heapRegionType.cpp - src/share/vm/gc_implementation/g1/heapRegionType.hpp - src/share/vm/gc_implementation/g1/ptrQueue.cpp - src/share/vm/gc_implementation/g1/ptrQueue.hpp - src/share/vm/gc_implementation/g1/satbQueue.cpp - src/share/vm/gc_implementation/g1/satbQueue.hpp - src/share/vm/gc_implementation/g1/sparsePRT.cpp - src/share/vm/gc_implementation/g1/sparsePRT.hpp - src/share/vm/gc_implementation/g1/survRateGroup.cpp - src/share/vm/gc_implementation/g1/survRateGroup.hpp - src/share/vm/gc_implementation/g1/vmStructs_g1.hpp - src/share/vm/gc_implementation/g1/vm_operations_g1.cpp - src/share/vm/gc_implementation/g1/vm_operations_g1.hpp - src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp - src/share/vm/gc_implementation/parNew/parNewGeneration.cpp - src/share/vm/gc_implementation/parNew/parNewGeneration.hpp - src/share/vm/gc_implementation/parNew/parOopClosures.cpp - src/share/vm/gc_implementation/parNew/parOopClosures.hpp - src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp - src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp - src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp - src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp - src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp - src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp - src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp - src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp - src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp - src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp - src/share/vm/gc_implementation/parallelScavenge/generationSizer.cpp - src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp - src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp - src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp - src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp - src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp - src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp - src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp - src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp - src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp - src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp - src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp - src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp - src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp - src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp - src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp - src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp - src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp - src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp - src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp - src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp - src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp - src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp - src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp - src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp - src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp - src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp - src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp - src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp - src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp - src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp - src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp - src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp - src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp - src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp - src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp - src/share/vm/gc_implementation/shared/ageTable.cpp - src/share/vm/gc_implementation/shared/ageTable.hpp - src/share/vm/gc_implementation/shared/allocationStats.cpp - src/share/vm/gc_implementation/shared/allocationStats.hpp - src/share/vm/gc_implementation/shared/cSpaceCounters.cpp - src/share/vm/gc_implementation/shared/cSpaceCounters.hpp - src/share/vm/gc_implementation/shared/collectorCounters.cpp - src/share/vm/gc_implementation/shared/collectorCounters.hpp - src/share/vm/gc_implementation/shared/concurrentGCThread.cpp - src/share/vm/gc_implementation/shared/concurrentGCThread.hpp - src/share/vm/gc_implementation/shared/copyFailedInfo.hpp - src/share/vm/gc_implementation/shared/gSpaceCounters.cpp - src/share/vm/gc_implementation/shared/gSpaceCounters.hpp - src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp - src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp - src/share/vm/gc_implementation/shared/gcHeapSummary.hpp - src/share/vm/gc_implementation/shared/gcId.cpp - src/share/vm/gc_implementation/shared/gcId.hpp - src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp - src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp - src/share/vm/gc_implementation/shared/gcStats.cpp - src/share/vm/gc_implementation/shared/gcStats.hpp - src/share/vm/gc_implementation/shared/gcTimer.cpp - src/share/vm/gc_implementation/shared/gcTimer.hpp - src/share/vm/gc_implementation/shared/gcTrace.cpp - src/share/vm/gc_implementation/shared/gcTrace.hpp - src/share/vm/gc_implementation/shared/gcTraceSend.cpp - src/share/vm/gc_implementation/shared/gcTraceTime.cpp - src/share/vm/gc_implementation/shared/gcTraceTime.hpp - src/share/vm/gc_implementation/shared/gcUtil.cpp - src/share/vm/gc_implementation/shared/gcUtil.hpp - src/share/vm/gc_implementation/shared/gcWhen.hpp - src/share/vm/gc_implementation/shared/generationCounters.cpp - src/share/vm/gc_implementation/shared/generationCounters.hpp - src/share/vm/gc_implementation/shared/hSpaceCounters.cpp - src/share/vm/gc_implementation/shared/hSpaceCounters.hpp - src/share/vm/gc_implementation/shared/immutableSpace.cpp - src/share/vm/gc_implementation/shared/immutableSpace.hpp - src/share/vm/gc_implementation/shared/isGCActiveMark.hpp - src/share/vm/gc_implementation/shared/liveRange.hpp - src/share/vm/gc_implementation/shared/markSweep.cpp - src/share/vm/gc_implementation/shared/markSweep.hpp - src/share/vm/gc_implementation/shared/markSweep.inline.hpp - src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp - src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp - src/share/vm/gc_implementation/shared/mutableSpace.cpp - src/share/vm/gc_implementation/shared/mutableSpace.hpp - src/share/vm/gc_implementation/shared/objectCountEventSender.cpp - src/share/vm/gc_implementation/shared/objectCountEventSender.hpp - src/share/vm/gc_implementation/shared/plab.cpp - src/share/vm/gc_implementation/shared/plab.hpp - src/share/vm/gc_implementation/shared/plab.inline.hpp - src/share/vm/gc_implementation/shared/spaceCounters.cpp - src/share/vm/gc_implementation/shared/spaceCounters.hpp - src/share/vm/gc_implementation/shared/spaceDecorator.cpp - src/share/vm/gc_implementation/shared/spaceDecorator.hpp - src/share/vm/gc_implementation/shared/suspendibleThreadSet.cpp - src/share/vm/gc_implementation/shared/suspendibleThreadSet.hpp - src/share/vm/gc_implementation/shared/vmGCOperations.cpp - src/share/vm/gc_implementation/shared/vmGCOperations.hpp - src/share/vm/gc_interface/allocTracer.cpp - src/share/vm/gc_interface/allocTracer.hpp - src/share/vm/gc_interface/collectedHeap.cpp - src/share/vm/gc_interface/collectedHeap.hpp - src/share/vm/gc_interface/collectedHeap.inline.hpp - src/share/vm/gc_interface/gcCause.cpp - src/share/vm/gc_interface/gcCause.hpp - src/share/vm/gc_interface/gcName.hpp - src/share/vm/memory/barrierSet.cpp - src/share/vm/memory/barrierSet.hpp - src/share/vm/memory/barrierSet.inline.hpp - src/share/vm/memory/blockOffsetTable.cpp - src/share/vm/memory/blockOffsetTable.hpp - src/share/vm/memory/blockOffsetTable.inline.hpp - src/share/vm/memory/cardGeneration.cpp - src/share/vm/memory/cardGeneration.hpp - src/share/vm/memory/cardGeneration.inline.hpp - src/share/vm/memory/cardTableModRefBS.cpp - src/share/vm/memory/cardTableModRefBS.hpp - src/share/vm/memory/cardTableModRefBS.inline.hpp - src/share/vm/memory/cardTableRS.cpp - src/share/vm/memory/cardTableRS.hpp - src/share/vm/memory/collectorPolicy.cpp - src/share/vm/memory/collectorPolicy.hpp - src/share/vm/memory/defNewGeneration.cpp - src/share/vm/memory/defNewGeneration.hpp - src/share/vm/memory/defNewGeneration.inline.hpp - src/share/vm/memory/gcLocker.cpp - src/share/vm/memory/gcLocker.hpp - src/share/vm/memory/gcLocker.inline.hpp - src/share/vm/memory/genCollectedHeap.cpp - src/share/vm/memory/genCollectedHeap.hpp - src/share/vm/memory/genMarkSweep.cpp - src/share/vm/memory/genMarkSweep.hpp - src/share/vm/memory/genOopClosures.cpp - src/share/vm/memory/genOopClosures.hpp - src/share/vm/memory/genOopClosures.inline.hpp - src/share/vm/memory/genRemSet.cpp - src/share/vm/memory/genRemSet.hpp - src/share/vm/memory/genRemSet.inline.hpp - src/share/vm/memory/generation.cpp - src/share/vm/memory/generation.hpp - src/share/vm/memory/generationSpec.cpp - src/share/vm/memory/generationSpec.hpp - src/share/vm/memory/modRefBarrierSet.hpp - src/share/vm/memory/referencePolicy.cpp - src/share/vm/memory/referencePolicy.hpp - src/share/vm/memory/referenceProcessor.cpp - src/share/vm/memory/referenceProcessor.hpp - src/share/vm/memory/referenceProcessorStats.hpp - src/share/vm/memory/space.cpp - src/share/vm/memory/space.hpp - src/share/vm/memory/space.inline.hpp - src/share/vm/memory/specialized_oop_closures.hpp - src/share/vm/memory/strongRootsScope.cpp - src/share/vm/memory/strongRootsScope.hpp - src/share/vm/memory/tenuredGeneration.cpp - src/share/vm/memory/tenuredGeneration.hpp - src/share/vm/memory/tenuredGeneration.inline.hpp - src/share/vm/memory/threadLocalAllocBuffer.cpp - src/share/vm/memory/threadLocalAllocBuffer.hpp - src/share/vm/memory/threadLocalAllocBuffer.inline.hpp - src/share/vm/memory/watermark.hpp - src/share/vm/utilities/taskqueue.cpp - src/share/vm/utilities/taskqueue.hpp - src/share/vm/utilities/taskqueue.inline.hpp - src/share/vm/utilities/workgroup.cpp - src/share/vm/utilities/workgroup.hpp - src/share/vm/utilities/yieldingWorkgroup.cpp - src/share/vm/utilities/yieldingWorkgroup.hpp - test/gc/concurrentMarkSweep/DisableResizePLAB.java - test/gc/concurrentMarkSweep/GuardShrinkWarning.java - test/gc/defnew/HeapChangeLogging.java - test/gc/parallelScavenge/AdaptiveGCBoundary.java - test/gc/parallelScavenge/TestDynShrinkHeap.java Changeset: 7c56d384ed33 Author: roland Date: 2015-05-22 09:14 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/7c56d384ed33 8080699: Assert failed: Not a Java pointer in JCK test Summary: Eliminated arraycopy node still reachable through exception edges Reviewed-by: kvn ! src/share/vm/opto/arraycopynode.cpp ! src/share/vm/opto/callnode.cpp + test/compiler/arraycopy/TestDeadArrayCopyOnMemChain.java Changeset: a7c457567b1e Author: thartmann Date: 2015-05-29 12:49 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/a7c457567b1e Merge ! src/share/vm/oops/instanceKlass.hpp Changeset: 0e1f666bf724 Author: vlivanov Date: 2015-05-29 17:04 +0300 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/0e1f666bf724 8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump Reviewed-by: sspitsyn, coleenp ! src/cpu/aarch64/vm/interp_masm_aarch64.cpp ! src/cpu/aarch64/vm/interp_masm_aarch64.hpp ! src/cpu/sparc/vm/interp_masm_sparc.cpp ! src/cpu/sparc/vm/interp_masm_sparc.hpp ! src/cpu/x86/vm/interp_masm_x86.cpp ! src/cpu/x86/vm/interp_masm_x86.hpp ! src/share/vm/ci/ciStreams.cpp ! src/share/vm/classfile/classLoaderData.cpp ! src/share/vm/classfile/classLoaderData.hpp ! src/share/vm/classfile/javaClasses.cpp ! src/share/vm/classfile/javaClasses.hpp ! src/share/vm/oops/constantPool.cpp ! src/share/vm/oops/constantPool.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/prims/jvmtiRedefineClasses.cpp ! src/share/vm/runtime/vmStructs.cpp Changeset: 40691aab6662 Author: vlivanov Date: 2015-05-29 17:04 +0300 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/40691aab6662 8001622: loadUB2L_immI8 & loadUS2L_immI16 rules don't match some 8-bit/16-bit masks Reviewed-by: dlong, kvn, roland ! src/cpu/sparc/vm/sparc.ad ! src/cpu/x86/vm/x86_32.ad ! src/cpu/x86/vm/x86_64.ad Changeset: 141cca8431be Author: roland Date: 2015-05-29 16:09 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/141cca8431be 8080976: Unexpected AIOOB thrown from 1.9.0-ea-b64 on (regression) Summary: Loop variant use in reduction should prevent vectorization Reviewed-by: kvn, mcberg ! src/share/vm/opto/loopTransform.cpp + test/compiler/loopopts/superword/TestReductionWithLoopVariantUse.java Changeset: 1aef080fd28d Author: roland Date: 2015-05-29 17:56 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/1aef080fd28d Merge Changeset: 756b4790a823 Author: kvn Date: 2015-06-04 12:52 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/756b4790a823 Merge ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/prims/methodHandles.cpp Changeset: 0f239a25e018 Author: amurillo Date: 2015-06-04 15:38 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/0f239a25e018 Merge Changeset: ac8f7a9a590d Author: amurillo Date: 2015-06-08 11:11 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/ac8f7a9a590d Merge Changeset: 93cc4d7535ce Author: enevill Date: 2015-06-10 12:29 +0000 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/93cc4d7535ce 8085805: aarch64: AdvancedThresholdPolicy lacks tuning of InlineSmallCode size Summary: Set default value of InlineSmallCode to 2500 on aarch64 Reviewed-by: kvn ! src/share/vm/runtime/advancedThresholdPolicy.cpp Changeset: ff0929a59ced Author: lana Date: 2015-06-11 20:19 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/ff0929a59ced Merge Changeset: 4e745c069aa3 Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/4e745c069aa3 Added tag jdk9-b69 for changeset ff0929a59ced ! .hgtags Changeset: 6217fd2c767b Author: sgehwolf Date: 2015-06-12 16:09 +0100 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/6217fd2c767b 8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms. Summary: Use __builtin_frame_address(0) rather than returning address of local variable. Reviewed-by: dholmes ! src/os_cpu/linux_zero/vm/os_linux_zero.cpp Changeset: 578f086f3435 Author: kvn Date: 2015-06-03 15:02 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/578f086f3435 8081778: Use Intel x64 CPU instructions for RSA acceleration Summary: Add intrinsics for BigInteger squareToLen and mulAdd methods. Reviewed-by: kvn, jrose ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/macroAssembler_x86.cpp ! src/cpu/x86/vm/macroAssembler_x86.hpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/stubRoutines_x86_64.hpp ! src/cpu/x86/vm/vm_version_x86.cpp ! src/share/vm/classfile/vmSymbols.hpp ! src/share/vm/opto/c2_globals.hpp ! src/share/vm/opto/escape.cpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/runtime.cpp ! src/share/vm/opto/runtime.hpp ! src/share/vm/runtime/stubRoutines.cpp ! src/share/vm/runtime/stubRoutines.hpp ! src/share/vm/runtime/vmStructs.cpp + test/compiler/intrinsics/muladd/TestMulAdd.java + test/compiler/intrinsics/squaretolen/TestSquareToLen.java Changeset: 6ea1c2a729ad Author: kvn Date: 2015-06-04 19:24 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/6ea1c2a729ad Merge Changeset: ac1a9d805f11 Author: roland Date: 2015-06-04 16:19 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/ac1a9d805f11 8078866: compiler/eliminateAutobox/6934604/TestIntBoxing.java assert(p_f->Opcode() == Op_IfFalse) failed Summary: Bail out from range check elimination if pre loop is not found Reviewed-by: kvn ! src/share/vm/opto/loopTransform.cpp Changeset: 758cc95296c1 Author: roland Date: 2015-06-08 18:35 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/758cc95296c1 8081823: C2 performs unsigned comparison against -1 Summary: x <= 0 || x > 0 wrongly folded as (x-1) >u -1 Reviewed-by: kvn, vlivanov ! src/share/vm/opto/ifnode.cpp + test/compiler/rangechecks/TestBadFoldCompare.java Changeset: 421989a11af8 Author: roland Date: 2015-05-12 14:26 +0200 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/421989a11af8 8085832: Optimize main and post loop out when pre loop is found empty Summary: Eliminate main loop and post loop if pre loop becomes empty Reviewed-by: kvn, mcberg ! src/share/vm/opto/loopTransform.cpp ! src/share/vm/opto/loopnode.hpp Changeset: 12df4231da03 Author: amurillo Date: 2015-06-11 12:02 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/12df4231da03 Merge Changeset: 43e11a06fcf3 Author: amurillo Date: 2015-06-15 10:56 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/43e11a06fcf3 Merge Changeset: 8672e9264db3 Author: lana Date: 2015-06-18 10:23 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/8672e9264db3 Merge Changeset: 4f8acfe256da Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/4f8acfe256da Added tag jdk9-b70 for changeset 8672e9264db3 ! .hgtags Changeset: f3653f892046 Author: iris Date: 2015-06-29 11:27 -0700 URL: http://hg.openjdk.java.net/verona/stage/hotspot/rev/f3653f892046 Merge - make/jdk6_hotspot_distro ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/services/diagnosticCommand.cpp From iris.clark at oracle.com Tue Jun 30 21:35:06 2015 From: iris.clark at oracle.com (iris.clark at oracle.com) Date: Tue, 30 Jun 2015 21:35:06 +0000 Subject: hg: verona/stage/jdk: 81 new changesets Message-ID: <201506302135.t5ULZ9Gb015979@aojmv0008.oracle.com> Changeset: c1947d42537b Author: lana Date: 2015-06-11 10:44 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/c1947d42537b Added tag jdk9-b68 for changeset 046fd17bb9a0 ! .hgtags Changeset: 4d240482f37e Author: kshefov Date: 2015-06-05 12:22 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/4d240482f37e 8072515: Test Task: Develop new tests for JEP 219: Datagram Transport Layer Security (DTLS) Reviewed-by: xuelei, asmotrak, rhalade + test/javax/net/ssl/DTLS/DTLSBufferOverflowUnderflowTest.java + test/javax/net/ssl/DTLS/DTLSDataExchangeTest.java + test/javax/net/ssl/DTLS/DTLSEnginesClosureTest.java + test/javax/net/ssl/DTLS/DTLSHandshakeTest.java + test/javax/net/ssl/DTLS/DTLSHandshakeWithReplicatedPacketsTest.java + test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java + test/javax/net/ssl/DTLS/DTLSMFLNTest.java + test/javax/net/ssl/DTLS/DTLSNotEnabledRC4Test.java + test/javax/net/ssl/DTLS/DTLSRehandshakeTest.java + test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java + test/javax/net/ssl/DTLS/DTLSRehandshakeWithDataExTest.java + test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java + test/javax/net/ssl/DTLS/DTLSUnSupportedCiphersTest.java + test/javax/net/ssl/DTLS/TEST.properties + test/javax/net/ssl/DTLSv10/DTLSv10BufferOverflowUnderflowTest.java + test/javax/net/ssl/DTLSv10/DTLSv10DataExchangeTest.java + test/javax/net/ssl/DTLSv10/DTLSv10EnginesClosureTest.java + test/javax/net/ssl/DTLSv10/DTLSv10HandshakeTest.java + test/javax/net/ssl/DTLSv10/DTLSv10HandshakeWithReplicatedPacketsTest.java + test/javax/net/ssl/DTLSv10/DTLSv10IncorrectAppDataTest.java + test/javax/net/ssl/DTLSv10/DTLSv10MFLNTest.java + test/javax/net/ssl/DTLSv10/DTLSv10NotEnabledRC4Test.java + test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeTest.java + test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java + test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithDataExTest.java + test/javax/net/ssl/DTLSv10/DTLSv10SequenceNumberTest.java + test/javax/net/ssl/DTLSv10/DTLSv10UnSupportedCiphersTest.java + test/javax/net/ssl/DTLSv10/TEST.properties + test/javax/net/ssl/TLSCommon/BufferOverflowUnderflowTest.java + test/javax/net/ssl/TLSCommon/DataExchangeTest.java + test/javax/net/ssl/TLSCommon/EnginesClosureTest.java + test/javax/net/ssl/TLSCommon/HandshakeTest.java + test/javax/net/ssl/TLSCommon/MFLNTest.java + test/javax/net/ssl/TLSCommon/NotEnabledRC4Test.java + test/javax/net/ssl/TLSCommon/RehandshakeTest.java + test/javax/net/ssl/TLSCommon/RehandshakeWithCipherChangeTest.java + test/javax/net/ssl/TLSCommon/RehandshakeWithDataExTest.java + test/javax/net/ssl/TLSCommon/SSLEngineTestCase.java + test/javax/net/ssl/TLSCommon/UnSupportedCiphersTest.java + test/javax/net/ssl/TLSCommon/jaas.conf Changeset: 10fcabee1cf1 Author: kshefov Date: 2015-06-05 13:14 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/10fcabee1cf1 8068416: LFGarbageCollectedTest.java fails with OOME: "GC overhead limit exceeded" Reviewed-by: vlivanov ! test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java Changeset: 812157183473 Author: robm Date: 2015-06-05 14:20 +0100 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/812157183473 8080819: Inet4AddressImpl regression caused by JDK-7180557 Reviewed-by: michaelm Contributed-by: brian.toal at gmail.com ! src/java.base/unix/native/libnet/Inet4AddressImpl.c ! src/java.base/unix/native/libnet/Inet6AddressImpl.c Changeset: 0c36d062cb0f Author: juh Date: 2015-06-05 11:27 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/0c36d062cb0f 8076535: Deprecate the com.sun.jarsigner package Reviewed-by: mullan ! src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSigner.java ! src/jdk.jartool/share/classes/com/sun/jarsigner/ContentSignerParameters.java ! src/jdk.jartool/share/classes/com/sun/jarsigner/package-info.java ! src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java ! src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java ! src/jdk.jartool/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java Changeset: 6e9b0fed907d Author: avstepan Date: 2015-06-08 16:37 +0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/6e9b0fed907d 8081517: minor cleanup for docs Summary: fix some tidy and javadoc warnings/errors Reviewed-by: lancea, rriggs ! src/java.base/share/classes/com/sun/net/ssl/SSLContext.java ! src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java ! src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java ! src/java.base/share/classes/java/io/File.java ! src/java.base/share/classes/java/lang/Process.java ! src/java.base/share/classes/java/lang/ProcessHandle.java ! src/java.base/share/classes/java/text/SimpleDateFormat.java ! src/java.base/share/classes/javax/security/auth/Subject.java ! src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java ! src/java.base/share/classes/sun/invoke/util/BytecodeName.java ! src/java.base/share/classes/sun/net/TelnetInputStream.java ! src/java.base/share/classes/sun/net/TelnetOutputStream.java ! src/java.base/share/classes/sun/net/URLCanonicalizer.java ! src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java ! src/java.base/share/classes/sun/net/www/MessageHeader.java ! src/java.base/share/classes/sun/net/www/http/HttpClient.java ! src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java ! src/java.base/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java ! src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java ! src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java ! src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java ! src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java ! src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java ! src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java ! src/java.base/share/classes/sun/reflect/generics/scope/ConstructorScope.java ! src/java.base/share/classes/sun/util/PreHashedMap.java ! src/java.base/share/classes/sun/util/calendar/BaseCalendar.java ! src/java.base/share/classes/sun/util/calendar/CalendarUtils.java ! src/java.base/share/classes/sun/util/calendar/ZoneInfo.java ! src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java ! src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java ! src/java.base/share/classes/sun/util/logging/PlatformLogger.java ! src/java.base/share/classes/sun/util/resources/TimeZoneNamesBundle.java ! src/java.base/unix/classes/sun/misc/FileURLMapper.java ! src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java ! src/java.base/windows/classes/sun/misc/FileURLMapper.java ! src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java ! src/java.datatransfer/share/classes/sun/datatransfer/DataFlavorUtil.java ! src/java.desktop/macosx/classes/com/apple/eio/FileManager.java ! src/java.desktop/share/classes/sun/applet/AppletPanel.java ! src/java.desktop/share/classes/sun/applet/AppletViewer.java ! src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java ! src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetImpl.java ! src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java ! src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java ! src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java ! src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java ! src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java ! src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/HostIdentifier.java ! src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/MonitoredVm.java ! src/jdk.jvmstat/share/classes/sun/jvmstat/monitor/VmIdentifier.java ! src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java ! src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java ! src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsName.java Changeset: b266574d519e Author: aefimov Date: 2015-06-08 16:17 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/b266574d519e 8080774: DateFormat for Singapore/English locale (en_SG) is M/d/yy instead of d/M/yy Reviewed-by: naoto ! src/java.base/share/classes/sun/text/resources/en/FormatData_en_SG.java + test/java/text/Format/DateFormat/LocaleDateFormats.java ! test/sun/text/resources/LocaleData ! test/sun/text/resources/LocaleDataTest.java Changeset: 64f750b274d3 Author: robm Date: 2015-06-08 21:35 +0100 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/64f750b274d3 7130985: Four helper classes missing in Sun JDK Reviewed-by: coffeys, msheppar ! src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java + test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java + test/com/sun/corba/7130985/CorbaExceptionsTest.java Changeset: 8cad1a9fee4a Author: aeriksso Date: 2015-05-28 12:11 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/8cad1a9fee4a 8080428: [TESTBUG] java/lang/invoke/8022701/MHIllegalAccess.java - FAIL: Unexpected wrapped exception java.lang.BootstrapMethodError Reviewed-by: vlivanov ! test/java/lang/invoke/8022701/InvokeSeveralWays.java Changeset: 8c97ba5a60fb Author: dcubed Date: 2015-05-28 15:03 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/8c97ba5a60fb Merge Changeset: 2204ff03b332 Author: sla Date: 2015-05-29 12:48 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/2204ff03b332 Merge Changeset: 430be776a2b7 Author: ykantser Date: 2015-05-27 14:35 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/430be776a2b7 8081037: serviceability/sa/ tests time out on Windows Reviewed-by: jbachorik, sla, dsamersoff ! test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java ! test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java Changeset: 0cfd8ae10930 Author: ykantser Date: 2015-05-29 20:15 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/0cfd8ae10930 Merge - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: c967a4d4d00d Author: ihse Date: 2015-06-02 15:09 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/c967a4d4d00d 8081616: Remove hard-coded CFLAGS_WARNINGS_ARE_ERRORS to fully respect --disable-warnings-as-errors Reviewed-by: erikj, dholmes ! make/lib/Lib-java.instrument.gmk ! make/lib/Lib-java.management.gmk ! make/lib/Lib-jdk.attach.gmk ! make/lib/Lib-jdk.hprof.agent.gmk ! make/lib/Lib-jdk.jdi.gmk ! make/lib/Lib-jdk.jdwp.agent.gmk ! make/lib/Lib-jdk.management.gmk ! make/lib/Lib-jdk.sctp.gmk Changeset: b77ef4c3d650 Author: vlivanov Date: 2015-05-15 19:23 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/b77ef4c3d650 8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared Reviewed-by: roland, psandoz, plevart, kbarrett, jrose ! src/java.base/share/classes/java/lang/invoke/CallSite.java ! src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java Changeset: 16e493c3bff0 Author: vlivanov Date: 2015-05-21 18:23 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/16e493c3bff0 8059340: ConstantPool::_resolved_references is missing in heap dump Reviewed-by: sspitsyn, stefank, twisti ! src/java.base/share/classes/java/lang/Class.java ! src/java.base/share/classes/sun/reflect/Reflection.java Changeset: e8c83a200438 Author: thartmann Date: 2015-05-22 09:50 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/e8c83a200438 Merge - src/java.base/share/classes/sun/security/provider/certpath/CertStoreHelper.java - src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java - src/java.naming/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java Changeset: 3c00e970f3ad Author: thartmann Date: 2015-05-29 12:49 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/3c00e970f3ad Merge - make/gendata/Gendata-jdk.dev.gmk - src/bsd/doc/man/ja/native2ascii.1 - src/bsd/doc/man/native2ascii.1 - src/java.base/share/classes/com/sun/java/util/jar/pack/package.html - src/java.base/share/classes/com/sun/net/ssl/package.html - src/java.base/share/classes/java/io/package.html - src/java.base/share/classes/java/lang/ref/package.html - src/java.base/share/classes/java/nio/channels/spi/package.html - src/java.base/share/classes/java/nio/charset/package.html - src/java.base/share/classes/java/nio/charset/spi/package.html - src/java.base/share/classes/java/nio/package.html - src/java.base/share/classes/java/text/package.html - src/java.base/share/classes/java/text/spi/package.html - src/java.base/share/classes/java/util/jar/package.html - src/java.base/share/classes/java/util/package.html - src/java.base/share/classes/java/util/regex/package.html - src/java.base/share/classes/java/util/spi/package.html - src/java.base/share/classes/javax/crypto/interfaces/package.html - src/java.base/share/classes/javax/crypto/package.html - src/java.base/share/classes/javax/crypto/spec/package.html - src/java.base/share/classes/javax/net/package.html - src/java.base/share/classes/javax/net/ssl/package.html - src/java.base/share/classes/sun/misc/JavaBeansIntrospectorAccess.java - src/java.base/share/classes/sun/reflect/package.html - src/jdk.dev/share/classes/sun/tools/native2ascii/A2NFilter.java - src/jdk.dev/share/classes/sun/tools/native2ascii/Main.java - src/jdk.dev/share/classes/sun/tools/native2ascii/N2AFilter.java - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java - test/sun/nio/cs/Test4200310.sh - test/sun/tools/jhat/hprof.bin - test/sun/tools/jhat/jmap.bin - test/sun/tools/jhat/minimal.bin - test/sun/tools/native2ascii/A2N_4630463 - test/sun/tools/native2ascii/A2N_4630463.expected - test/sun/tools/native2ascii/A2N_4630971 - test/sun/tools/native2ascii/A2N_4701617 - test/sun/tools/native2ascii/A2N_4701617.expected - test/sun/tools/native2ascii/A2N_6247817 - test/sun/tools/native2ascii/N2A_4636448 - test/sun/tools/native2ascii/N2A_4636448.expected - test/sun/tools/native2ascii/Native2AsciiTests.sh - test/sun/tools/native2ascii/NativeErrors.java - test/sun/tools/native2ascii/Permission.java - test/sun/tools/native2ascii/resources/ImmutableResourceTest.java - test/sun/tools/native2ascii/test1 - test/sun/tools/native2ascii/test3 Changeset: 10bae5ef9ea1 Author: vlivanov Date: 2015-05-29 17:05 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/10bae5ef9ea1 8081320: Backout JDK-8059340: ConstantPool::_resolved_references is missing in heap dump Reviewed-by: sspitsyn, coleenp ! src/java.base/share/classes/java/lang/Class.java ! src/java.base/share/classes/sun/reflect/Reflection.java Changeset: 2ead1bb8da0b Author: kvn Date: 2015-06-04 12:49 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/2ead1bb8da0b Merge - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: 291a48e0143d Author: amurillo Date: 2015-06-04 15:38 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/291a48e0143d Merge - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: cfc652ab37e0 Author: amurillo Date: 2015-06-08 11:11 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/cfc652ab37e0 Merge - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: 99548f9b60ef Author: amurillo Date: 2015-06-08 17:19 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/99548f9b60ef Merge Changeset: 19727f9d42dd Author: psandoz Date: 2015-06-09 07:05 +0100 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/19727f9d42dd 8080945: Improve the performance of primitive Arrays.sort for certain patterns of array elements Reviewed-by: psandoz Contributed-by: Sunny Chan , Mohammad Rezaei ! src/java.base/share/classes/java/util/DualPivotQuicksort.java + test/java/util/Arrays/SortingIntBenchmarkTestJMH.java + test/java/util/Arrays/SortingLongBenchmarkTestJMH.java + test/java/util/Arrays/SortingNearlySortedPrimitive.java Changeset: 467094c6081b Author: mullan Date: 2015-06-09 09:18 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/467094c6081b 8056179: Store permissions in concurrent collections in PermissionCollection subclasses 8065942: Store PermissionCollection entries in a ConcurrentHashMap instead of a HashMap in Permissions class Reviewed-by: weijun ! src/java.base/share/classes/java/io/FilePermission.java ! src/java.base/share/classes/java/net/SocketPermission.java ! src/java.base/share/classes/java/security/BasicPermission.java ! src/java.base/share/classes/java/security/Permissions.java ! src/java.base/share/classes/java/security/UnresolvedPermissionCollection.java ! src/java.base/share/classes/java/util/PropertyPermission.java ! src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java ! src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java + test/java/io/FilePermission/FilePermissionCollection.java + test/java/net/SocketPermission/SocketPermissionCollection.java + test/java/security/BasicPermission/BasicPermissionCollection.java ! test/java/security/PermissionCollection/Concurrent.java + test/java/util/PropertyPermission/PropertyPermissionCollection.java + test/javax/security/auth/kerberos/DelegationPermissionCollection.java + test/javax/security/auth/kerberos/ServicePermissionCollection.java Changeset: 6e65001303db Author: mullan Date: 2015-06-09 09:19 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/6e65001303db Merge - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: 1c74428aa321 Author: kshefov Date: 2015-06-10 12:44 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/1c74428aa321 8085979: Make some DTLS feature functional tests work also for TLS protocol Reviewed-by: xuelei - test/javax/net/ssl/DTLS/DTLSUnSupportedCiphersTest.java + test/javax/net/ssl/DTLS/DTLSUnsupportedCiphersTest.java - test/javax/net/ssl/DTLSv10/DTLSv10UnSupportedCiphersTest.java + test/javax/net/ssl/DTLSv10/DTLSv10UnsupportedCiphersTest.java + test/javax/net/ssl/TLS/TLSDataExchangeTest.java + test/javax/net/ssl/TLS/TLSEnginesClosureTest.java + test/javax/net/ssl/TLS/TLSHandshakeTest.java + test/javax/net/ssl/TLS/TLSMFLNTest.java + test/javax/net/ssl/TLS/TLSNotEnabledRC4Test.java + test/javax/net/ssl/TLS/TLSRehandshakeTest.java + test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java + test/javax/net/ssl/TLS/TLSRehandshakeWithDataExTest.java + test/javax/net/ssl/TLS/TLSUnsupportedCiphersTest.java - test/javax/net/ssl/TLSCommon/UnSupportedCiphersTest.java + test/javax/net/ssl/TLSCommon/UnsupportedCiphersTest.java + test/javax/net/ssl/TLSv1/TLSDataExchangeTest.java + test/javax/net/ssl/TLSv1/TLSEnginesClosureTest.java + test/javax/net/ssl/TLSv1/TLSHandshakeTest.java + test/javax/net/ssl/TLSv1/TLSMFLNTest.java + test/javax/net/ssl/TLSv1/TLSNotEnabledRC4Test.java + test/javax/net/ssl/TLSv1/TLSRehandshakeTest.java + test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java + test/javax/net/ssl/TLSv1/TLSRehandshakeWithDataExTest.java + test/javax/net/ssl/TLSv1/TLSUnsupportedCiphersTest.java + test/javax/net/ssl/TLSv11/TLSDataExchangeTest.java + test/javax/net/ssl/TLSv11/TLSEnginesClosureTest.java + test/javax/net/ssl/TLSv11/TLSHandshakeTest.java + test/javax/net/ssl/TLSv11/TLSMFLNTest.java + test/javax/net/ssl/TLSv11/TLSNotEnabledRC4Test.java + test/javax/net/ssl/TLSv11/TLSRehandshakeTest.java + test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java + test/javax/net/ssl/TLSv11/TLSRehandshakeWithDataExTest.java + test/javax/net/ssl/TLSv11/TLSUnsupportedCiphersTest.java Changeset: af0b80c1902f Author: rriggs Date: 2015-06-10 07:52 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/af0b80c1902f 8086117: java/lang/Runtime/exec/LotsOfOutput.java still fails intermittently with Process consumes memory Reviewed-by: chegar ! test/java/lang/Runtime/exec/LotsOfOutput.java Changeset: a44ca223cf2f Author: simonis Date: 2015-06-11 17:29 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/a44ca223cf2f 8081674: EmptyStackException at startup if running with extended or unsupported charset Reviewed-by: mchung, alanb ! make/mapfiles/libjava/mapfile-vers ! src/java.base/share/classes/java/lang/ClassLoader.java ! src/java.base/share/native/libjava/ClassLoader.c Changeset: 071f887320f8 Author: bchristi Date: 2015-06-11 10:38 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/071f887320f8 8064956: Remove sun.misc.ExtensionInstallationProvider and relevant classes Reviewed-by: mchung, alanb - src/java.base/share/classes/sun/misc/ExtensionDependency.java - src/java.base/share/classes/sun/misc/ExtensionInfo.java - src/java.base/share/classes/sun/misc/ExtensionInstallationException.java - src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java Changeset: 551323004d0c Author: lana Date: 2015-06-11 20:18 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/551323004d0c Merge - src/java.base/share/classes/sun/misc/ExtensionDependency.java - src/java.base/share/classes/sun/misc/ExtensionInfo.java - src/java.base/share/classes/sun/misc/ExtensionInstallationException.java - src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: e30cd0d37abf Author: lana Date: 2015-06-18 01:43 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/e30cd0d37abf Added tag jdk9-b69 for changeset 551323004d0c ! .hgtags Changeset: b91b65ccf504 Author: sadayapalam Date: 2015-06-12 10:58 +0530 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/b91b65ccf504 8054304: Clarify treatment of bounds in j.l.r.Annotated{WildcardType,TypeVariable}. Summary: Reflection APIs should return unannotated Object as the upper bound when there is no explicit upper bound. Reviewed-by: darcy ! src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java ! src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java ! src/java.base/share/classes/java/lang/reflect/TypeVariable.java ! src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java ! test/java/lang/annotation/TypeAnnotationReflection.java Changeset: 5f9b3c9dda45 Author: amlu Date: 2015-06-12 14:28 +0800 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/5f9b3c9dda45 8085879: Mark intermittently failing: java/util/Arrays/ParallelPrefix.java Reviewed-by: darcy ! test/java/util/Arrays/ParallelPrefix.java Changeset: f36fd9bd1dcd Author: mullan Date: 2015-06-12 12:50 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/f36fd9bd1dcd 6826789: SecureClassLoader should not use CodeSource URLs as HashMap keys Reviewed-by: weijun ! src/java.base/share/classes/java/security/CodeSource.java ! src/java.base/share/classes/java/security/SecureClassLoader.java + test/java/security/SecureClassLoader/DefineClass.java + test/java/security/SecureClassLoader/DefineClass.policy Changeset: 23de469e194d Author: mullan Date: 2015-06-12 16:36 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/23de469e194d 8087283: Add support for the XML Signature here() function to the JDK XPath implementation Reviewed-by: alanb, joehw ! src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java Changeset: 2ad329d59d5d Author: mullan Date: 2015-06-12 16:40 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/2ad329d59d5d Merge Changeset: e6e8b4ed01ff Author: bpb Date: 2015-06-12 17:05 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/e6e8b4ed01ff 8087288: File.get{Free,Total,Usable}Space may return unexpected results with >2TB file systems Summary: On Mac OS X replace statvfs64() and struct statvfs64 with statfs() and struct statfs, respectively, and f_frsize with f_bsize. Reviewed-by: alanb ! src/java.base/unix/native/libjava/UnixFileSystem_md.c Changeset: 4fc7e42e4f2c Author: bpb Date: 2015-06-12 17:06 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/4fc7e42e4f2c 8081843: (fs) FileStore.getTotalSpace returns unexpected results with >2TB file systems Summary: On Mac OS X use statfs() instead of statvfs(). Reviewed-by: alanb ! src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Changeset: de309dbe42bf Author: kvn Date: 2015-06-03 12:54 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/de309dbe42bf 8081778: Use Intel x64 CPU instructions for RSA acceleration Summary: Add intrinsics for BigInteger squareToLen and mulAdd methods. Reviewed-by: kvn, jrose, aph, ascarpino, fweimer ! src/java.base/share/classes/java/math/BigInteger.java Changeset: d8cc36ef3eab Author: kvn Date: 2015-06-04 19:24 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/d8cc36ef3eab Merge Changeset: 96c1916bd721 Author: amurillo Date: 2015-06-11 12:02 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/96c1916bd721 Merge Changeset: 06b88be168b6 Author: amurillo Date: 2015-06-15 10:56 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/06b88be168b6 Merge Changeset: 3b79fe449472 Author: dfuchs Date: 2015-06-16 12:15 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/3b79fe449472 8080933: LogManager.demandSystemLogger should accept a 'caller' argument. Summary: The caller's class is now passed to LogManager.demandSystemLogger Reviewed-by: mchung ! src/java.logging/share/classes/java/util/logging/LogManager.java ! src/java.logging/share/classes/java/util/logging/Logger.java Changeset: 751607c6d94a Author: dl Date: 2015-06-16 13:13 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/751607c6d94a 8085978: LinkedTransferQueue.spliterator can report LTQ.Node object, not T Reviewed-by: psandoz, martin ! src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java + test/java/util/concurrent/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java Changeset: 72bbadc22ae2 Author: aeriksso Date: 2015-06-15 13:12 +0200 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/72bbadc22ae2 8081412: Remove MHIllegalAccess.java from the problem list Reviewed-by: darcy ! test/ProblemList.txt Changeset: fa85568bd976 Author: mchung Date: 2015-06-16 10:11 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/fa85568bd976 8098850: Remove remaining native2ascii resource files and man pages Reviewed-by: alanb - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java - src/linux/doc/man/ja/native2ascii.1 - src/linux/doc/man/native2ascii.1 - src/solaris/doc/sun/man/man1/ja/native2ascii.1 - src/solaris/doc/sun/man/man1/native2ascii.1 Changeset: f4d322ccd488 Author: vadim Date: 2015-05-27 14:42 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/f4d322ccd488 8079652: Could not enable D3D pipeline Reviewed-by: prr, serb ! src/java.desktop/windows/native/libawt/java2d/d3d/D3DPipelineManager.cpp Changeset: 7d5b99fb4d94 Author: serb Date: 2015-05-23 15:13 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/7d5b99fb4d94 8061831: [OGL] "java.lang.InternalError: not implemented yet" during the blit of VI to VI in xor mode Reviewed-by: flar, bae ! src/java.desktop/share/classes/sun/java2d/opengl/OGLBlitLoops.java + test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java Changeset: 98c829f6a157 Author: anashaty Date: 2015-05-28 21:17 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/98c829f6a157 8041470: JButtons stay pressed after they have lost focus if you use the mouse wheel Reviewed-by: azvegint, alexp ! src/java.desktop/unix/classes/sun/awt/X11/XWindow.java + test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java Changeset: 7aaaac143eb0 Author: ysuenaga Date: 2015-05-29 08:58 +0900 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/7aaaac143eb0 8081295: Build failed with GCC 5.1.1 Summary: Array bounds and incorrect condition warnings happen with GCC 5.1.1 Reviewed-by: azvegint ! make/lib/Awt2dLibraries.gmk ! src/jdk.jdwp.agent/share/native/libjdwp/eventFilter.c Changeset: 4a6fbc097563 Author: bae Date: 2015-05-29 18:32 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/4a6fbc097563 8023794: [macosx] LCD Rendering hints seems not working without FRACTIONALMETRICS=ON Reviewed-by: serb, prr ! src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java ! src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m ! src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m ! src/java.desktop/share/classes/sun/java2d/opengl/OGLSurfaceData.java ! src/java.desktop/share/native/common/java2d/opengl/OGLContext.c ! src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c Changeset: 6f87fd2df0d6 Author: andrew Date: 2015-05-29 17:29 +0100 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/6f87fd2df0d6 8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure Summary: The include directive should be conditional on the use of the system JPEG library. Reviewed-by: prr, ihse ! make/lib/Awt2dLibraries.gmk Changeset: b0095b9f2cc5 Author: psadhukhan Date: 2015-06-01 13:40 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/b0095b9f2cc5 8080086: Test javax/imageio/plugins/png/ItxtUtf8Test.java fails on Linux with G1 GC Reviewed-by: prr, serb ! test/javax/imageio/plugins/png/ItxtUtf8Test.java Changeset: 17d0b74707e5 Author: alexsch Date: 2015-06-01 17:46 +0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/17d0b74707e5 8081019: Check peer to null in CPlatformWindow.checkZoom() Reviewed-by: serb, azvegint ! src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java + test/javax/swing/JOptionPane/8081019/bug8081019.java Changeset: 78da2a2cb529 Author: serb Date: 2015-06-02 19:27 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/78da2a2cb529 8079084: Behavior of BeanProperty.enumerationValues() contradicts spec Reviewed-by: alexsch, malenkov ! src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java ! test/java/beans/Introspector/4058433/TestBeanProperty.java Changeset: 4a9eff2768ce Author: mcherkas Date: 2015-06-03 15:21 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/4a9eff2768ce 8077409: Drawing deviates when validate() is invoked on java.awt.ScrollPane Reviewed-by: bae ! src/java.desktop/share/classes/java/awt/ScrollPane.java + test/java/awt/ScrollPane/bug8077409Test.java Changeset: 266da6804352 Author: avstepan Date: 2015-06-03 18:39 +0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/266da6804352 8077036: swing docs: fix some tidy warnings Summary: minor fixes for docs Reviewed-by: alexsch ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java ! src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java ! src/java.desktop/share/classes/javax/swing/Timer.java ! src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java ! src/java.desktop/share/classes/sun/swing/PrintColorUIResource.java ! src/java.desktop/share/classes/sun/swing/PrintingStatus.java ! src/java.desktop/share/classes/sun/swing/SwingUtilities2.java ! src/java.desktop/share/classes/sun/swing/UIClientPropertyKey.java ! src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java Changeset: b7149503cca6 Author: avstepan Date: 2015-06-03 18:45 +0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/b7149503cca6 8081313: MultipleDocumentHandling.java: tidy warnings Summary: minor fix for docs Reviewed-by: alexsch ! src/java.desktop/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java Changeset: ca8134d195a1 Author: serb Date: 2015-06-03 23:17 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/ca8134d195a1 8076312: The behavior of the javax.swing.SwingContainer.delegate contradicts spec Reviewed-by: alexsch, malenkov ! src/java.desktop/share/classes/java/beans/BeanDescriptor.java ! test/java/beans/Introspector/4058433/TestSwingContainer.java Changeset: f5b6fc0d752f Author: prr Date: 2015-06-03 17:58 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/f5b6fc0d752f 8081886: CGGlyphImages.m no longer builds with x code 4.x Reviewed-by: bae, serb ! src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m Changeset: d2841caf9f49 Author: ddehaven Date: 2015-06-03 18:26 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/d2841caf9f49 Merge - make/gendata/Gendata-jdk.dev.gmk - src/java.base/share/classes/sun/misc/JavaBeansIntrospectorAccess.java - src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java - src/java.base/share/classes/sun/security/ssl/EngineArgs.java - src/java.base/share/classes/sun/security/ssl/EngineInputRecord.java - src/java.base/share/classes/sun/security/ssl/EngineOutputRecord.java - src/java.base/share/classes/sun/security/ssl/EngineWriter.java - src/java.base/share/classes/sun/security/ssl/KerberosClientKeyExchange.java - src/java.base/share/classes/sun/security/ssl/Krb5Helper.java - src/java.base/share/classes/sun/security/ssl/Krb5Proxy.java - src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java - src/java.security.jgss/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java - src/java.security.jgss/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java - test/java/lang/Character/UnicodeBlock/NonOptimalMapSize.java Changeset: a925105ec065 Author: anashaty Date: 2015-06-04 15:24 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/a925105ec065 8078606: Deadlock in awt clipboard Reviewed-by: azvegint, bae ! src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java ! src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java Changeset: 58ddd94907d1 Author: anashaty Date: 2015-06-04 16:18 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/58ddd94907d1 8068886: IDEA IntelliJ crashes in objc_msgSend when an accessibility tool is enabled Reviewed-by: serb, bae ! src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m ! src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m ! src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.h ! src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m Changeset: 5a7d72dafbee Author: bae Date: 2015-06-05 23:08 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/5a7d72dafbee 8085910: OGL text renderer: gamma lut cleanup Reviewed-by: serb, prr ! src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c Changeset: 73f62eb392bb Author: sgupta Date: 2015-06-08 18:30 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/73f62eb392bb 8079450: [TESTBUG] javax/swing/plaf/nimbus/8041642/bug8041642.java fails Reviewed-by: alexsch ! test/javax/swing/plaf/nimbus/8041642/bug8041642.java Changeset: f10c6da6698b Author: andrew Date: 2015-06-08 16:47 +0100 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/f10c6da6698b 8081315: 8077982 giflib upgrade breaks system giflib builds with earlier versions Summary: Add conditionals to provide giflib < 5 API calls and interlacing behaviour Reviewed-by: prr, azvegint ! src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c Changeset: 6904e8d9fb41 Author: prr Date: 2015-06-08 11:31 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/6904e8d9fb41 Merge Changeset: c806975e2e98 Author: prr Date: 2015-06-16 10:52 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/c806975e2e98 Merge - src/java.base/share/classes/sun/misc/ExtensionDependency.java - src/java.base/share/classes/sun/misc/ExtensionInfo.java - src/java.base/share/classes/sun/misc/ExtensionInstallationException.java - src/java.base/share/classes/sun/misc/ExtensionInstallationProvider.java - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java - src/linux/doc/man/ja/native2ascii.1 - src/linux/doc/man/native2ascii.1 - src/solaris/doc/sun/man/man1/ja/native2ascii.1 - src/solaris/doc/sun/man/man1/native2ascii.1 - test/javax/net/ssl/DTLS/DTLSUnSupportedCiphersTest.java - test/javax/net/ssl/DTLSv10/DTLSv10UnSupportedCiphersTest.java - test/javax/net/ssl/TLSCommon/UnSupportedCiphersTest.java - test/sun/tools/jmap/heapconfig/LingeredApp.java - test/sun/tools/jmap/heapconfig/LingeredAppTest.java Changeset: 9be08dde19af Author: bpb Date: 2015-06-16 14:38 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/9be08dde19af 8087304: (ch) java/nio/channels/DatagramChannel/EmptyBuffer.java received 4 times while expected 3 Summary: Only count datagrams received from the client within the test. Reviewed-by: alanb, chegar ! test/java/nio/channels/DatagramChannel/EmptyBuffer.java Changeset: ab212f09ffae Author: darcy Date: 2015-06-16 17:05 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/ab212f09ffae 8098790: Improve cross references and wording in java.lang.reflect.AnnotatedFoo type Reviewed-by: lancea ! src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java ! src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java ! src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java ! src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java ! src/java.base/share/classes/java/lang/reflect/TypeVariable.java ! src/java.base/share/classes/java/lang/reflect/WildcardType.java Changeset: 69cb11a71ab8 Author: kshefov Date: 2015-06-17 20:17 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/69cb11a71ab8 8067005: Several java/lang/invoke tests fail due to exhausted code cache Reviewed-by: vlivanov ! test/java/lang/invoke/MethodHandles/CatchExceptionTest.java ! test/java/lang/invoke/MethodHandlesTest.java ! test/java/lang/invoke/TestCatchExceptionWithVarargs.java ! test/java/lang/invoke/VarargsArrayTest.java ! test/lib/testlibrary/jdk/testlibrary/Utils.java + test/lib/testlibrary/jsr292/com/oracle/testlibrary/jsr292/CodeCacheOverflowProcessor.java Changeset: a2ff61db3446 Author: kshefov Date: 2015-06-17 20:19 +0300 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/a2ff61db3446 8062904: TEST_BUG: Tests java/lang/invoke/LFCaching fail when run with -Xcomp option Reviewed-by: vlivanov ! test/java/lang/invoke/LFCaching/LFCachingTestCase.java ! test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java ! test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java ! test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java ! test/java/lang/invoke/LFCaching/LambdaFormTestCase.java Changeset: 935d2b780095 Author: dfuchs Date: 2015-06-17 15:47 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/935d2b780095 8072692: Improve performance of SecurityManager.checkPackageAccess Reviewed-by: mullan, weijun ! src/java.base/share/classes/java/lang/SecurityManager.java ! test/java/lang/SecurityManager/CheckPackageAccess.java + test/java/lang/SecurityManager/CheckPackageMatching.java + test/java/lang/SecurityManager/RestrictedPackages.java Changeset: 2ebd2395e3e8 Author: mullan Date: 2015-06-17 15:48 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/2ebd2395e3e8 Merge Changeset: 203d0c15a4fb Author: rriggs Date: 2015-06-17 16:03 -0400 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/203d0c15a4fb 8086208: java/lang/ProcessHandle/OnExitTest.java: IllegalThreadStateException: process hasn't exited Reviewed-by: martin, dholmes ! src/java.base/unix/classes/java/lang/ProcessImpl.java ! test/java/lang/ProcessHandle/OnExitTest.java Changeset: 643306cf8ecf Author: weijun Date: 2014-11-20 17:52 +0800 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/643306cf8ecf 8064890: SecureClassLoader should use a ConcurrentHashMap Reviewed-by: mullan ! src/java.base/share/classes/java/security/SecureClassLoader.java Changeset: ccf7106f27cd Author: rhalade Date: 2015-06-18 11:16 +0800 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/ccf7106f27cd 8060103: CheckBlacklistedCerts.java thinks its openjdk build Reviewed-by: weijun ! test/lib/security/CheckBlacklistedCerts.java Changeset: a7f731125b7f Author: lana Date: 2015-06-18 10:24 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/a7f731125b7f Merge - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java - src/jdk.dev/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java - src/linux/doc/man/ja/native2ascii.1 - src/linux/doc/man/native2ascii.1 - src/solaris/doc/sun/man/man1/ja/native2ascii.1 - src/solaris/doc/sun/man/man1/native2ascii.1 Changeset: 1298aa4632c6 Author: katleman Date: 2015-06-25 10:21 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/1298aa4632c6 Added tag jdk9-b70 for changeset a7f731125b7f ! .hgtags Changeset: ae0e82812f1f Author: iris Date: 2015-06-29 11:28 -0700 URL: http://hg.openjdk.java.net/verona/stage/jdk/rev/ae0e82812f1f Merge ! make/mapfiles/libjava/mapfile-vers