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

8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used #9049

Closed
wants to merge 8 commits into from

Conversation

Thihup
Copy link
Contributor

@Thihup Thihup commented Jun 7, 2022


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-8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9049

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

Using diff file

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

@Thihup
Copy link
Contributor Author

Thihup commented Jun 7, 2022

/issue JDK-8287760

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 7, 2022

👋 Welcome back Thihup! 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 changed the title 8287760: Keep do-not-resolve-by-default flag 8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used Jun 7, 2022
@openjdk
Copy link

openjdk bot commented Jun 7, 2022

@Thihup This issue is referenced in the PR title - it will now be updated.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 7, 2022
@openjdk
Copy link

openjdk bot commented Jun 7, 2022

@Thihup 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 Jun 7, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 7, 2022

@AlanBateman
Copy link
Contributor

AlanBateman commented Jun 7, 2022

The change looks okay but I think we should add a test. You'll have to check the test tree to see if there are existing tests for incubator modules packaged as JAR files, there may not be as it's an unusual setup.

@openjdk-notifier
Copy link

@Thihup Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

* @throws IOException
*/
@Test(dataProvider = "resolutionNames")
public void updateFooModuleResolutionDoNotResolveByDefaultAndWarnIfResolved(String resolutionName, Predicate<ModuleResolution> hasWarning) throws IOException {
Copy link
Contributor

Choose a reason for hiding this comment

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

Update the existing tests is good but overly long lines make it too hard to read (it will make future side-by-side view impossible). Can you trim all these lines down to something closer to the existing tests in this file?

@openjdk
Copy link

openjdk bot commented Jun 8, 2022

⚠️ @Thihup the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout jdk-8287760
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Jun 8, 2022

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

8287760: --do-not-resolve-by-default gets overwritten if --warn-if-resolved flags is used

Reviewed-by: lancea, alanb, cstein

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

  • af64d31: Merge
  • 53bf1bf: 8286176: Add JNI_VERSION_19 to jni.h and JNI spec
  • c254c9d: 8287401: jpackage tests failing on Windows due to powershell issue
  • ff3db52: 8288534: Out of bound errors for memory segment access mentions wrong values
  • cc44592: 8287904: Reduce runtime of java.net microbenchmarks
  • 523d553: 8282777: Create a Regression test for JDK-4515031
  • f3da7ff: 8288421: IGV: warn user about all unreachable nodes
  • 9d4b25e: 8288281: compiler/vectorapi/VectorFPtoIntCastTest.java failed with "IRViolationException: There were one or multiple IR rule failures."
  • e833c1d: 8285519: Change usages of TimeUnit.convert to TimeUnit.toXXX
  • e7d52e2: 8288594: Address possibly lossy conversions in java.base FloatToDecimal
  • ... and 170 more: https://git.openjdk.org/jdk/compare/645be42f76b8983a9096ed90caa70b5c59dd822c...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 (@LanceAndersen, @AlanBateman) 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 openjdk bot added the ready Pull request is ready to be integrated label Jun 8, 2022
@Thihup
Copy link
Contributor Author

Thihup commented Jun 9, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 9, 2022
@openjdk
Copy link

openjdk bot commented Jun 9, 2022

@Thihup
Your change (at version 8544abd) is now ready to be sponsored by a Committer.

@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Jun 10, 2022
@Thihup
Copy link
Contributor Author

Thihup commented Jun 10, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 10, 2022
@openjdk
Copy link

openjdk bot commented Jun 10, 2022

@Thihup
Your change (at version 962f0ec) is now ready to be sponsored by a Committer.

@@ -38,6 +40,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import jdk.internal.module.ModuleReferenceImpl;
import jdk.internal.module.ModuleResolution;
Copy link
Contributor

Choose a reason for hiding this comment

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

At some point we need to put in test infrastructure to avoid this and a few other tests from depending on JDK internals.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you think it is better to parse the output of javap instead of using the internals to detect if it worked?

Copy link
Contributor

Choose a reason for hiding this comment

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

Parsing the output of javap would be fragile. Instead, I think we'll just add some test infrastructure at some point, maybe when this class file attribute is documented somewhere.

@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Jun 10, 2022
@Thihup
Copy link
Contributor Author

Thihup commented Jun 10, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 10, 2022
@openjdk
Copy link

openjdk bot commented Jun 10, 2022

@Thihup
Your change (at version d566ebc) is now ready to be sponsored by a Committer.

Copy link
Member

@sormuras sormuras left a comment

Choose a reason for hiding this comment

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

LGTM

@AlanBateman
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 23, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 23, 2022
@openjdk openjdk bot closed this Jun 23, 2022
@openjdk 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 23, 2022
@openjdk
Copy link

openjdk bot commented Jun 23, 2022

@AlanBateman @Thihup Pushed as commit a802b98.

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

@Thihup Thihup deleted the jdk-8287760 branch June 23, 2022 10:05
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
4 participants