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

8255562: delete UseRDPCForConstantTableBase #949

Closed
wants to merge 3 commits into from

Conversation

@navyxliu
Copy link
Contributor

@navyxliu navyxliu commented Oct 30, 2020

UseRDPCForConstantTableBase was a SPARC-exclusive flag. Sparc has been removed
from hotspot, so remove this flag.


Progress

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

Testing

Linux x64 Linux x86 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/949/head:pull/949
$ git checkout pull/949

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 30, 2020

👋 Welcome back xliu! 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 Oct 30, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Oct 30, 2020

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

  • hotspot-compiler

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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 30, 2020

Webrevs

@vidmik
Copy link
Contributor

@vidmik vidmik commented Oct 30, 2020

/csr needed

@openjdk openjdk bot added the csr label Oct 30, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Oct 30, 2020

@vidmik has indicated that a compatibility and specification (CSR) request is needed for this pull request.
@navyxliu please create a CSR request and add link to it in JDK-8255562. This pull request cannot be integrated until the CSR request is approved.

src/hotspot/share/opto/machnode.hpp Outdated Show resolved Hide resolved
Xin Liu added 2 commits Nov 5, 2020
mark UseRDPCForConstantTableBase is obsoletd in jdk16 and will expire in jdk17.
@navyxliu
Copy link
Contributor Author

@navyxliu navyxliu commented Nov 5, 2020

I made the hotspot cmdline flag UseRDPCForConstantTableBase obsolete in jdk(16) and will expire in jdk(17) based on the document here

The reason I modified Arguments::handle_aliases_and_deprecation is that hotspot didn't emit any warning message if we only mark it obsoleted but never define deprecated version. After I modify it, it emits a warning message to alarm user that the flag has been obsoleted.

./bin/java -XX:+UseRDPCForConstantTableBase --version
OpenJDK 64-Bit Server VM warning: Temporarily processing option UseRDPCForConstantTableBase; support is scheduled for removal in 16.0
openjdk 16-internal 2021-03-16
OpenJDK Runtime Environment (build 16-internal+0-adhoc.ubuntu.jdk)
OpenJDK 64-Bit Server VM (build 16-internal+0-adhoc.ubuntu.jdk, mixed mode)

Copy link
Member

@simonis simonis left a comment

Hi Xin,
you also have to remove the option from c2_globals.hpp. Also, please add the line

{ "UseRDPCForConstantTableBase",  JDK_Version::undefined(), JDK_Version::jdk(16), JDK_Version::jdk(17) },

unconditionally (e.g. after the line for the Debugging option). You've added it to the #ifndef COMPILER2 section. I suppose that's the reason why you haven't seen the deprecation warning.

I think if you add the option unconditionally to special_jvm_flags you shouldn't need any changes to Arguments::handle_aliases_and_deprecation.

You can have a look at 8252889: Obsolete -XX:+InsertMemBarAfterArraycopy for an example.

revert the change of Arguments::handle_aliases_and_deprecation.
Arguments::process_argument can handle obsoleted arguments.
simonis
simonis approved these changes Nov 6, 2020
Copy link
Member

@simonis simonis left a comment

Thnaks Xin. Looks good to me now.

@navyxliu
Copy link
Contributor Author

@navyxliu navyxliu commented Nov 6, 2020

@simonis Thanks!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 6, 2020

@navyxliu This PR has not yet been marked as ready for integration.

@simonis
Copy link
Member

@simonis simonis commented Nov 6, 2020

@navyxliu , you can't push this before the CSR has not been approved.

@openjdk openjdk bot removed the csr label Nov 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 7, 2020

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

8255562: delete UseRDPCForConstantTableBase

Reviewed-by: simonis

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

  • c5462bb: 8255989: Remove explicitly unascribed authorship from Java source files
  • 358f5d2: 6422025: ThemeReader.cpp can be updated for VC7
  • a9dff94: 8254864: vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java timed out
  • 0b7fba7: 8254270: linux 32 bit build doesn't compile libjdwp/log_messages.c
  • f5d36e6: 8246741: NetworkInterface/UniqueMacAddressesTest: mac address uniqueness test failed
  • 688b10b: 8255561: add tests to check binary compatibility rules for records
  • 727a69f: 8255969: Improve java/io/BufferedInputStream/LargeCopyWithMark.java using jtreg tags
  • 952abea: 8254920: Application launched with jpackage produced .exe crashes JVM
  • 5dfb42f: 8255563: Missing NULL checks after JDK-8233624
  • e730e8b: 8241806: The sun/awt/shell/FileSystemViewMemoryLeak.java is unstable
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/397bae20e9e6ae91a7d3ee74460e0e3c9da572f9...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 (@TobiHartmann, @simonis) 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 label Nov 7, 2020
@phohensee
Copy link
Member

@phohensee phohensee commented Nov 7, 2020

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Nov 7, 2020

@phohensee The change author (@navyxliu) must issue an integrate command before the integration can be sponsored.

@navyxliu
Copy link
Contributor Author

@navyxliu navyxliu commented Nov 7, 2020

/integrate

@openjdk openjdk bot added the sponsor label Nov 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 7, 2020

@navyxliu
Your change (at version 213a161) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

@phohensee phohensee commented Nov 8, 2020

/sponsor

@openjdk openjdk bot closed this Nov 8, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 8, 2020

@phohensee @navyxliu Since your change was applied there have been 32 commits pushed to the master branch:

  • c5462bb: 8255989: Remove explicitly unascribed authorship from Java source files
  • 358f5d2: 6422025: ThemeReader.cpp can be updated for VC7
  • a9dff94: 8254864: vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java timed out
  • 0b7fba7: 8254270: linux 32 bit build doesn't compile libjdwp/log_messages.c
  • f5d36e6: 8246741: NetworkInterface/UniqueMacAddressesTest: mac address uniqueness test failed
  • 688b10b: 8255561: add tests to check binary compatibility rules for records
  • 727a69f: 8255969: Improve java/io/BufferedInputStream/LargeCopyWithMark.java using jtreg tags
  • 952abea: 8254920: Application launched with jpackage produced .exe crashes JVM
  • 5dfb42f: 8255563: Missing NULL checks after JDK-8233624
  • e730e8b: 8241806: The sun/awt/shell/FileSystemViewMemoryLeak.java is unstable
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/397bae20e9e6ae91a7d3ee74460e0e3c9da572f9...master

Your commit was automatically rebased without conflicts.

Pushed as commit 6a183fb.

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

openjdk-notifier bot referenced this issue Nov 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants