From asotona at openjdk.org  Fri Dec  1 13:18:30 2023
From: asotona at openjdk.org (Adam Sotona)
Date: Fri, 1 Dec 2023 13:18:30 GMT
Subject: RFR: 8308753: Class-File API transition to Preview [v32]
In-Reply-To: <e0eptru-lnzIXRfqrFBT1fy-oDsLORN-roOsdUzshUY=.68ff8e2b-68fb-4457-94fb-f0623eb3f96a@github.com>
References: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
 <9-Fm-UXpDT0FLAxTw9xve00qurpqv01xw1uJwG0IXKQ=.06a9e0da-7a8c-462b-9b7a-b1be1b9bff5f@github.com>
 <8aNWssZUAmka3xQNMbRvY8P8ruJ0-7Eo5NTLeQGPko4=.ac8f1a19-8f0a-42fc-85cf-2fb540d194a7@github.com>
 <Fd3Aa-rvhh0iWNFsGnOMCAMPvI5JiesSWh0tvPhPg5M=.379e7492-46d4-41f2-94c6-393b6701cad2@github.com>
 <e0eptru-lnzIXRfqrFBT1fy-oDsLORN-roOsdUzshUY=.68ff8e2b-68fb-4457-94fb-f0623eb3f96a@github.com>
Message-ID: <JOJKj3mt-3DRIVKUTDXwMYvh_g-P9hVax9PZ0MiLcyU=.ab0b0bd2-6101-4f87-bac0-49cc401e8452@github.com>

On Wed, 29 Nov 2023 08:46:46 GMT, Per Minborg <pminborg at openjdk.org> wrote:

>> This is explicit list of supported class file versions, so I don't see any other way.
>
> Would it not be possible to expose an immutable `Map<Integer, Integer>` that maps from Java version to major class version?

This is actually out of scope of this PR. Feel free to request a new ClassFile API feature.

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/15706#discussion_r1412090733

From asotona at openjdk.org  Fri Dec  1 13:46:25 2023
From: asotona at openjdk.org (Adam Sotona)
Date: Fri, 1 Dec 2023 13:46:25 GMT
Subject: RFR: 8308753: Class-File API transition to Preview [v33]
In-Reply-To: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
References: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
Message-ID: <smvNLtt0YumYsmswb7vrmD5O9V2wVvfR7VCHgtrHg8k=.c6a7c0c7-2984-4041-8a3c-134c2180a318@github.com>

> Classfile API is an internal library under package `jdk.internal.classfile`?in JDK 21.
> This pull request turns the Classfile API into a preview feature and moves it into `java.lang.classfile`.
> It repackages all uses across JDK and tests and adds lots of missing Javadoc.
> 
> This PR goes in sync with?[JDK-8308754](https://bugs.openjdk.org/browse/JDK-8308754): Class-File API (Preview) (CSR)
> and?[JDK-8280389](https://bugs.openjdk.org/browse/JDK-8280389): Class-File API (Preview) (JEP).
> 
> Online javadoc is available at:?
> https://cr.openjdk.org/~asotona/JDK-8308753-preview/api/java.base/java/lang/classfile/package-summary.html
> 
> In addition to the primary transition to preview, this pull request also includes:
> - All?Classfile*?classes ranamed to?ClassFile*?(based on JEP discussion).
> - A new preview feature, `CLASSFILE_API`, has been added.
> - Buildsystem tool required a little patch to support annotated modules.
> - All JDK modules using the Classfile API are newly participating in the preview.
> - All tests that use the Classfile API now have preview enabled.
> - A few Javac tests not allowing preview have been partially reverted; their conversion can be re-applied when the Classfile API leaves preview mode.
> 
> Despite the number of affected files, this pull request is relatively straight-forward. The preview version of the Classfile API is based on the internal version of the library from the JDK master branch, and there are no API features added.
> 
> Please review this pull request to help the Classfile API turn into a preview.
> 
> Any comments are welcome.
> 
> Thanks,
> Adam

Adam Sotona has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 371 commits:

 - Merge branch 'master' into JDK-8308753-preview
   
   # Conflicts:
   #	src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
 - fixed SwitchBootstrapTest
 - fixed SwitchBootstrap and StackMapsTest
 - fixed SwtichBootstrapTest and ModuleVersionTest
 - Merge branch 'master' into JDK-8308753-preview
 - Merge branch 'master' into JDK-8308753-preview
   
   # Conflicts:
   #	test/jdk/jdk/classfile/StackMapsTest.java
 - Merge branch 'master' into JDK-8308753-preview
   
   # Conflicts:
   #	test/langtools/tools/javac/7199823/InnerClassCannotBeVerified.java
 - added new package-info snippets and fixed ClassFile::parse throws javadoc description
 - fixed lambda tests
 - Merge branch 'master' into JDK-8308753-preview
 - ... and 361 more: https://git.openjdk.org/jdk/compare/3b30095a...b7b2e4e4

-------------

Changes: https://git.openjdk.org/jdk/pull/15706/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=15706&range=32
  Stats: 32362 lines in 787 files changed: 14660 ins; 14113 del; 3589 mod
  Patch: https://git.openjdk.org/jdk/pull/15706.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15706/head:pull/15706

PR: https://git.openjdk.org/jdk/pull/15706

From naoto at openjdk.org  Fri Dec  1 18:30:14 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Fri, 1 Dec 2023 18:30:14 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine
Message-ID: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>

This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).

-------------

Commit messages:
 - initial commit

Changes: https://git.openjdk.org/jdk/pull/16930/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=16930&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8321131
  Stats: 18 lines in 4 files changed: 18 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/jdk/pull/16930.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/16930/head:pull/16930

PR: https://git.openjdk.org/jdk/pull/16930

From iris at openjdk.org  Fri Dec  1 19:45:55 2023
From: iris at openjdk.org (Iris Clark)
Date: Fri, 1 Dec 2023 19:45:55 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine
In-Reply-To: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
Message-ID: <IZPGupsindhLivBsL5xaeBcfy_YsKDXgF2FP2Qdov9k=.b18a71cf-de81-4a25-9bf3-08d637e651e8@github.com>

On Fri, 1 Dec 2023 18:24:48 GMT, Naoto Sato <naoto at openjdk.org> wrote:

> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).

Marked as reviewed by iris (Reviewer).

src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java line 114:

> 112:                 return null;
> 113:             } finally {
> 114:                 jline.zeroOut();

The location of the `jline `declaration at new line 134 is unfortunate, but not a problem this PR needs to resolve.  The location makes sense if it was only used in `initJLineIfNeeded()` at some point in the past.

-------------

PR Review: https://git.openjdk.org/jdk/pull/16930#pullrequestreview-1760456573
PR Review Comment: https://git.openjdk.org/jdk/pull/16930#discussion_r1412504396

From naoto at openjdk.org  Fri Dec  1 21:24:47 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Fri, 1 Dec 2023 21:24:47 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v2]
In-Reply-To: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
Message-ID: <JcV9pmabcFkPVlKlMgvzdhEvewSjQCiBPEhVpWTeM7w=.405a12bc-8f64-4210-94fd-4bd99c4f4fde@github.com>

> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).

Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:

  moved instance fields at the top of the class

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/16930/files
  - new: https://git.openjdk.org/jdk/pull/16930/files/03e07d93..a3773d44

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=16930&range=01
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=16930&range=00-01

  Stats: 6 lines in 1 file changed: 3 ins; 3 del; 0 mod
  Patch: https://git.openjdk.org/jdk/pull/16930.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/16930/head:pull/16930

PR: https://git.openjdk.org/jdk/pull/16930

From naoto at openjdk.org  Fri Dec  1 21:24:49 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Fri, 1 Dec 2023 21:24:49 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v2]
In-Reply-To: <IZPGupsindhLivBsL5xaeBcfy_YsKDXgF2FP2Qdov9k=.b18a71cf-de81-4a25-9bf3-08d637e651e8@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
 <IZPGupsindhLivBsL5xaeBcfy_YsKDXgF2FP2Qdov9k=.b18a71cf-de81-4a25-9bf3-08d637e651e8@github.com>
Message-ID: <gmVk5E-99Nq9cYT89uZGM3tdvrmvLglITrqYwUNoqwk=.60f445b4-9de1-46fd-bbe2-7f0c371a786c@github.com>

On Fri, 1 Dec 2023 19:40:39 GMT, Iris Clark <iris at openjdk.org> wrote:

>> Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   moved instance fields at the top of the class
>
> src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java line 114:
> 
>> 112:                 return null;
>> 113:             } finally {
>> 114:                 jline.zeroOut();
> 
> The location of the `jline `declaration at new line 134 is unfortunate, but not a problem this PR needs to resolve.  The location makes sense if it was only used in `initJLineIfNeeded()` at some point in the past.

Thanks, Iris. Moved those instance fields to the top of the class.

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/16930#discussion_r1412582527

From iris at openjdk.org  Fri Dec  1 22:26:32 2023
From: iris at openjdk.org (Iris Clark)
Date: Fri, 1 Dec 2023 22:26:32 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v2]
In-Reply-To: <JcV9pmabcFkPVlKlMgvzdhEvewSjQCiBPEhVpWTeM7w=.405a12bc-8f64-4210-94fd-4bd99c4f4fde@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
 <JcV9pmabcFkPVlKlMgvzdhEvewSjQCiBPEhVpWTeM7w=.405a12bc-8f64-4210-94fd-4bd99c4f4fde@github.com>
Message-ID: <-UikhDCfyv0652dFnbjEv0DMdhp83YYPgBMyeyoBMa0=.e801fbd8-e6d2-4261-952c-b1879f30a20f@github.com>

On Fri, 1 Dec 2023 21:24:47 GMT, Naoto Sato <naoto at openjdk.org> wrote:

>> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).
>
> Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:
> 
>   moved instance fields at the top of the class

Marked as reviewed by iris (Reviewer).

src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java line 72:

> 70:         private final Terminal terminal;
> 71:         private volatile LineReader jline;
> 72: 

Relocation looks good.  Thanks!

-------------

PR Review: https://git.openjdk.org/jdk/pull/16930#pullrequestreview-1760648178
PR Review Comment: https://git.openjdk.org/jdk/pull/16930#discussion_r1412624704

From alanb at openjdk.org  Sat Dec  2 09:56:36 2023
From: alanb at openjdk.org (Alan Bateman)
Date: Sat, 2 Dec 2023 09:56:36 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v2]
In-Reply-To: <JcV9pmabcFkPVlKlMgvzdhEvewSjQCiBPEhVpWTeM7w=.405a12bc-8f64-4210-94fd-4bd99c4f4fde@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
 <JcV9pmabcFkPVlKlMgvzdhEvewSjQCiBPEhVpWTeM7w=.405a12bc-8f64-4210-94fd-4bd99c4f4fde@github.com>
Message-ID: <-F76IvTWA1BO03poBAk3kWKy-vRCYR6TyKJ5ErVqhV0=.197369ea-6593-4398-9382-a3b097150368@github.com>

On Fri, 1 Dec 2023 21:24:47 GMT, Naoto Sato <naoto at openjdk.org> wrote:

>> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).
>
> Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:
> 
>   moved instance fields at the top of the class

This looks okay. I think @MBaesken plan to try to some automated tests for this.

-------------

Marked as reviewed by alanb (Reviewer).

PR Review: https://git.openjdk.org/jdk/pull/16930#pullrequestreview-1760848832

From naoto at openjdk.org  Sat Dec  2 21:57:01 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Sat, 2 Dec 2023 21:57:01 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v3]
In-Reply-To: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
Message-ID: <Bo0RreJ7-KY0CGwLMwNhl1bpwO78k91eziGVWS4hvRc=.d64cf82e-9546-40a8-8267-c0320f8afabc@github.com>

> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).

Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:

  Removed unnecessary modification in LineReader

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/16930/files
  - new: https://git.openjdk.org/jdk/pull/16930/files/a3773d44..36ee3c84

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=16930&range=02
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=16930&range=01-02

  Stats: 6 lines in 2 files changed: 0 ins; 5 del; 1 mod
  Patch: https://git.openjdk.org/jdk/pull/16930.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/16930/head:pull/16930

PR: https://git.openjdk.org/jdk/pull/16930

From asotona at openjdk.org  Mon Dec  4 05:38:48 2023
From: asotona at openjdk.org (Adam Sotona)
Date: Mon, 4 Dec 2023 05:38:48 GMT
Subject: RFR: 8308753: Class-File API transition to Preview [v34]
In-Reply-To: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
References: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
Message-ID: <ERznvvOEs71JrKcEoPMt9cLFbuN-TrBQwnv_gAssFsU=.27708813-1833-45e2-bbd3-b3dee338d691@github.com>

> Classfile API is an internal library under package `jdk.internal.classfile`?in JDK 21.
> This pull request turns the Classfile API into a preview feature and moves it into `java.lang.classfile`.
> It repackages all uses across JDK and tests and adds lots of missing Javadoc.
> 
> This PR goes in sync with?[JDK-8308754](https://bugs.openjdk.org/browse/JDK-8308754): Class-File API (Preview) (CSR)
> and?[JDK-8280389](https://bugs.openjdk.org/browse/JDK-8280389): Class-File API (Preview) (JEP).
> 
> Online javadoc is available at:?
> https://cr.openjdk.org/~asotona/JDK-8308753-preview/api/java.base/java/lang/classfile/package-summary.html
> 
> In addition to the primary transition to preview, this pull request also includes:
> - All?Classfile*?classes ranamed to?ClassFile*?(based on JEP discussion).
> - A new preview feature, `CLASSFILE_API`, has been added.
> - Buildsystem tool required a little patch to support annotated modules.
> - All JDK modules using the Classfile API are newly participating in the preview.
> - All tests that use the Classfile API now have preview enabled.
> - A few Javac tests not allowing preview have been partially reverted; their conversion can be re-applied when the Classfile API leaves preview mode.
> 
> Despite the number of affected files, this pull request is relatively straight-forward. The preview version of the Classfile API is based on the internal version of the library from the JDK master branch, and there are no API features added.
> 
> Please review this pull request to help the Classfile API turn into a preview.
> 
> Any comments are welcome.
> 
> Thanks,
> Adam

Adam Sotona has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 372 commits:

 - Merge branch 'master' into JDK-8308753-preview
 - Merge branch 'master' into JDK-8308753-preview
   
   # Conflicts:
   #	src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
 - fixed SwitchBootstrapTest
 - fixed SwitchBootstrap and StackMapsTest
 - fixed SwtichBootstrapTest and ModuleVersionTest
 - Merge branch 'master' into JDK-8308753-preview
 - Merge branch 'master' into JDK-8308753-preview
   
   # Conflicts:
   #	test/jdk/jdk/classfile/StackMapsTest.java
 - Merge branch 'master' into JDK-8308753-preview
   
   # Conflicts:
   #	test/langtools/tools/javac/7199823/InnerClassCannotBeVerified.java
 - added new package-info snippets and fixed ClassFile::parse throws javadoc description
 - fixed lambda tests
 - ... and 362 more: https://git.openjdk.org/jdk/compare/b9df827a...a908e805

-------------

Changes: https://git.openjdk.org/jdk/pull/15706/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=15706&range=33
  Stats: 32362 lines in 787 files changed: 14660 ins; 14113 del; 3589 mod
  Patch: https://git.openjdk.org/jdk/pull/15706.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15706/head:pull/15706

PR: https://git.openjdk.org/jdk/pull/15706

From asotona at openjdk.org  Mon Dec  4 07:11:11 2023
From: asotona at openjdk.org (Adam Sotona)
Date: Mon, 4 Dec 2023 07:11:11 GMT
Subject: Integrated: 8308753: Class-File API transition to Preview
In-Reply-To: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
References: <5IwVpRwPx8HQfqUqzhtpPP3yBUI3xvvzWHThG1OxYYA=.ea599d4e-5052-4c61-b12e-3ad6604fbb12@github.com>
Message-ID: <xmC7Jgr28c-rsclwW-tBVjPo26NDX9amo2Ns2ez1Wtw=.5e1dd353-28ec-4c14-8ad0-4944b93a1216@github.com>

On Wed, 13 Sep 2023 09:48:00 GMT, Adam Sotona <asotona at openjdk.org> wrote:

> Classfile API is an internal library under package `jdk.internal.classfile`?in JDK 21.
> This pull request turns the Classfile API into a preview feature and moves it into `java.lang.classfile`.
> It repackages all uses across JDK and tests and adds lots of missing Javadoc.
> 
> This PR goes in sync with?[JDK-8308754](https://bugs.openjdk.org/browse/JDK-8308754): Class-File API (Preview) (CSR)
> and?[JDK-8280389](https://bugs.openjdk.org/browse/JDK-8280389): Class-File API (Preview) (JEP).
> 
> Online javadoc is available at:?
> https://cr.openjdk.org/~asotona/JDK-8308753-preview/api/java.base/java/lang/classfile/package-summary.html
> 
> In addition to the primary transition to preview, this pull request also includes:
> - All?Classfile*?classes ranamed to?ClassFile*?(based on JEP discussion).
> - A new preview feature, `CLASSFILE_API`, has been added.
> - Buildsystem tool required a little patch to support annotated modules.
> - All JDK modules using the Classfile API are newly participating in the preview.
> - All tests that use the Classfile API now have preview enabled.
> - A few Javac tests not allowing preview have been partially reverted; their conversion can be re-applied when the Classfile API leaves preview mode.
> 
> Despite the number of affected files, this pull request is relatively straight-forward. The preview version of the Classfile API is based on the internal version of the library from the JDK master branch, and there are no API features added.
> 
> Please review this pull request to help the Classfile API turn into a preview.
> 
> Any comments are welcome.
> 
> Thanks,
> Adam

This pull request has now been integrated.

Changeset: 2b00ac0d
Author:    Adam Sotona <asotona at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/2b00ac0d02a110326846c75ea7ea535dccbb1924
Stats:     32362 lines in 787 files changed: 14660 ins; 14113 del; 3589 mod

8308753: Class-File API transition to Preview

Reviewed-by: ihse, mchung, vromero

-------------

PR: https://git.openjdk.org/jdk/pull/15706

From jlahoda at openjdk.org  Mon Dec  4 16:40:41 2023
From: jlahoda at openjdk.org (Jan Lahoda)
Date: Mon, 4 Dec 2023 16:40:41 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v3]
In-Reply-To: <Bo0RreJ7-KY0CGwLMwNhl1bpwO78k91eziGVWS4hvRc=.d64cf82e-9546-40a8-8267-c0320f8afabc@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
 <Bo0RreJ7-KY0CGwLMwNhl1bpwO78k91eziGVWS4hvRc=.d64cf82e-9546-40a8-8267-c0320f8afabc@github.com>
Message-ID: <UuFWXAKhGQ00LpcY0j71b-psUDdUStsCpsfxmxibZyA=.5a3303c1-a3a0-43c7-bac2-66230e04e27a@github.com>

On Sat, 2 Dec 2023 21:57:01 GMT, Naoto Sato <naoto at openjdk.org> wrote:

>> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).
>
> Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Removed unnecessary modification in LineReader

Looks OK to me, thanks!

-------------

Marked as reviewed by jlahoda (Reviewer).

PR Review: https://git.openjdk.org/jdk/pull/16930#pullrequestreview-1762903500

From naoto at openjdk.org  Mon Dec  4 19:05:54 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Mon, 4 Dec 2023 19:05:54 GMT
Subject: RFR: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine [v3]
In-Reply-To: <Bo0RreJ7-KY0CGwLMwNhl1bpwO78k91eziGVWS4hvRc=.d64cf82e-9546-40a8-8267-c0320f8afabc@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
 <Bo0RreJ7-KY0CGwLMwNhl1bpwO78k91eziGVWS4hvRc=.d64cf82e-9546-40a8-8267-c0320f8afabc@github.com>
Message-ID: <0aL0l7SK2ZpxT9fQKsjC6MYrp5SndBIGKeDi_TlcirA=.355a6183-128a-4796-8c9d-35af8ee019db@github.com>

On Sat, 2 Dec 2023 21:57:01 GMT, Naoto Sato <naoto at openjdk.org> wrote:

>> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).
>
> Naoto Sato has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Removed unnecessary modification in LineReader

Thanks for the reviews!

-------------

PR Comment: https://git.openjdk.org/jdk/pull/16930#issuecomment-1839281180

From naoto at openjdk.org  Mon Dec  4 19:16:22 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Mon, 4 Dec 2023 19:16:22 GMT
Subject: Integrated: 8321131: Console read line with zero out should zero out
 underlying buffer in JLine
In-Reply-To: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
References: <PzHZPvbxGMfURD7JoaIocGRD8gkyJFh-i0oPeMx9zdc=.df1f2a34-527d-4e4a-b468-ddb51ad2d330@github.com>
Message-ID: <74xCt0q64O6KJf-zVhW6DqqLtjNKrOiAA53cxsAqI4w=.508eec57-c297-4dec-a545-65f279641943@github.com>

On Fri, 1 Dec 2023 18:24:48 GMT, Naoto Sato <naoto at openjdk.org> wrote:

> This is the fix to JLine, which makes it on par with the built-in Console fix ([JDK-8320798](https://bugs.openjdk.org/browse/JDK-8320798)).

This pull request has now been integrated.

Changeset: bd04f91e
Author:    Naoto Sato <naoto at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/bd04f91e9103ee04f643f8d04553705c4d78fda3
Stats:     19 lines in 3 files changed: 16 ins; 3 del; 0 mod

8321131: Console read line with zero out should zero out underlying buffer in JLine

Reviewed-by: iris, alanb, jlahoda

-------------

PR: https://git.openjdk.org/jdk/pull/16930

From duke at openjdk.org  Mon Dec  4 21:18:40 2023
From: duke at openjdk.org (John Hart)
Date: Mon, 4 Dec 2023 21:18:40 GMT
Subject: RFR: 8314327: Issues with JShell when using "local" execution
 engine [v2]
In-Reply-To: <TkSz3Rsb9JqjieYIoZbkmMLIif46OLAauv3IZvroIe8=.dfbc86e7-acfd-4248-ad39-8a287a14d9e3@github.com>
References: <JToy_lkQYUrC2Sc_fIj4Ms71103ThNycx2IDdV2KBIU=.c32cf606-103c-4ca2-8f58-6947b3514c33@github.com>
 <4qoKWRWzj8wBtBNmPgL2yb7eJCJVOoVT62djscW_-cc=.4d9a0e48-dc69-4c56-9219-4fb5e83cf3d7@github.com>
 <gDvguZbnfV4M84AM9XKfPnbBDCMcVBTBQcnFbnBUDGI=.aa393e3b-236f-46b1-8d52-fdb8bbb7047d@github.com>
 <TkSz3Rsb9JqjieYIoZbkmMLIif46OLAauv3IZvroIe8=.dfbc86e7-acfd-4248-ad39-8a287a14d9e3@github.com>
Message-ID: <zpTZfS547IYDITetc6eXA-sewgWbmMwwDFRfIwOTpUY=.a13b712a-bf66-435f-b90d-82bdc0225d90@github.com>

On Thu, 5 Oct 2023 22:31:31 GMT, Archie Cobbs <acobbs at openjdk.org> wrote:

>> Seems adding `createExecutionControl()` to `LocalExecutionControlProvider` should be enough? Something along these lines possibly?
>> 
>> diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java
>> index cc3879c5c6d..370fbb6bdfd 100644
>> --- a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java
>> +++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java
>> @@ -25,6 +25,7 @@
>>  
>>  package jdk.jshell.execution;
>>  
>> +import java.util.List;
>>  import java.util.Map;
>>  import jdk.jshell.spi.ExecutionControl;
>>  import jdk.jshell.spi.ExecutionControlProvider;
>> @@ -78,7 +79,31 @@ public Map<String,String> defaultParameters() {
>>       */
>>      @Override
>>      public ExecutionControl generate(ExecutionEnv env, Map<String, String> parameters) {
>> -        return new LocalExecutionControl();
>> +        ExecutionControl result = createExecutionControl(env, parameters);
>> +
>> +        // Apply any configured class path
>> +        List<String> remoteOptions = env.extraRemoteVMOptions();
>> +        int classPathIndex = remoteOptions.indexOf("--class-path") + 1;
>> +        if (classPathIndex > 0 && classPathIndex < remoteOptions.size()) {
>> +            try {
>> +                result.addToClasspath(remoteOptions.get(classPathIndex));
>> +            } catch (ExecutionControl.ExecutionControlException e) {
>> +                throw new RuntimeException("error configuring class path", e);
>> +            }
>> +        }
>> +
>> +        return result;
>>      }
>>  
>> +    /**
>> +     * Create the {@link ExecutionControl} using the specified delegate.
>> +     * Called from {@link #generate(ExecutionEnv, Map) }.
>> +     *
>> +     * @param env the {@code ExecutionEnv} for which the ExecutionControl should be created
>> +     * @param parameters the parameters that were passed to {@code generate}
>> +     * @return the newly created {@code ExecutionControl}
>> +     */
>> +    public ExecutionControl createExecutionControl(ExecutionEnv env, Map<String, String> parameters) {
>> +        return new LocalExecutionControl(new DefaultLoaderDelegate());
>> +    }
>>  }
>
>> Seems adding createExecutionControl() to LocalExecutionControlProvider should be enough? Something along these lines possibly?
> 
> Ah yes, that would work... because `DirectExecutionControl.addToClasspath()` invokes `LoaderDelegate.addToClasspath()`.
> 
> It's better place to apply the class path fix at that higher level anyway.
> 
> Thanks! I've applied this in 03565459ec3 ... let me know what you think.

@archiecobbs Thanks for this work; any chance this will get sponsored & merged?

-------------

PR Comment: https://git.openjdk.org/jdk/pull/15311#issuecomment-1839485804

From acobbs at openjdk.org  Tue Dec  5 17:28:39 2023
From: acobbs at openjdk.org (Archie Cobbs)
Date: Tue, 5 Dec 2023 17:28:39 GMT
Subject: RFR: 8314327: Issues with JShell when using "local" execution
 engine [v2]
In-Reply-To: <TkSz3Rsb9JqjieYIoZbkmMLIif46OLAauv3IZvroIe8=.dfbc86e7-acfd-4248-ad39-8a287a14d9e3@github.com>
References: <JToy_lkQYUrC2Sc_fIj4Ms71103ThNycx2IDdV2KBIU=.c32cf606-103c-4ca2-8f58-6947b3514c33@github.com>
 <4qoKWRWzj8wBtBNmPgL2yb7eJCJVOoVT62djscW_-cc=.4d9a0e48-dc69-4c56-9219-4fb5e83cf3d7@github.com>
 <gDvguZbnfV4M84AM9XKfPnbBDCMcVBTBQcnFbnBUDGI=.aa393e3b-236f-46b1-8d52-fdb8bbb7047d@github.com>
 <TkSz3Rsb9JqjieYIoZbkmMLIif46OLAauv3IZvroIe8=.dfbc86e7-acfd-4248-ad39-8a287a14d9e3@github.com>
Message-ID: <mVoBx1gg-EhKguMKuZzuIx1w5GwU6KDyB5lhVPiZGHg=.d722ac7c-15f4-43e2-a6fb-039ec60917cc@github.com>

On Thu, 5 Oct 2023 22:31:31 GMT, Archie Cobbs <acobbs at openjdk.org> wrote:

>> Seems adding `createExecutionControl()` to `LocalExecutionControlProvider` should be enough? Something along these lines possibly?
>> 
>> diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java
>> index cc3879c5c6d..370fbb6bdfd 100644
>> --- a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java
>> +++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControlProvider.java
>> @@ -25,6 +25,7 @@
>>  
>>  package jdk.jshell.execution;
>>  
>> +import java.util.List;
>>  import java.util.Map;
>>  import jdk.jshell.spi.ExecutionControl;
>>  import jdk.jshell.spi.ExecutionControlProvider;
>> @@ -78,7 +79,31 @@ public Map<String,String> defaultParameters() {
>>       */
>>      @Override
>>      public ExecutionControl generate(ExecutionEnv env, Map<String, String> parameters) {
>> -        return new LocalExecutionControl();
>> +        ExecutionControl result = createExecutionControl(env, parameters);
>> +
>> +        // Apply any configured class path
>> +        List<String> remoteOptions = env.extraRemoteVMOptions();
>> +        int classPathIndex = remoteOptions.indexOf("--class-path") + 1;
>> +        if (classPathIndex > 0 && classPathIndex < remoteOptions.size()) {
>> +            try {
>> +                result.addToClasspath(remoteOptions.get(classPathIndex));
>> +            } catch (ExecutionControl.ExecutionControlException e) {
>> +                throw new RuntimeException("error configuring class path", e);
>> +            }
>> +        }
>> +
>> +        return result;
>>      }
>>  
>> +    /**
>> +     * Create the {@link ExecutionControl} using the specified delegate.
>> +     * Called from {@link #generate(ExecutionEnv, Map) }.
>> +     *
>> +     * @param env the {@code ExecutionEnv} for which the ExecutionControl should be created
>> +     * @param parameters the parameters that were passed to {@code generate}
>> +     * @return the newly created {@code ExecutionControl}
>> +     */
>> +    public ExecutionControl createExecutionControl(ExecutionEnv env, Map<String, String> parameters) {
>> +        return new LocalExecutionControl(new DefaultLoaderDelegate());
>> +    }
>>  }
>
>> Seems adding createExecutionControl() to LocalExecutionControlProvider should be enough? Something along these lines possibly?
> 
> Ah yes, that would work... because `DirectExecutionControl.addToClasspath()` invokes `LoaderDelegate.addToClasspath()`.
> 
> It's better place to apply the class path fix at that higher level anyway.
> 
> Thanks! I've applied this in 03565459ec3 ... let me know what you think.

> @archiecobbs Thanks for this work; any chance this will get sponsored & merged?

I hope so...   @lahodaj any remaining issues?

-------------

PR Comment: https://git.openjdk.org/jdk/pull/15311#issuecomment-1841278478

From jlahoda at openjdk.org  Tue Dec  5 18:02:52 2023
From: jlahoda at openjdk.org (Jan Lahoda)
Date: Tue, 5 Dec 2023 18:02:52 GMT
Subject: RFR: 8314327: Issues with JShell when using "local" execution
 engine [v4]
In-Reply-To: <hIAHKypOqY9aRP2qD7NVsAGsoPMKJ-yB2SCngLDm_us=.19288584-a1df-40e7-94dd-3b050f3fa578@github.com>
References: <JToy_lkQYUrC2Sc_fIj4Ms71103ThNycx2IDdV2KBIU=.c32cf606-103c-4ca2-8f58-6947b3514c33@github.com>
 <hIAHKypOqY9aRP2qD7NVsAGsoPMKJ-yB2SCngLDm_us=.19288584-a1df-40e7-94dd-3b050f3fa578@github.com>
Message-ID: <CmB1PIrar8GSp1xq81KE7sASBVeZtOATRre2Tu_aJiI=.3905affc-62b9-472c-be37-47b64a2f2b1e@github.com>

On Thu, 5 Oct 2023 23:08:57 GMT, Archie Cobbs <acobbs at openjdk.org> wrote:

>> There are a few bugs (or "opportunities for improvement") in JShell's support for "local" execution control.
>> 
>> **Background**
>> 
>> JShell utilizes two distinct "class lookup" functions. First, it looks up clases when compiling snippets. This happens indirectly via the Java compiler using its `JavaFileSystem` interface. Secondly, JShell executes code by supplying an execution engine with class files and asking it to invoke methods. The execution engine therefore performs a class lookup function when it links and loads these classes. The compilation happens on the local machine while the execution happens either locally or remotely.
>> 
>> For everything to run smoothly, both of these lookup functions must be working for whatever class(es) you want to name in JShell input.
>> 
>> Local execution is implemented by `LocalExecutionControl` and provided by the `LocalExecutionControlProvider` under the name `"local"`. In turn, `LocalExecutionControl` uses a `LoaderDelegate` to manage class loading. The default `DefaultLoaderDelegate` uses a custom subclass of `URLClassLoader` (called `RemoteClassLoader`). This class loader has two functions: (a) keep track of snippet classes generated by JShell, and (b) find classes for the execution engine (normal class loader function).
>> 
>> **Issue 1**
>> 
>> The `RemoteClassLoader` is hard-wired with the system class loader as its parent loader. This means that in non-trivial class loading scenarios, such as when running in web servlet container, the application's classes are not visible to the local execution engine.  As a result, it's impossible to resolve any of these classes.
>> 
>> **Issue 2**
>> 
>> JShell has a `--class-path` parameter that is supposed to handle properly configuring *both* lookup functions, i.e., compilation and execution. Internally, this is done by (a) configuring the compiler's class path, and (b) passing this flag to the execution engine as a "remove VM option".
>> 
>> However, the "local" execution engine ignores the remote VM options.
>> 
>> Here's a simple demonstration:
>> 
>> 
>>     $ ls classes/test/Foo.class
>>     classes/test/Foo.class
>>     $ jshell --execution=local --class-path classes
>>     |  Welcome to JShell -- Version 20.0.1
>>     |  For an introduction type: /help intro
>> 
>>     jshell> Class.forName("test.Foo");
>>     |  Exception java.lang.ClassNotFoundException: test.Foo
>>     |        at URLClassLoader.findClass (URLClassLoader.java:445)
>>     |        at DefaultLoaderDelegate$RemoteClass...
>
> Archie Cobbs has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Add missing @param and @since tags for new constructor.

Thanks for sponsoring the PR, Vicente. I apologize, I forgot about it.

-------------

PR Comment: https://git.openjdk.org/jdk/pull/15311#issuecomment-1841329258

From acobbs at openjdk.org  Tue Dec  5 18:02:54 2023
From: acobbs at openjdk.org (Archie Cobbs)
Date: Tue, 5 Dec 2023 18:02:54 GMT
Subject: Integrated: 8314327: Issues with JShell when using "local" execution
 engine
In-Reply-To: <JToy_lkQYUrC2Sc_fIj4Ms71103ThNycx2IDdV2KBIU=.c32cf606-103c-4ca2-8f58-6947b3514c33@github.com>
References: <JToy_lkQYUrC2Sc_fIj4Ms71103ThNycx2IDdV2KBIU=.c32cf606-103c-4ca2-8f58-6947b3514c33@github.com>
Message-ID: <qo8bLgO9TqjLLlOLP5KeSifGiFstRMPh3f0Reqyh3R0=.5dce85f8-bd25-43ac-add6-2e4637b9f6cb@github.com>

On Wed, 16 Aug 2023 14:55:54 GMT, Archie Cobbs <acobbs at openjdk.org> wrote:

> There are a few bugs (or "opportunities for improvement") in JShell's support for "local" execution control.
> 
> **Background**
> 
> JShell utilizes two distinct "class lookup" functions. First, it looks up clases when compiling snippets. This happens indirectly via the Java compiler using its `JavaFileSystem` interface. Secondly, JShell executes code by supplying an execution engine with class files and asking it to invoke methods. The execution engine therefore performs a class lookup function when it links and loads these classes. The compilation happens on the local machine while the execution happens either locally or remotely.
> 
> For everything to run smoothly, both of these lookup functions must be working for whatever class(es) you want to name in JShell input.
> 
> Local execution is implemented by `LocalExecutionControl` and provided by the `LocalExecutionControlProvider` under the name `"local"`. In turn, `LocalExecutionControl` uses a `LoaderDelegate` to manage class loading. The default `DefaultLoaderDelegate` uses a custom subclass of `URLClassLoader` (called `RemoteClassLoader`). This class loader has two functions: (a) keep track of snippet classes generated by JShell, and (b) find classes for the execution engine (normal class loader function).
> 
> **Issue 1**
> 
> The `RemoteClassLoader` is hard-wired with the system class loader as its parent loader. This means that in non-trivial class loading scenarios, such as when running in web servlet container, the application's classes are not visible to the local execution engine.  As a result, it's impossible to resolve any of these classes.
> 
> **Issue 2**
> 
> JShell has a `--class-path` parameter that is supposed to handle properly configuring *both* lookup functions, i.e., compilation and execution. Internally, this is done by (a) configuring the compiler's class path, and (b) passing this flag to the execution engine as a "remove VM option".
> 
> However, the "local" execution engine ignores the remote VM options.
> 
> Here's a simple demonstration:
> 
> 
>     $ ls classes/test/Foo.class
>     classes/test/Foo.class
>     $ jshell --execution=local --class-path classes
>     |  Welcome to JShell -- Version 20.0.1
>     |  For an introduction type: /help intro
> 
>     jshell> Class.forName("test.Foo");
>     |  Exception java.lang.ClassNotFoundException: test.Foo
>     |        at URLClassLoader.findClass (URLClassLoader.java:445)
>     |        at DefaultLoaderDelegate$RemoteClassLoader.findClass (DefaultLoaderDelegate.java:154)
>     |        at ...

This pull request has now been integrated.

Changeset: 640d7f31
Author:    Archie Cobbs <acobbs at openjdk.org>
Committer: Vicente Romero <vromero at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/640d7f31b22adde0926521bea4d616b570c21f2e
Stats:     316 lines in 6 files changed: 314 ins; 0 del; 2 mod

8314327: Issues with JShell when using "local" execution engine

Reviewed-by: jlahoda

-------------

PR: https://git.openjdk.org/jdk/pull/15311

From naoto at openjdk.org  Fri Dec  8 18:11:21 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Fri, 8 Dec 2023 18:11:21 GMT
Subject: [jdk22] RFR: 8321409: Console read line with zero out should zero out
 underlying buffer in JLine (redux)
Message-ID: <LpIhsINih6aoKgUDv_BYG8m5pWrwG8HnnDPNjyq_6YE=.edfade42-2eb7-4bd7-ad27-158a4c427f4a@github.com>

8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)

-------------

Commit messages:
 - Backport 4ed38f5ad5f822ab948257ed39717ea919fd32ed

Changes: https://git.openjdk.org/jdk22/pull/3/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk22&pr=3&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8321409
  Stats: 12 lines in 3 files changed: 11 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/jdk22/pull/3.diff
  Fetch: git fetch https://git.openjdk.org/jdk22.git pull/3/head:pull/3

PR: https://git.openjdk.org/jdk22/pull/3

From alanb at openjdk.org  Fri Dec  8 18:15:40 2023
From: alanb at openjdk.org (Alan Bateman)
Date: Fri, 8 Dec 2023 18:15:40 GMT
Subject: [jdk22] RFR: 8321409: Console read line with zero out should zero
 out underlying buffer in JLine (redux)
In-Reply-To: <LpIhsINih6aoKgUDv_BYG8m5pWrwG8HnnDPNjyq_6YE=.edfade42-2eb7-4bd7-ad27-158a4c427f4a@github.com>
References: <LpIhsINih6aoKgUDv_BYG8m5pWrwG8HnnDPNjyq_6YE=.edfade42-2eb7-4bd7-ad27-158a4c427f4a@github.com>
Message-ID: <O7DuerCacr-uGvTlwMF5jaQ-BhVD_6dbzNXIs7TnffE=.3ab0b0a5-06ae-4e2b-921a-1adf615196da@github.com>

On Fri, 8 Dec 2023 18:04:12 GMT, Naoto Sato <naoto at openjdk.org> wrote:

> 8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)

Marked as reviewed by alanb (Reviewer).

-------------

PR Review: https://git.openjdk.org/jdk22/pull/3#pullrequestreview-1772922070

From naoto at openjdk.org  Fri Dec  8 18:18:40 2023
From: naoto at openjdk.org (Naoto Sato)
Date: Fri, 8 Dec 2023 18:18:40 GMT
Subject: [jdk22] Integrated: 8321409: Console read line with zero out should
 zero out underlying buffer in JLine (redux)
In-Reply-To: <LpIhsINih6aoKgUDv_BYG8m5pWrwG8HnnDPNjyq_6YE=.edfade42-2eb7-4bd7-ad27-158a4c427f4a@github.com>
References: <LpIhsINih6aoKgUDv_BYG8m5pWrwG8HnnDPNjyq_6YE=.edfade42-2eb7-4bd7-ad27-158a4c427f4a@github.com>
Message-ID: <Q3p2bZQmpH1lUFJlFzqJO8bIuIGP1Kg3prqK1fHz9gc=.938d3169-cba6-4f47-81aa-4c7787dfda2b@github.com>

On Fri, 8 Dec 2023 18:04:12 GMT, Naoto Sato <naoto at openjdk.org> wrote:

> 8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)

This pull request has now been integrated.

Changeset: e5684da6
Author:    Naoto Sato <naoto at openjdk.org>
URL:       https://git.openjdk.org/jdk22/commit/e5684da6e5c83fb25e894edebff512093b8f26ab
Stats:     12 lines in 3 files changed: 11 ins; 0 del; 1 mod

8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)

Reviewed-by: alanb
Backport-of: 4ed38f5ad5f822ab948257ed39717ea919fd32ed

-------------

PR: https://git.openjdk.org/jdk22/pull/3

From abimpoudis at openjdk.org  Mon Dec 11 16:08:53 2023
From: abimpoudis at openjdk.org (Aggelos Biboudis)
Date: Mon, 11 Dec 2023 16:08:53 GMT
Subject: RFR: 8303374: Compiler Implementation for Primitive types in
 patterns, instanceof, and switch (Preview) [v34]
In-Reply-To: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
References: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
Message-ID: <5d4KAKHRi3RXoFSlZ6FtQx6OKetrSwnBU8XP1AbAhhY=.e1f9236c-e039-4bc4-838a-38a43caff265@github.com>

> This is the proposed patch for Primitive types in patterns, instanceof, and switch (Preview).
> 
> Draft spec here: https://cr.openjdk.org/~abimpoudis/instanceof/latest/

Aggelos Biboudis has updated the pull request incrementally with 11 additional commits since the last revision:

 - Merge branch 'primitive-patterns-and-generating-dispatch' into primitive-patterns
 - Fixed switch in the cases of unboxing and widening
 - Merge branch 'JDK-8319220' into primitive-patterns
 - Merge branch 'master' into JDK-8319220
 - reflecting review comment: fixing letter case.
 - Reflecting review feedback.
 - Some more get->orElseThrow
 - Reflecting review feedback.
 - Avoiding generating dead code - review feedback.
 - Cleanup.
 - ... and 1 more: https://git.openjdk.org/jdk/compare/2b2405cc...fac9ca98

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/15638/files
  - new: https://git.openjdk.org/jdk/pull/15638/files/2b2405cc..fac9ca98

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=33
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=32-33

  Stats: 689 lines in 5 files changed: 423 ins; 222 del; 44 mod
  Patch: https://git.openjdk.org/jdk/pull/15638.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15638/head:pull/15638

PR: https://git.openjdk.org/jdk/pull/15638

From abimpoudis at openjdk.org  Mon Dec 11 16:16:45 2023
From: abimpoudis at openjdk.org (Aggelos Biboudis)
Date: Mon, 11 Dec 2023 16:16:45 GMT
Subject: RFR: 8303374: Compiler Implementation for Primitive types in
 patterns, instanceof, and switch (Preview) [v35]
In-Reply-To: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
References: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
Message-ID: <YzWv2vncQQYO1qA4ALZd9x-uEVpkgRdAzoKiP9dvSqo=.b750b800-7fd4-4b0e-86bc-eab1813cd571@github.com>

> This is the proposed patch for Primitive types in patterns, instanceof, and switch (Preview).
> 
> Draft spec here: https://cr.openjdk.org/~abimpoudis/instanceof/latest/

Aggelos Biboudis has updated the pull request incrementally with one additional commit since the last revision:

  Remove trailing spaces

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/15638/files
  - new: https://git.openjdk.org/jdk/pull/15638/files/fac9ca98..4fbdd708

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=34
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=33-34

  Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod
  Patch: https://git.openjdk.org/jdk/pull/15638.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15638/head:pull/15638

PR: https://git.openjdk.org/jdk/pull/15638

From abimpoudis at openjdk.org  Mon Dec 11 17:14:02 2023
From: abimpoudis at openjdk.org (Aggelos Biboudis)
Date: Mon, 11 Dec 2023 17:14:02 GMT
Subject: RFR: 8303374: Compiler Implementation for Primitive types in
 patterns, instanceof, and switch (Preview) [v36]
In-Reply-To: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
References: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
Message-ID: <OCO29M0KzQHiTs60MP_uLMtH_w9rbPe0QhVt4R7BNMM=.ba3ae0f4-3c80-45b6-9240-63cc37e6ead6@github.com>

> This is the proposed patch for Primitive types in patterns, instanceof, and switch (Preview).
> 
> Draft spec here: https://cr.openjdk.org/~abimpoudis/instanceof/latest/

Aggelos Biboudis has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 52 commits:

 - Merge branch 'master' into primitive-patterns
 - Remove trailing spaces
 - Merge branch 'primitive-patterns-and-generating-dispatch' into primitive-patterns
 - Fixed switch in the cases of unboxing and widening
 - Merge branch 'JDK-8319220' into primitive-patterns
 - Merge branch 'master' into JDK-8319220
 - reflecting review comment: fixing letter case.
 - Reflecting review feedback.
 - Some more get->orElseThrow
 - Reflecting review feedback.
 - ... and 42 more: https://git.openjdk.org/jdk/compare/b270f30d...65457894

-------------

Changes: https://git.openjdk.org/jdk/pull/15638/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=35
  Stats: 3258 lines in 41 files changed: 2995 ins; 109 del; 154 mod
  Patch: https://git.openjdk.org/jdk/pull/15638.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15638/head:pull/15638

PR: https://git.openjdk.org/jdk/pull/15638

From abimpoudis at openjdk.org  Mon Dec 11 19:44:01 2023
From: abimpoudis at openjdk.org (Aggelos Biboudis)
Date: Mon, 11 Dec 2023 19:44:01 GMT
Subject: RFR: 8303374: Compiler Implementation for Primitive types in
 patterns, instanceof, and switch (Preview) [v37]
In-Reply-To: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
References: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
Message-ID: <9ldTg1DpAuh8op3uQxpkt_9nXPHbvC8q-re-55L_lsU=.6b4019f2-b5ef-46da-bc9d-dde8308d2f3d@github.com>

> This is the proposed patch for Primitive types in patterns, instanceof, and switch (Preview).
> 
> Draft spec here: https://cr.openjdk.org/~abimpoudis/instanceof/latest/

Aggelos Biboudis has updated the pull request incrementally with one additional commit since the last revision:

  Cleanup

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/15638/files
  - new: https://git.openjdk.org/jdk/pull/15638/files/65457894..7a71ffa9

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=36
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=35-36

  Stats: 12 lines in 1 file changed: 0 ins; 11 del; 1 mod
  Patch: https://git.openjdk.org/jdk/pull/15638.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15638/head:pull/15638

PR: https://git.openjdk.org/jdk/pull/15638

From dholmes at openjdk.org  Thu Dec 14 05:51:45 2023
From: dholmes at openjdk.org (David Holmes)
Date: Thu, 14 Dec 2023 05:51:45 GMT
Subject: RFR: 8322065: Initial nroff manpage generation for JDK 23
Message-ID: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>

Updated the version to 23-ea and year to 2024.

This initial generation also picks up the unpublished changes from:

- [JDK-8302233](https://bugs.openjdk.org/browse/JDK-8302233) (keytool & jarsigner)
- [JDK-8290702](https://bugs.openjdk.org/browse/JDK-8290702) (javadoc) (JDK 23 backport)
- [JDK-8321384](https://bugs.openjdk.org/browse/JDK-8321384) (javadoc)


In addition this includes the updates for

- [JDK-8309981](https://bugs.openjdk.org/browse/8309981) Remove expired flags in JDK 23

Thanks

-------------

Commit messages:
 - 8322065: Initial nroff manpage generation for JDK 23
 - 8309981: Remove expired flags in JDK 23

Changes: https://git.openjdk.org/jdk/pull/17101/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=17101&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8322065
  Stats: 216 lines in 29 files changed: 47 ins; 61 del; 108 mod
  Patch: https://git.openjdk.org/jdk/pull/17101.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/17101/head:pull/17101

PR: https://git.openjdk.org/jdk/pull/17101

From alanb at openjdk.org  Thu Dec 14 09:03:38 2023
From: alanb at openjdk.org (Alan Bateman)
Date: Thu, 14 Dec 2023 09:03:38 GMT
Subject: RFR: 8322065: Initial nroff manpage generation for JDK 23
In-Reply-To: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
References: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
Message-ID: <TXQNeaff7Jd_CyhpTkq-o_TBH27cU01p8G0Thq7E5F0=.46bddd4a-9baa-4d4e-ad01-0f48b4d836e1@github.com>

On Thu, 14 Dec 2023 05:46:01 GMT, David Holmes <dholmes at openjdk.org> wrote:

> Updated the version to 23-ea and year to 2024.
> 
> This initial generation also picks up the unpublished changes from:
> 
> - [JDK-8302233](https://bugs.openjdk.org/browse/JDK-8302233) (keytool & jarsigner)
> - [JDK-8290702](https://bugs.openjdk.org/browse/JDK-8290702) (javadoc) (JDK 23 backport)
> - [JDK-8321384](https://bugs.openjdk.org/browse/JDK-8321384) (javadoc)
> 
> 
> In addition this includes the updates for
> 
> - [JDK-8309981](https://bugs.openjdk.org/browse/8309981) Remove expired flags in JDK 23
> 
> Thanks

Initially I wondered if JDK-8309981 should be separated but include keeps things in sync so I think okay.

-------------

Marked as reviewed by alanb (Reviewer).

PR Review: https://git.openjdk.org/jdk/pull/17101#pullrequestreview-1781343785

From prappo at openjdk.org  Thu Dec 14 09:19:37 2023
From: prappo at openjdk.org (Pavel Rappo)
Date: Thu, 14 Dec 2023 09:19:37 GMT
Subject: RFR: 8322065: Initial nroff manpage generation for JDK 23
In-Reply-To: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
References: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
Message-ID: <wc-9qyyMKcPQDfB2BQmDNHfSXFlPo1-X7RlNVr3BoA8=.5771d53d-9553-4747-99a7-e51f1a22260d@github.com>

On Thu, 14 Dec 2023 05:46:01 GMT, David Holmes <dholmes at openjdk.org> wrote:

> Updated the version to 23-ea and year to 2024.
> 
> This initial generation also picks up the unpublished changes from:
> 
> - [JDK-8302233](https://bugs.openjdk.org/browse/JDK-8302233) (keytool & jarsigner)
> - [JDK-8290702](https://bugs.openjdk.org/browse/JDK-8290702) (javadoc) (JDK 23 backport)
> - [JDK-8321384](https://bugs.openjdk.org/browse/JDK-8321384) (javadoc)
> 
> 
> In addition this includes the updates for
> 
> - [JDK-8309981](https://bugs.openjdk.org/browse/8309981) Remove expired flags in JDK 23
> 
> Thanks

> Updated the version to 23-ea and year to 2024.
> 
> This initial generation also picks up the unpublished changes from:
> 

> * [JDK-8321384](https://bugs.openjdk.org/browse/JDK-8321384) (javadoc)

Thanks for doing this, David. I only note that the changes for JDK-8321384 were published in [JDK-8308715](https://bugs.openjdk.org/browse/JDK-8308715), which was integrated in the mainline before JDK 22 RDP 1. So they are already present in the mainline.

-------------

PR Comment: https://git.openjdk.org/jdk/pull/17101#issuecomment-1855467435

From abimpoudis at openjdk.org  Thu Dec 14 11:04:09 2023
From: abimpoudis at openjdk.org (Aggelos Biboudis)
Date: Thu, 14 Dec 2023 11:04:09 GMT
Subject: RFR: 8303374: Compiler Implementation for Primitive types in
 patterns, instanceof, and switch (Preview) [v38]
In-Reply-To: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
References: <4GCkSMggtYI8KnM-kELHez3Nd42WIrfd6jOF1bbK5PA=.12aec6f3-669b-4675-ad34-ffe28cb23459@github.com>
Message-ID: <3JvLQvkIPnCIy1JtnD6hKyVg2GvDUDvUqog8R7gbGJc=.21d55c1c-1476-4eea-8720-5424eda66678@github.com>

> This is the proposed patch for Primitive types in patterns, instanceof, and switch (Preview).
> 
> Draft spec here: https://cr.openjdk.org/~abimpoudis/instanceof/latest/

Aggelos Biboudis has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 54 commits:

 - Merge branch 'master' into primitive-patterns
 - Cleanup
 - Merge branch 'master' into primitive-patterns
 - Remove trailing spaces
 - Merge branch 'primitive-patterns-and-generating-dispatch' into primitive-patterns
 - Fixed switch in the cases of unboxing and widening
 - Merge branch 'JDK-8319220' into primitive-patterns
 - Merge branch 'master' into JDK-8319220
 - reflecting review comment: fixing letter case.
 - Reflecting review feedback.
 - ... and 44 more: https://git.openjdk.org/jdk/compare/d2ba3b1e...a03fea7c

-------------

Changes: https://git.openjdk.org/jdk/pull/15638/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=15638&range=37
  Stats: 3248 lines in 41 files changed: 2985 ins; 110 del; 153 mod
  Patch: https://git.openjdk.org/jdk/pull/15638.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15638/head:pull/15638

PR: https://git.openjdk.org/jdk/pull/15638

From dholmes at openjdk.org  Thu Dec 14 12:26:40 2023
From: dholmes at openjdk.org (David Holmes)
Date: Thu, 14 Dec 2023 12:26:40 GMT
Subject: RFR: 8322065: Initial nroff manpage generation for JDK 23
In-Reply-To: <wc-9qyyMKcPQDfB2BQmDNHfSXFlPo1-X7RlNVr3BoA8=.5771d53d-9553-4747-99a7-e51f1a22260d@github.com>
References: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
 <wc-9qyyMKcPQDfB2BQmDNHfSXFlPo1-X7RlNVr3BoA8=.5771d53d-9553-4747-99a7-e51f1a22260d@github.com>
Message-ID: <KGeNu7eyXiV1Xdi4G3O5pRd8-wLGYRLHLnvSOl0RJBk=.4cb49fb9-01f0-46c2-846d-be194ab1abaa@github.com>

On Thu, 14 Dec 2023 09:17:05 GMT, Pavel Rappo <prappo at openjdk.org> wrote:

> Thanks for doing this, David. I only note that the changes for JDK-8321384 were published in [JDK-8308715](https://bugs.openjdk.org/browse/JDK-8308715), which was integrated in the mainline before JDK 22 RDP 1. So they are already present in the mainline.

Ah I see. Thanks for correcting that, I will update the PR and JBS issue.

And thanks for looking at this @pavelrappo .

-------------

PR Comment: https://git.openjdk.org/jdk/pull/17101#issuecomment-1855755042

From dholmes at openjdk.org  Thu Dec 14 12:30:38 2023
From: dholmes at openjdk.org (David Holmes)
Date: Thu, 14 Dec 2023 12:30:38 GMT
Subject: RFR: 8322065: Initial nroff manpage generation for JDK 23
In-Reply-To: <TXQNeaff7Jd_CyhpTkq-o_TBH27cU01p8G0Thq7E5F0=.46bddd4a-9baa-4d4e-ad01-0f48b4d836e1@github.com>
References: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
 <TXQNeaff7Jd_CyhpTkq-o_TBH27cU01p8G0Thq7E5F0=.46bddd4a-9baa-4d4e-ad01-0f48b4d836e1@github.com>
Message-ID: <mVw4r96UaGCiseQ8hJip4ForRXp8x4LSA6nx7lELxNo=.fc11214c-7229-4f2e-9667-0bcf42b26751@github.com>

On Thu, 14 Dec 2023 09:01:17 GMT, Alan Bateman <alanb at openjdk.org> wrote:

> Initially I wondered if JDK-8309981 should be separated but include keeps things in sync so I think okay.

Thanks for the review @AlanBateman .

Yeah I was in two minds there myself. I started fixing [JDK-8309981](https://bugs.openjdk.org/browse/JDK-8309981) only to discover that the start of release updates had not been done as part of the start of release, so I figured I may as well fix it all together given I'd generated all the updated files anyway. But I'm still a little unsure ... in fact I think I will remove it in the morning.

-------------

PR Comment: https://git.openjdk.org/jdk/pull/17101#issuecomment-1855761906

From dholmes at openjdk.org  Thu Dec 14 12:35:52 2023
From: dholmes at openjdk.org (David Holmes)
Date: Thu, 14 Dec 2023 12:35:52 GMT
Subject: RFR: 8322065: Initial nroff manpage generation for JDK 23 [v2]
In-Reply-To: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
References: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
Message-ID: <cLrnXzE4mmuGODVy7DfA7Zzq1ot2aquVTBG9PPGPwJQ=.e0f4b2b4-d567-462b-9ecd-5be70e461aa6@github.com>

> Updated the version to 23-ea and year to 2024.
> 
> This initial generation also picks up the unpublished changes from:
> 
> - [JDK-8302233](https://bugs.openjdk.org/browse/JDK-8302233) (keytool & jarsigner)
> - [JDK-8290702](https://bugs.openjdk.org/browse/JDK-8290702) (javadoc) (JDK 23 backport)
> 
> Thanks

David Holmes has updated the pull request incrementally with one additional commit since the last revision:

  Revert "8309981: Remove expired flags in JDK 23"
  
  This reverts commit 0324a90e936ae01e42ae099e7235156326cc318a.

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/17101/files
  - new: https://git.openjdk.org/jdk/pull/17101/files/65a8c9ed..8b052141

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=17101&range=01
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=17101&range=00-01

  Stats: 23 lines in 2 files changed: 10 ins; 11 del; 2 mod
  Patch: https://git.openjdk.org/jdk/pull/17101.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/17101/head:pull/17101

PR: https://git.openjdk.org/jdk/pull/17101

From dholmes at openjdk.org  Thu Dec 14 21:28:47 2023
From: dholmes at openjdk.org (David Holmes)
Date: Thu, 14 Dec 2023 21:28:47 GMT
Subject: Integrated: 8322065: Initial nroff manpage generation for JDK 23
In-Reply-To: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
References: <UboOhUcAkH6L4qSOWy_uV5qieIX6IQNBhZxWsIvbLzc=.68cfd313-6718-4a7f-9233-f9fd04269e7a@github.com>
Message-ID: <PburUtgTlWWQUu8FrbTb5opRR6eanF3CGgdcCPJ6sEw=.d9807c9b-f763-4f69-8327-d5e3feb0877d@github.com>

On Thu, 14 Dec 2023 05:46:01 GMT, David Holmes <dholmes at openjdk.org> wrote:

> Updated the version to 23-ea and year to 2024.
> 
> This initial generation also picks up the unpublished changes from:
> 
> - [JDK-8302233](https://bugs.openjdk.org/browse/JDK-8302233) (keytool & jarsigner)
> - [JDK-8290702](https://bugs.openjdk.org/browse/JDK-8290702) (javadoc) (JDK 23 backport)
> 
> Thanks

This pull request has now been integrated.

Changeset: 692be577
Author:    David Holmes <dholmes at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/692be577385844bf00a01ff10e390e014191569f
Stats:     193 lines in 27 files changed: 36 ins; 51 del; 106 mod

8322065: Initial nroff manpage generation for JDK 23

Reviewed-by: alanb

-------------

PR: https://git.openjdk.org/jdk/pull/17101