8257450: Start of release updates for JDK 17 #1531

jddarcy · 2020-12-01T06:22:51Z

Start of JDK 17 updates.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issues

JDK-8257450: Start of release updates for JDK 17
JDK-8257451: Add SourceVersion.RELEASE_17
JDK-8257453: Add source 17 and target 17 to javac

Reviewers

David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to ff9b78e
Erik Joelsson (@erikj79 - Reviewer) ⚠️ Review applies to 4187d66
Iris Clark (@irisclark - Reviewer) ⚠️ Review applies to 4187d66
Mikael Vidstedt (@vidmik - Reviewer) ⚠️ Review applies to 4187d66
Jonathan Gibbons (@jonathan-gibbons - Reviewer) ⚠️ Review applies to f6a6447
Jan Lahoda (@lahodaj - Reviewer) ⚠️ Review applies to f6a6447
Jesper Wilhelmsson (@JesperIRL - Reviewer) ⚠️ Review applies to f6a6447
Mandy Chung (@mlchung - Reviewer) ⚠️ Review applies to ff9b78e
Magnus Ihse Bursie (@magicus - Reviewer) ⚠️ Review applies to 57ba7b6

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1531/head:pull/1531
$ git checkout pull/1531

bridgekeeper · 2020-12-01T06:23:52Z

👋 Welcome back darcy! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2020-12-01T06:24:53Z

@jddarcy The following labels will be automatically applied to this pull request:

build
compiler
core-libs
hotspot
javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

jddarcy · 2020-12-01T06:30:05Z

/test

openjdk · 2020-12-01T06:31:44Z

Could not create test job

jddarcy · 2020-12-01T06:43:12Z

/issue 8257451
/issue 8257453

openjdk · 2020-12-01T06:43:35Z

@jddarcy
Adding additional issue to issue list: 8257451: Add SourceVersion.RELEASE_17.

openjdk · 2020-12-01T06:44:31Z

@jddarcy
Adding additional issue to issue list: 8257453: Add source 17 and target 17 to javac.

…-8257450

openjdk · 2020-12-01T07:22:45Z

⚠️ @jddarcy This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

dholmes-ora

Looks good - 99% sym stuff :)

Doesn't look like the hotspot deprecated flag test will need updating this time, as no newly deprecated flags marked for obsoletion in 17.

dholmes-ora · 2020-12-01T07:32:11Z

src/hotspot/share/opto/type.cpp

+  const Type* mt2 = t->xmeet(this);
+  if (mt != mt2) {
+    tty->print_cr("=== Meet Not Commutative ===");
+    tty->print("t           = ");   t->dump(); tty->cr();
+    tty->print("this        = ");      dump(); tty->cr();
+    tty->print("t meet this = "); mt2->dump(); tty->cr();
+    tty->print("this meet t = ");  mt->dump(); tty->cr();
+    fatal("meet not commutative");
+  }


Merge issue??

dholmes-ora · 2020-12-01T07:33:25Z

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

@@ -217,7 +223,7 @@ public Target requiredTarget() {
        PATTERN_MATCHING_IN_INSTANCEOF(JDK16, Fragments.FeaturePatternMatchingInstanceof, DiagKind.NORMAL),
        REIFIABLE_TYPES_INSTANCEOF(JDK16, Fragments.FeatureReifiableTypesInstanceof, DiagKind.PLURAL),
        RECORDS(JDK16, Fragments.FeatureRecords, DiagKind.PLURAL),
-        SEALED_CLASSES(JDK16, Fragments.FeatureSealedClasses, DiagKind.PLURAL),
+        SEALED_CLASSES(JDK17, Fragments.FeatureSealedClasses, DiagKind.PLURAL),


Is this changed because it is still preview?

Right; JEP 397: "Sealed Classes (Second Preview)" is PTT for JDk 16.

dholmes-ora · 2020-12-01T07:34:02Z

test/hotspot/gtest/aarch64/test_assembler_aarch64.cpp

@@ -24,7 +24,7 @@

 #include "precompiled.hpp"

-#ifdef AARCH64
+#if defined(AARCH64) && !defined(ZERO)


Another merge issue.

…-8257450

mlbridge · 2020-12-04T21:18:23Z

Webrevs

jddarcy · 2020-12-04T21:20:32Z

Usual start of release update:

Expected version number updates in the make system
New set of data files to support --release 16 in javac
Update to various version-related langtools APIs and tests
Minor N -> N+1 updates in vm and vm tests

One javadoc test that failed under the new version was fixed before this PR was sent out.

erikj79

Build changes look good and I'm happy there are so few of them!

openjdk · 2020-12-04T21:35:29Z

@jddarcy This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8257450: Start of release updates for JDK 17
8257451: Add SourceVersion.RELEASE_17
8257453: Add source 17 and target 17 to javac

Reviewed-by: dholmes, erikj, iris, mikael, jjg, jlahoda, jwilhelm, mchung, ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

lahodaj · 2020-12-07T16:10:42Z

The langtools changes look fine to me. There were additions/changes to jcod files under test/hotspot/jtreg/runtime/sealedClasses/ made under JDK-8246778, so these may need an update. Sorry about that.

jddarcy · 2020-12-07T19:47:32Z

The langtools changes look fine to me. There were additions/changes to jcod files under test/hotspot/jtreg/runtime/sealedClasses/ made under JDK-8246778, so these may need an update. Sorry about that.

After a merge, the tests in that directory still pass. Will keep merging in new changes and do at least more more test run before pushing. Thanks.

jonathan-gibbons

I've read all the files, and approve all the langtools related ones (i.e. not hotspot)
As you've noticed elsewhere, there's a pending conflict with Magnus' work to move files around.

jonathan-gibbons · 2020-12-07T20:05:37Z

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

@@ -107,7 +107,12 @@
    /**
      * 16, tbd


The "tbd" can presumably be filled in now

jonathan-gibbons · 2020-12-07T20:08:59Z

test/jdk/java/lang/module/ClassFileVersionsTest.java

-                { 61,   0,  Set.of()},                       // JDK 17
+                { 61,   0,  Set.of(STATIC) },                // JDK 17
+                { 61,   0,  Set.of(TRANSITIVE) },
+                { 61,   0,  Set.of(STATIC, TRANSITIVE) },
+
+                { 62,   0,  Set.of()},                       // JDK 18


This seems unduly repetitive. Could this be dynamically generated, perhaps in a future release?

I've had similar thoughts; that strikes me as a fine RFE for after this fork. I see what the code is doing, but haven't delved into the module system details to understand exactly the rationale for these tests. In any case, filed the RFE JDK-8257856: "Make ClassFileVersionsTest.java robust to JDK version updates."

There was a change to JVMS 4.7.25 in Java 10 to add a rule for the requires_flags that are allowed. This is why this test started was created to test 53.0 vs. 54.0 class files. It wasn't intended to be a burden to update at each release so I'll re-implement it.

jonathan-gibbons · 2020-12-07T20:10:47Z

test/langtools/tools/javac/preview/classReaderTest/Client.preview.out

- compiler.warn.preview.feature.use.classfile: Bar.class, 16
+- compiler.warn.preview.feature.use.classfile: Bar.class, 17


Is this a test can could be automated? (i.e. no manual change per release?)

jonathan-gibbons · 2020-12-07T20:11:11Z

test/langtools/tools/javac/versions/Versions.java

- * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563 8245147 8245586
+ * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563 8245147 8245586 8257453


long lines are annoying

jonathan-gibbons · 2020-12-07T20:11:47Z

test/langtools/tools/javac/versions/Versions.java

@@ -293,13 +294,20 @@ protected void checksrc15(List<String> args) {
       printargs("checksrc15", args);
       expectedPass(args, List.of("New7.java", "New8.java", "New10.java", "New11.java",
                                  "New14.java", "New15.java"));
-       // Add expectedFail after new language features added in a later release.
+        expectedFail(args, List.of("New16.java"));


(minor) looks like bad indentation

JesperIRL · 2020-12-07T20:20:58Z

src/java.compiler/share/classes/javax/lang/model/SourceVersion.java

+     *
+     * @since 17
+     */
+    RELEASE_17;


Would it make sense to have a RELEASE_LATEST for the cases that are just updated to the latest release every six months?

That kind of design was considered and rejected with the API was initially added. The use of enum constants in annotations must be an actual enum constant, not just a static final field pointing to a particular enum value. It would be possible to conceptually alias RELEASE_LATEST with whatever actual constant was the latest (16, then 17, then 18...), but that would cause issues with other uses of the API.

magicus

Build changes (or should I say "change"?) looks good!

jddarcy · 2020-12-10T16:45:49Z

/integrate

openjdk · 2020-12-10T16:46:53Z

@jddarcy Since your change was applied there have been 10 commits pushed to the master branch:

d163c6f: 8258015: [JVMCI] JVMCI_lock shouldn't be held while initializing box classes
b35401d: 8257966: Instrument test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java
37043b0: 8257837: Performance regression in heap byte buffer views
0890620: 8258005: JDK build fails with incorrect fixpath script
502a524: 8257602: Introduce JFR Event Throttling and new jdk.ObjectAllocationSample event (enabled by default)
026b09c: 8257483: C2: Split immediate vector rotate from RotateLeftV and RotateRightV nodes
0a0691e: 8257901: ZGC: Take virtual memory usage into account when sizing heap
29ffffa: 8257997: sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java again reports leaks after JDK-8257884
db5da96: 8257876: Avoid Reference.isEnqueued in tests
4a839e9: 8256459: java/net/httpclient/ManyRequests.java and java/net/httpclient/LineBodyHandlerTest.java fail infrequently with java.net.ConnectException: Connection timed out: no further information

Your commit was automatically rebased without conflicts.

Pushed as commit 6be1f56.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

JDK-8257450

205f597

openjdk bot changed the title ~~JDK-8257450~~ 8257450: Start of release updates for JDK 17 Dec 1, 2020

openjdk bot added javadoc javadoc-dev@openjdk.org build build-dev@openjdk.org hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Dec 1, 2020

jddarcy added 2 commits November 30, 2020 23:20

JDK-8257450

6e18f72

Merge branch 'JDK-8257450' of https://github.com/jddarcy/jdk into JDK…

81f552e

…-8257450

dholmes-ora reviewed Dec 1, 2020

View reviewed changes

jddarcy added 4 commits December 1, 2020 11:57

JDK-8257450

7f1c9bb

Merge branch 'JDK-8257450' of https://github.com/jddarcy/jdk into JDK…

7a69999

…-8257450

Merge branch 'master' into JDK-8257450

af057e4

Update tests.

4187d66

openjdk bot removed the javadoc javadoc-dev@openjdk.org label Dec 4, 2020

jddarcy marked this pull request as ready for review December 4, 2020 21:14

openjdk bot added the rfr Pull request is ready for review label Dec 4, 2020

erikj79 approved these changes Dec 4, 2020

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 4, 2020

irisclark approved these changes Dec 5, 2020

View reviewed changes

vidmik approved these changes Dec 5, 2020

View reviewed changes

Merge branch 'master' into JDK-8257450

f6a6447

jonathan-gibbons approved these changes Dec 7, 2020

View reviewed changes

lahodaj approved these changes Dec 7, 2020

View reviewed changes

JesperIRL approved these changes Dec 7, 2020

View reviewed changes

jddarcy added 4 commits December 7, 2020 18:41

Merge branch 'master' into JDK-8257450

96e75b0

Merge branch 'master' into JDK-8257450

342c865

Update symbol files for JDK 16b27.

42b2bcd

Merge branch 'master' into JDK-8257450

ff9b78e

mlchung approved these changes Dec 8, 2020

View reviewed changes

Merge branch 'master' into JDK-8257450

87a6aab

dholmes-ora approved these changes Dec 8, 2020

View reviewed changes

jddarcy added 2 commits December 8, 2020 15:17

Get in JEP 390 changes.

57ba7b6

Merge branch 'master' into JDK-8257450

325c251

magicus approved these changes Dec 9, 2020

View reviewed changes

jddarcy added 3 commits December 9, 2020 12:35

Merge branch 'master' into JDK-8257450

187d3ff

Merge branch 'master' into JDK-8257450

766c2c0

Merge branch 'master' into JDK-8257450

553d134

openjdk bot closed this Dec 10, 2020

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 10, 2020

jddarcy deleted the JDK-8257450 branch February 9, 2021 02:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8257450: Start of release updates for JDK 17 #1531

8257450: Start of release updates for JDK 17 #1531

jddarcy commented Dec 1, 2020 •

edited by openjdk bot

Loading

bridgekeeper bot commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

jddarcy commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

jddarcy commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

dholmes-ora left a comment

dholmes-ora Dec 1, 2020

dholmes-ora Dec 1, 2020 •

edited

Loading

jddarcy Dec 1, 2020

dholmes-ora Dec 1, 2020

mlbridge bot commented Dec 4, 2020 •

edited

Loading

jddarcy commented Dec 4, 2020

erikj79 left a comment

openjdk bot commented Dec 4, 2020 •

edited

Loading

lahodaj commented Dec 7, 2020

jddarcy commented Dec 7, 2020

jonathan-gibbons left a comment •

edited

Loading

jonathan-gibbons Dec 7, 2020

jonathan-gibbons Dec 7, 2020

jddarcy Dec 7, 2020

AlanBateman Dec 8, 2020

jonathan-gibbons Dec 7, 2020

jonathan-gibbons Dec 7, 2020

jonathan-gibbons Dec 7, 2020

JesperIRL Dec 7, 2020

jddarcy Dec 7, 2020

magicus left a comment

jddarcy commented Dec 10, 2020

openjdk bot commented Dec 10, 2020

		- compiler.warn.preview.feature.use.classfile: Bar.class, 16
		- compiler.warn.preview.feature.use.classfile: Bar.class, 17

		* @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563 8245147 8245586
		* @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563 8245147 8245586 8257453

8257450: Start of release updates for JDK 17 #1531

8257450: Start of release updates for JDK 17 #1531

Conversation

jddarcy commented Dec 1, 2020 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Download

bridgekeeper bot commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

jddarcy commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

jddarcy commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

openjdk bot commented Dec 1, 2020

dholmes-ora left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dholmes-ora Dec 1, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mlbridge bot commented Dec 4, 2020 • edited Loading

Webrevs

jddarcy commented Dec 4, 2020

erikj79 left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 4, 2020 • edited Loading

lahodaj commented Dec 7, 2020

jddarcy commented Dec 7, 2020

jonathan-gibbons left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

magicus left a comment

Choose a reason for hiding this comment

jddarcy commented Dec 10, 2020

openjdk bot commented Dec 10, 2020

jddarcy commented Dec 1, 2020 •

edited by openjdk bot

Loading

dholmes-ora Dec 1, 2020 •

edited

Loading

mlbridge bot commented Dec 4, 2020 •

edited

Loading

openjdk bot commented Dec 4, 2020 •

edited

Loading

jonathan-gibbons left a comment •

edited

Loading