8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API #19206

liach · 2024-05-12T08:36:44Z

Some tests are not migrated to the ClassFile API in previous migrations.

Some are simple oversights that didn't remove usages of com.sun.tools.classfile;
The CallerSensitive ones used an old utility, replaced by CF API-based new code;
many in javac are because the files are compiled with older source compatibility. Those patches are converted to have the source code stored in text blocks and compiled within tests using ToolBox#writeJavaFiles and CompilerUtils.compile;
As described in the JBS issue, there are a few other tests not covered; one is in 8331855: Convert jdk.jdeps jdeprscan and jdeps to use the Classfile API #19193 while the others are blocked by CreateSymbols migration or bugs.

Testing: all modified tests pass.

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-8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API (Sub-task - P4)

Reviewers

Adam Sotona (@asotona - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19206

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

Using diff file

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

Webrev

Link to Webrev Comment

…ssFile API

bridgekeeper · 2024-05-12T08:37:32Z

👋 Welcome back liach! 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 · 2024-05-12T08:37:51Z

@liach 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:

8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API

Reviewed-by: asotona

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

0b0445b: 8331724: Refactor j.l.constant implementation to internal package
d84a8fd: 8332327: Return _methods_jmethod_ids field back in VMStructs
f1ce9b0: 8331557: Serial: Refactor SerialHeap::do_collection
14198f5: 8329653: JLILaunchTest fails on AIX after JDK-8329131
ae999ea: 8129418: JShell: better highlighting of errors in imports on demand
6422efa: 8332394: Add friendly output when @ir rule missing value
9160ef8: 8332237: [nmt] Remove the need for ThreadStackTracker::track_as_vm()
7c750fd: 8331746: Create a test to verify that the cmm id is not ignored
de57d4b: 8332257: Shenandoah: Move evacuation methods to implementation file
da9c23a: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
... and 55 more: https://git.openjdk.org/jdk/compare/32c7681cf310c87669c502c4a8b62a7fecc93360...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 (@jonathan-gibbons, @asotona) 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 · 2024-05-12T08:38:25Z

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

compiler
core-libs
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.

mlbridge · 2024-05-12T08:43:24Z

Webrevs

00: Full (4880f3a3)

jonathan-gibbons

javadoc test change looks OK.

asotona · 2024-05-17T06:03:00Z

test/jdk/jdk/internal/reflect/CallerSensitive/CheckCSMs.java

+                continue;
+
+            boolean needsCsm = false;
+            for (var element : code) {


Scanning the instructions is a bit different approach than in the original test.

Same as the other method name check, it was manually extracted ReferenceFinder logic, we should retire ReferenceFinder with the old class file library.

asotona · 2024-05-17T06:07:47Z

test/jdk/jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java

+                if (element instanceof InvokeInstruction invoke
+                        && invoke.opcode() == Opcode.INVOKESTATIC
+                        && invoke.method() instanceof MethodRefEntry ref
+                        && ref.owner().name().equalsString(className)
+                        && ref.name().equalsString(methodName)) {


Is this additional test necessary, I don't see it in the original test.

This was part of the now-removed ReferenceFinder logic; it scans cp as a fast path and then does instruction scan for all methods to find relevant methods to pass to visitor.

asotona · 2024-05-17T06:14:42Z

test/langtools/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java

+        Path out = Path.of("out");
+        ToolBox toolBox = new ToolBox();
+        toolBox.writeJavaFiles(in, SOURCE);
+        CompilerUtils.compile(in, out, "--release", "16");


Smart move 👍

asotona

Looks good to me, great job, thanks!

liach · 2024-05-17T11:26:14Z

Thanks for the review!

/integrate

openjdk · 2024-05-17T11:27:20Z

@liach
Your change (at version 4880f3a) is now ready to be sponsored by a Committer.

asotona · 2024-05-17T12:23:24Z

/sponsor

openjdk · 2024-05-17T12:24:41Z

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

e0d1c4b: 8321428: Deprecate for removal the package java.beans.beancontext
0b0445b: 8331724: Refactor j.l.constant implementation to internal package
d84a8fd: 8332327: Return _methods_jmethod_ids field back in VMStructs
f1ce9b0: 8331557: Serial: Refactor SerialHeap::do_collection
14198f5: 8329653: JLILaunchTest fails on AIX after JDK-8329131
ae999ea: 8129418: JShell: better highlighting of errors in imports on demand
6422efa: 8332394: Add friendly output when @ir rule missing value
9160ef8: 8332237: [nmt] Remove the need for ThreadStackTracker::track_as_vm()
7c750fd: 8331746: Create a test to verify that the cmm id is not ignored
de57d4b: 8332257: Shenandoah: Move evacuation methods to implementation file
... and 56 more: https://git.openjdk.org/jdk/compare/32c7681cf310c87669c502c4a8b62a7fecc93360...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-05-17T12:24:47Z

@asotona @liach Pushed as commit beeffd4.

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

8332109: Convert remaining tests using com.sun.tools.classfile to Cla…

b2d056a

…ssFile API

openjdk bot added the rfr Pull request is ready for review label May 12, 2024

openjdk bot added javadoc javadoc-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels May 12, 2024

Missing copyright years

4880f3a

jonathan-gibbons reviewed May 14, 2024

View reviewed changes

asotona reviewed May 17, 2024

View reviewed changes

asotona approved these changes May 17, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 17, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label May 17, 2024

openjdk bot added the integrated Pull request has been integrated label May 17, 2024

openjdk bot closed this May 17, 2024

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 May 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API #19206

8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API #19206

liach commented May 12, 2024 •

edited by openjdk bot

bridgekeeper bot commented May 12, 2024

openjdk bot commented May 12, 2024 •

edited

openjdk bot commented May 12, 2024

mlbridge bot commented May 12, 2024

jonathan-gibbons left a comment

asotona May 17, 2024

liach May 17, 2024

asotona May 17, 2024

liach May 17, 2024

asotona May 17, 2024

asotona left a comment

liach commented May 17, 2024

openjdk bot commented May 17, 2024

asotona commented May 17, 2024

openjdk bot commented May 17, 2024

openjdk bot commented May 17, 2024

8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API #19206

8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API #19206

Conversation

liach commented May 12, 2024 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented May 12, 2024

openjdk bot commented May 12, 2024 • edited

openjdk bot commented May 12, 2024

mlbridge bot commented May 12, 2024

Webrevs

jonathan-gibbons left a comment

Choose a reason for hiding this comment

asotona May 17, 2024

Choose a reason for hiding this comment

liach May 17, 2024

Choose a reason for hiding this comment

asotona May 17, 2024

Choose a reason for hiding this comment

liach May 17, 2024

Choose a reason for hiding this comment

asotona May 17, 2024

Choose a reason for hiding this comment

asotona left a comment

Choose a reason for hiding this comment

liach commented May 17, 2024

openjdk bot commented May 17, 2024

asotona commented May 17, 2024

openjdk bot commented May 17, 2024

openjdk bot commented May 17, 2024

liach commented May 12, 2024 •

edited by openjdk bot

openjdk bot commented May 12, 2024 •

edited