8356894: Adjust CreateSymbols to properly handle the newly added @jdk.internal.RequiresIdentity #25232

lahodaj · 2025-05-14T14:48:15Z

This patch builds on top of #24746, and adds support for @RequiresIdentity to --release.

Important parts of the patch:

CreateSymbols now keeps RuntimeInvisibleTypeAnnotationsAttribute/RuntimeVisibleTypeAnnotationsAttribute annotations
for ct.sym, the @RequiresIdentity annotation is converted to a synthetic @RequiresIdentity+Annotation, as for other similar annotations.
for parameters, there's a new flag that marks the parameter as "requires identity". The reason is that the other synthetic annotations on symbols used by ct.sym/--release are normally not added to the model, and hence invisible in the model. Flags are usually used instead of the synthetic annotations in javac. Using this new flag allows us to keep the behavior the same for the @RequiresIdentity+Annotation
for type variables, the synthetic annotation is filtered out in the API method

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-8356894: Adjust CreateSymbols to properly handle the newly added @jdk.internal.RequiresIdentity (Bug - P3)

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer)
Chen Liang (@liach - Reviewer) Review applies to daed20ff

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25232

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…e/jdk into JDK-8354556

…reateSymbols.

bridgekeeper · 2025-05-14T14:48:56Z

👋 Welcome back jlahoda! A progress list of the required criteria for merging this PR into pr/24746 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-05-14T14:49:25Z

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

8356894: Adjust CreateSymbols to properly handle the newly added @jdk.internal.RequiresIdentity

Reviewed-by: vromero, liach

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

2dfbf41: 8351907: [XWayland] [OL10] Robot.mousePress() is delivered to wrong place
f1eead6: 8357452: Remove code span highlight in JavaDoc default stylesheet
6546de1: 8357478: Fix copyright header in src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
... and 26 more: https://git.openjdk.org/jdk/compare/1a97eb429b520b7c4e625b97553c954d065c00cb...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.

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

openjdk · 2025-05-14T14:50:08Z

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

build
compiler

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 · 2025-05-14T14:53:33Z

Webrevs

02: Full (696cd663)
01: Full (daed20ff)
00: Full (daed20ff)

vicente-romero-oracle

lgtm

liach

Looks good to me too; though I don't know why we need special treatment for requiresIdentityInternal for Symbol.

turbanoff · 2025-05-15T09:09:00Z

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

                }  else if (proxy.type.tsym == syms.restrictedType.tsym) {
                    Assert.check(sym.kind == MTH);
                    sym.flags_field |= RESTRICTED;
+                }  else if (proxy.type.tsym == syms.requiresIdentityType.tsym) {


Suggested change

} else if (proxy.type.tsym == syms.requiresIdentityType.tsym) {

} else if (proxy.type.tsym == syms.requiresIdentityType.tsym) {

openjdk · 2025-05-19T09:51:17Z

@lahodaj this pull request can not be integrated into pr/24746 due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8356894
git fetch https://git.openjdk.org/jdk.git pr/24746
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/24746"
git push

openjdk-notifier · 2025-05-19T22:50:59Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8356894
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2025-05-19T22:51:45Z

⚠️ @lahodaj 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).

vicente-romero-oracle

lgtm

vicente-romero-oracle

lgtm

lahodaj · 2025-05-23T04:34:30Z

/integrate

openjdk · 2025-05-23T04:35:29Z

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

99e0130: 8356145: ListEnterExitTest.java fails on macos
1fd65b7: 8351140: RISC-V: Intrinsify Unsafe::setMemory
4193d05: 8356061: [macos] com/apple/laf/RootPane/RootPaneDefaultButtonTest.java test fails on macosx-aarch64 machine
... and 62 more: https://git.openjdk.org/jdk/compare/1a97eb429b520b7c4e625b97553c954d065c00cb...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-05-23T04:35:36Z

@lahodaj Pushed as commit 9d9e41f.

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

vicente-romero-oracle and others added 30 commits April 17, 2025 19:31

8354556: Expand value-based class warnings to java.lang.ref API

950f391

minor fixes

4c4aebe

Merge branch 'master' into JDK-8354556

0979978

fixing bug

d35ef50

removing the REQUIRES_IDENTITY flag

ed64f22

removing requiresIdentityInternalType

e6c17f7

removing unnecessary changes

d40e285

fixing bug

5a0b6bf

only do extra analysis if lint warning enable

434dda7

minor chantes to CreateSymbol

9f0407a

Merge branch 'master' into JDK-8354556

9f71ab7

additional coverage for other uses of types

2697858

additional coverage for other uses of types

b4f5329

Merge branch 'JDK-8354556' of https://github.com/vicente-romero-oracl…

ac28815

…e/jdk into JDK-8354556

covering more cases plus refactoring in order to simplify the code

5491f39

First support for runtime visible and invisible type annotations in C…

eb98145

…reateSymbols.

refactoring

09b8331

refactoring

9d6af78

more refactorings and tests

4a6b9bc

more refactorings

1c3cd61

removing unneeded changes

84b52a6

additional refactorings

70e0311

final adjustments

5e3acc9

Improving the behavior of the PrintingProcessor.

27104b4

updating test

1134ffe

Merge branch 'master' into JDK-8354556

151908a

changes to test

60f1f53

addressing review comment

ad7f617

Merge branch 'master' into JDK-8354556

5d834ce

documentation and adding alias to lint categories

d52ec33

lahodaj added 3 commits May 14, 2025 13:36

Adjustments, annotation filtering, adding more tests

700c150

Fixing build

456ff25

Cleanup.

daed20f

openjdk bot added the rfr Pull request is ready for review label May 14, 2025

openjdk bot added build [email protected] compiler [email protected] labels May 14, 2025

vicente-romero-oracle approved these changes May 14, 2025

View reviewed changes

liach approved these changes May 14, 2025

View reviewed changes

turbanoff reviewed May 15, 2025

View reviewed changes

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label May 19, 2025

openjdk-notifier bot changed the base branch from pr/24746 to master May 19, 2025 22:50

Merge remote-tracking branch 'upstream/master' into JDK-8356894

696cd66

vicente-romero-oracle approved these changes May 20, 2025

View reviewed changes

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label May 21, 2025

vicente-romero-oracle approved these changes May 21, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 21, 2025

openjdk bot added the integrated Pull request has been integrated label May 23, 2025

openjdk bot closed this May 23, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 23, 2025

	} else if (proxy.type.tsym == syms.requiresIdentityType.tsym) {
	} else if (proxy.type.tsym == syms.requiresIdentityType.tsym) {

8356894: Adjust CreateSymbols to properly handle the newly added @jdk.internal.RequiresIdentity #25232

8356894: Adjust CreateSymbols to properly handle the newly added @jdk.internal.RequiresIdentity #25232

Uh oh!

Conversation

lahodaj commented May 14, 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 May 14, 2025

Uh oh!

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

Uh oh!

Uh oh!

openjdk bot commented May 14, 2025

Uh oh!

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

Uh oh!

Webrevs

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

turbanoff May 15, 2025

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented May 19, 2025

Uh oh!

openjdk-notifier bot commented May 19, 2025

Uh oh!

openjdk bot commented May 19, 2025

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

lahodaj commented May 23, 2025

Uh oh!

openjdk bot commented May 23, 2025

Uh oh!

openjdk bot commented May 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

lahodaj commented May 14, 2025 •

edited by openjdk bot

Loading

openjdk bot commented May 14, 2025 •

edited

Loading

mlbridge bot commented May 14, 2025 •

edited

Loading