Skip to content
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

8274391: Suppress more warnings on non-serializable non-transient instance fields in java.util.concurrent #5718

Closed
wants to merge 1 commit into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Sep 27, 2021

Follow-up change to JDK-8232230, augmentations to javac's Xlint:serial checking are out for review (#5709) and java.util.concurrent would need some changes to pass under the expanded checks.

The changes are to suppress warnings where non-transient fields in serializable types are not declared with a type statically known to be serializable. That isn't necessarily a correctness issues, but it does merit further scrutiny.

In ForkJoinTask, the SuppressWarnings annotation previously applied in JDK-8232230, seems to have been misplaced to a different field; this change corrects it.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274391: Suppress more warnings on non-serializable non-transient instance fields in java.util.concurrent

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5718/head:pull/5718
$ git checkout pull/5718

Update a local copy of the PR:
$ git checkout pull/5718
$ git pull https://git.openjdk.java.net/jdk pull/5718/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5718

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5718.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 27, 2021

👋 Welcome back darcy! 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 openjdk bot added the rfr label Sep 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

@jddarcy The following label will be automatically applied to this pull request:

  • core-libs

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.

@openjdk openjdk bot added the core-libs label Sep 27, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 27, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

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

8274391: Suppress more warnings on non-serializable non-transient instance fields in java.util.concurrent

Reviewed-by: lancea, bpb, alanb, iris

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

  • be40373: 8274381: missing CAccessibility definitions in JNI code
  • 79865cd: 8274259: G1: assert(check_alignment(result)) failed: address not aligned: 0x00000008baadbabe after JDK-8270009
  • 961dcff: 8273581: Change the mechanism by which JDK loads the platform-specific FontManager class
  • 6a573b8: 8273508: Support archived heap objects in SerialGC
  • 3eca9c3: 8264707: HotSpot Style Guide should permit use of lambda
  • af50772: 8231640: (prop) Canonical property storage
  • ddc2627: 8273790: Potential cyclic dependencies between Gregorian and CalendarSystem
  • 633eab2: 8174819: java/nio/file/WatchService/LotsOfEvents.java fails intermittently
  • 8876eae: 8269685: Optimize HeapHprofBinWriter implementation
  • c880b87: 8274367: Re-indent stack-trace examples for Throwable.printStackTrace
  • ... and 3 more: https://git.openjdk.java.net/jdk/compare/75404ea25ed5ed77fda41afc6662b1fe7ea2fb43...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 the ready label Sep 27, 2021
bplb
bplb approved these changes Sep 27, 2021
Copy link
Contributor

@AlanBateman AlanBateman left a comment

Looks okay but will need to go to the jsr166 cvs too (@DougLea).

@DougLea
Copy link
Contributor

@DougLea DougLea commented Sep 28, 2021

Just to be sure, does this include only the conditionally serializable annotations in ForkJoinPool and ForkJoinTask in:
https://github.com/openjdk/jdk/pull/5718/files/a20d9afbd7b49b452b3c9bdc9f2d56442b5e2fc6
If so, this looks OK to me.

@jddarcy
Copy link
Member Author

@jddarcy jddarcy commented Sep 28, 2021

Just to be sure, does this include only the conditionally serializable annotations in ForkJoinPool and ForkJoinTask in: https://github.com/openjdk/jdk/pull/5718/files/a20d9afbd7b49b452b3c9bdc9f2d56442b5e2fc6 If so, this looks OK to me.

Yes, for java.util.concurrent, those are the only two changes needed to compile under the in-progress javac checks.

@jddarcy
Copy link
Member Author

@jddarcy jddarcy commented Sep 28, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

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

  • 6a477bd: 8274415: Suppress warnings on non-serializable non-transient instance fields in java.xml
  • 67e52a3: 8273634: [TEST_BUG] Improve javax/swing/text/ParagraphView/6364882/bug6364882.java
  • b7425b6: 8239502: [TEST_BUG] Test javax/swing/text/FlowView/6318524/bug6318524.java never fails
  • c57a6c6: 8274265: Suspicious string concatenation in logTestUtils.inline.hpp
  • 6f4cefb: 8274394: Use Optional.isEmpty instead of !Optional.isPresent in jdk.jlink
  • 94f5e80: 8274276: Cache normalizedBase URL in URLClassPath.FileLoader
  • b36881f: 8274383: JNI call of getAccessibleSelection on a wrong thread
  • be40373: 8274381: missing CAccessibility definitions in JNI code
  • 79865cd: 8274259: G1: assert(check_alignment(result)) failed: address not aligned: 0x00000008baadbabe after JDK-8270009
  • 961dcff: 8273581: Change the mechanism by which JDK loads the platform-specific FontManager class
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/75404ea25ed5ed77fda41afc6662b1fe7ea2fb43...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 28, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2021

@jddarcy Pushed as commit 2072bc7.

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

@jddarcy jddarcy deleted the JDK-8274391 branch Dec 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs integrated
6 participants