8360131: Remove use of soon-to-be-removed APIs by CTW framework #25916

david-beaumont · 2025-06-20T14:33:49Z

Migrate the CWT framework to use only supported JRT file system access for fetching class bytes.
This avoids accessing APIs in ImageReader which are scheduled to be removed as part of preview mode class support in Valhalla (essentially these APIs are "too low level" and expose semantics that are incompatible with supporting preview classes in Valhalla).

This will be a further change to this code when the preview mode work goes in, but this will be limited to how the file system is opened (with or without preview mode).

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8360131: Remove use of soon-to-be-removed APIs by CTW framework (Enhancement - P4)

Reviewers

Chen Liang (@liach - Reviewer)
Tobias Hartmann (@TobiHartmann - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25916/head:pull/25916
$ git checkout pull/25916

Update a local copy of the PR:
$ git checkout pull/25916
$ git pull https://git.openjdk.org/jdk.git pull/25916/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25916

View PR using the GUI difftool:
$ git pr show -t 25916

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25916.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-06-20T14:34:41Z

👋 Welcome back david-beaumont! 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 · 2025-06-20T14:34:54Z

@david-beaumont 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:

8360131: Remove use of soon-to-be-removed APIs by CTW framework

Reviewed-by: liach, thartmann

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 235 new commits pushed to the master branch:

54fec2b: 8360220: Deprecate and obsolete ParallelRefProcBalancingEnabled
03d66d9: 8358572: C1 hits "need debug information" assert with -XX:-DeoptC1
f6ff38a: 8353815: [ubsan] compilationPolicy.cpp: division by zero related to tiered compilation flags
... and 232 more: https://git.openjdk.org/jdk/compare/7838321b74276e45b92c54904ea31ef70ed9e33f...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@liach, @TobiHartmann) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2025-06-20T14:35:26Z

@david-beaumont The following label will be automatically applied to this pull request:

hotspot-compiler

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

mlbridge · 2025-06-20T14:39:04Z

Webrevs

01: Full - Incremental (ae2523d0)
00: Full (c1a49fe6)

lepestock · 2025-06-20T15:02:56Z

LGTM

liach

I think ctw is in hs-tier2 tests. You may run them on the CI for sanity checking.

liach · 2025-06-20T15:45:18Z

test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java

@@ -69,30 +79,40 @@ public void close() {
        }
    }

-    private final ImageReader reader;
+    //private final ImageReader reader;


Suggested change

//private final ImageReader reader;

doh - thanks.

liach · 2025-06-20T15:46:40Z

test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java

            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);


Maybe throw an error for consistency with other methods in this class?

Personally I don't like Error as a response to runtime issues like this, but consistency is probably good, so done.

liach · 2025-06-20T15:47:07Z

test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java

+     * @throws AssertionError if filename isn't valid filename for class file -
+     *                        {@link #isClassFile(String)}


Suggested change

* @throws AssertionError if filename isn't valid filename for class file -

* {@link #isClassFile(String)}

What's the suggestion here? I see no change.

doh you meant just to delete it. Done.

david-beaumont · 2025-06-20T16:02:02Z

I think ctw is in hs-tier2 tests. You may run them on the CI for sanity checking.

The test group applications/ctw passes locally, and I've set off a CI test run with that target. Do you think it also needs tier2 in that case?

liach

The Java code looks good. Let's wait for hotspot reviewers. I think the tests you've run are sufficient.

TobiHartmann

Looks good to me but since variants of CTW are executed in tier3 as well, I would recommend running tier1-3 before integrating this.

david-beaumont · 2025-06-24T08:08:38Z

/integrate

openjdk · 2025-06-24T08:09:20Z

@david-beaumont
Your change (at version ae2523d) is now ready to be sponsored by a Committer.

TobiHartmann · 2025-06-24T08:09:29Z

/sponsor

openjdk · 2025-06-24T08:09:55Z

Going to push as commit fdfc557.
Since your change was applied there have been 235 commits pushed to the master branch:

54fec2b: 8360220: Deprecate and obsolete ParallelRefProcBalancingEnabled
03d66d9: 8358572: C1 hits "need debug information" assert with -XX:-DeoptC1
f6ff38a: 8353815: [ubsan] compilationPolicy.cpp: division by zero related to tiered compilation flags
... and 232 more: https://git.openjdk.org/jdk/compare/7838321b74276e45b92c54904ea31ef70ed9e33f...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-06-24T08:10:03Z

@TobiHartmann @david-beaumont Pushed as commit fdfc557.

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

david-beaumont added 3 commits June 20, 2025 16:11

Move CWT test away from soon-to-be-deleted ImageReader APIs.

e375036

Remove comment.

ffd2a32

Copyright update.

c1a49fe

openjdk bot added the rfr Pull request is ready for review label Jun 20, 2025

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jun 20, 2025

liach reviewed Jun 20, 2025

View reviewed changes

Feedback tweaks.

ae2523d

liach approved these changes Jun 20, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 20, 2025

TobiHartmann approved these changes Jun 23, 2025

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 24, 2025

openjdk bot added the integrated Pull request has been integrated label Jun 24, 2025

openjdk bot closed this Jun 24, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 24, 2025

		* @throws AssertionError if filename isn't valid filename for class file -
		* {@link #isClassFile(String)}

8360131: Remove use of soon-to-be-removed APIs by CTW framework #25916

8360131: Remove use of soon-to-be-removed APIs by CTW framework #25916

Conversation

david-beaumont commented Jun 20, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Jun 20, 2025

Uh oh!

openjdk bot commented Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jun 20, 2025

Uh oh!

mlbridge bot commented Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

lepestock commented Jun 20, 2025

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

liach Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

david-beaumont Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

liach Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

david-beaumont Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

liach Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

david-beaumont Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

david-beaumont Jun 20, 2025

Choose a reason for hiding this comment

Uh oh!

david-beaumont commented Jun 20, 2025

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

TobiHartmann left a comment

Choose a reason for hiding this comment

Uh oh!

david-beaumont commented Jun 24, 2025

Uh oh!

openjdk bot commented Jun 24, 2025

Uh oh!

TobiHartmann commented Jun 24, 2025

Uh oh!

openjdk bot commented Jun 24, 2025

Uh oh!

openjdk bot commented Jun 24, 2025

Uh oh!

Uh oh!

david-beaumont commented Jun 20, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jun 20, 2025 •

edited

Loading

mlbridge bot commented Jun 20, 2025 •

edited

Loading