Skip to content

8335927: Revisit AnnotationConstantValueEntry and AnnotationValue.OfConstant #20436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from

Conversation

liach
Copy link
Member

@liach liach commented Aug 2, 2024

  1. Add notes and docs about the difference between resolved constants and constant pool descriptors for annotation constants (e.g. char vs IntegerEntry)
  2. Improved value specification to specify their tags.
  3. Improved value factories to return their specific types instead of OfConstant
  4. Improved value classes to return specific PoolEntry subtypes and specific live constant subtypes
  5. Removed confusing and meaningless ConstantPoolBuilder.annotationConstantValueEntry

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Change requires CSR request JDK-8336353 to be approved
  • Commit message must refer to an issue

Issues

  • JDK-8335927: Revisit AnnotationConstantValueEntry and AnnotationValue.OfConstant (Enhancement - P4)
  • JDK-8336353: Revisit AnnotationConstantValueEntry and AnnotationValue.OfConstant (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20436

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 2, 2024

👋 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
Copy link

openjdk bot commented Aug 2, 2024

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

8335927: Revisit AnnotationConstantValueEntry and AnnotationValue.OfConstant

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

  • e70c9bc: 8338248: PartialArrayStateAllocator::Impl leaks Arena array
  • 5079c38: 8338160: Fix -Wzero-as-null-pointer-constant warnings in management.cpp
  • 4417c27: 8330535: Update nsk/jdb tests to use driver instead of othervm
  • b93b74e: 8338060: jdk/internal/util/ReferencedKeyTest should be more robust
  • 41e31d6: 8337622: IllegalArgumentException in java.lang.reflect.Field.get
  • 2ca136a: 8337815: Relax G1EvacStats atomic operations
  • 99edb4a: 8337702: Use new ForwardExceptionNode to call StubRoutines::forward_exception_entry()
  • 8d08314: 8337795: Type annotation attached to incorrect type during class reading
  • f84240b: 8338011: CDS archived heap object support for 64-bit Windows
  • 04b146a: 8337334: Test tools/javac/7142086/T7142086.java timeout with fastdebug binary
  • ... and 90 more: https://git.openjdk.org/jdk/compare/328a0533b2ee6793130dfb68d931e0ebd60c6b5d...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 openjdk bot added csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels Aug 2, 2024
@openjdk
Copy link

openjdk bot commented Aug 2, 2024

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

  • compiler
  • core-libs

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.

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Aug 2, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 2, 2024

Webrevs


/**
* Models a constant-valued element
sealed interface OfConstant<C extends AnnotationConstantValueEntry, R extends Comparable<R> & Constable>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest to minimize use of generics in combination with sealed interface trees and pattern matching. It does not give many benefits, it takes out a part of the code readability and adds many unnecessary brackets and questionmarks:

case AnnotationValue.OfConstant<?, ?> oc ->

<R extends Comparable<R> & Constable> at least brings a benefit of types combination. However I still think it does not outweigh the generics use cost. None of the generics parameter is near to orthogonal to the OfConstant nor critical for the API to operate.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the type parameters. Please review again.

Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Aug 13, 2024
@liach
Copy link
Member Author

liach commented Aug 13, 2024

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 13, 2024

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

  • 9e282e5: 8337998: CompletionFailure in getEnclosingType attaching type annotations
  • 877fd5a: 8337595: Remove empty statements in src/hotspot/share/memory/metaspace
  • 76e33b6: 8336148: Test runtime/locking/TestRecursiveMonitorChurn.java failed: Unexpected Inflation
  • ff8a9f9: 8337318: Deoptimization::relock_objects fails assert(monitor->owner() == Thread::current()) failed: must be
  • fbe4cc9: 8336384: AbstractQueuedSynchronizer.acquire should cancel acquire when failing due to a LinkageError or other errors
  • ba69ed7: 8338202: Shenandoah: Improve handshake closure labels
  • 5bf2709: 8334475: UnsafeIntrinsicsTest.java#ZGenerationalDebug assert(!assert_on_failure) failed: Has low-order bits set
  • 73f7a5f: 8338155: Fix -Wzero-as-null-pointer-constant warnings involving PTHREAD_MUTEX_INITIALIZER
  • c27a8c8: 8338124: C2 SuperWord: MulAddS2I input permutation still partially broken after JDK-8333840
  • 73ddb7d: 8335628: C2 SuperWord: cleanup: remove SuperWord::longer_type_for_conversion
  • ... and 101 more: https://git.openjdk.org/jdk/compare/328a0533b2ee6793130dfb68d931e0ebd60c6b5d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 13, 2024
@openjdk openjdk bot closed this Aug 13, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 13, 2024
@openjdk
Copy link

openjdk bot commented Aug 13, 2024

@liach Pushed as commit 6af1d6f.

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

@liach liach deleted the fix/annotation-constant branch September 24, 2024 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants