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

8294000: Filler array klass should be in jdk/vm/internal, not in java/vm/internal #10336

Conversation

tschatzl
Copy link
Contributor

@tschatzl tschatzl commented Sep 19, 2022

Hi all,

can I have reviews for the move of the internal filler array klass from java/vm/internal/ to jdk/vm/internal - I noticed that typo in some recent jmap dump. All internal klasses are in the jdk. package... idk how this slipped through the original change.

With this change it shows up as
2: 428 13291728 jdk.internal.vm.FillerArray (java.base@20-internal)
which I believe is best.

Testing: local compilation, checking jmap output for instances of this klass directly, the gc/TestFillerObjectInstantiation.java jtreg test

Thanks,
Thomas


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-8294000: Filler array klass should be in jdk/vm/internal, not in java/vm/internal

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10336

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 19, 2022

👋 Welcome back tschatzl! 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 8294000 8294000: Filler array klass should be in jdk/vm/internal, not in java/vm/internal Sep 19, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 19, 2022
@openjdk
Copy link

openjdk bot commented Sep 19, 2022

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

  • hotspot-runtime

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 hotspot-runtime hotspot-runtime-dev@openjdk.org label Sep 19, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 19, 2022

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

I am good with "java" -> "jdk" move, but why are we dropping L...;? I would have thought we need to pass the JVM name to TypeArrayKlass::create_klass?

@tschatzl
Copy link
Contributor Author

The given name does not seem to have any particular requirements in TypeArrayKlass::create_klass apart from being unique. So I chose the name to look "best" in the jmap output; otherwise it would show that L...; there too.
Other classes from jdk.vm.internal.* also show up without the L...; in the jmap output.

The string passed to TypeArrayKlass:create_klass for basic types also does not have L...; either, it's e.g. [I. Only element types of arrays have the L...; in jmap histogram, e.g. [Ljava.util.concurrent.ConcurrentHashMap$Node;. But this (internal) klass doesn't expose its element type.

So I thought removing the L...; would be just fine.

Obviously I'll change the name to whatever is correct.

….;` after all because of JNI which expects klasses to start with certain characters only
@tschatzl
Copy link
Contributor Author

tschatzl commented Sep 19, 2022

JNI needs L...; in front of the name passed to TAK::create_klass. So the name passed there needs to be as suggested by @shipilev.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine then!

@openjdk
Copy link

openjdk bot commented Sep 19, 2022

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

8294000: Filler array klass should be in jdk/vm/internal, not in java/vm/internal

Reviewed-by: shade, dholmes

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

  • cddd6de: 8279941: sun/security/pkcs11/Signature/TestDSAKeyLength.java fails when NSS version detection fails
  • 21008ca: 8285383: vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.java failed with "exit code: 96"
  • 3b438a6: 8294067: [macOS] javax/swing/JComboBox/6559152/bug6559152.java Cannot select an item from popup with the ENTER key.
  • caae53f: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • cb5771d: 8294006: Avoid hardcoding object file suffixes in make
  • 5002eaa: 8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
  • e3358e7: 8294008: Grapheme implementation of setText() throws IndexOutOfBoundsException
  • df8ec09: 8294046: Newly added test test/jdk/javax/swing/JTabbedPane/TestNPEStateChgListener.java fails in macos
  • 09af637: 8294012: RISC-V: get/put_native_u8 missing the case when address&7 is 6
  • 584de68: 8294058: Early use of lambda introduced in JDK-8285263 cause startup regressions in 20-b02
  • ... and 15 more: https://git.openjdk.org/jdk/compare/5725a93c078dac9775ccef04f3624647a8d38e83...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 Pull request is ready to be integrated label Sep 19, 2022
Copy link
Member

@dholmes-ora dholmes-ora 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.

I'm surprised this didn't cause any kind of problem.

Thanks.

@tschatzl
Copy link
Contributor Author

Fwiw, I also did a tier1-5 run with the latest change that passed.

Thanks @shipilev @dholmes-ora for your reviews

/integrate

@openjdk
Copy link

openjdk bot commented Sep 21, 2022

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

  • 379f309: 8287217: C2: PhaseCCP: remove not visited nodes, prevent type inconsistency
  • 12e3510: 8293798: Fix test bugs due to incompatibility with -XX:+AlwaysIncrementalInline
  • cb72f80: 8293978: Duplicate simple loop back-edge will crash the vm
  • cddd6de: 8279941: sun/security/pkcs11/Signature/TestDSAKeyLength.java fails when NSS version detection fails
  • 21008ca: 8285383: vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.java failed with "exit code: 96"
  • 3b438a6: 8294067: [macOS] javax/swing/JComboBox/6559152/bug6559152.java Cannot select an item from popup with the ENTER key.
  • caae53f: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • cb5771d: 8294006: Avoid hardcoding object file suffixes in make
  • 5002eaa: 8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
  • e3358e7: 8294008: Grapheme implementation of setText() throws IndexOutOfBoundsException
  • ... and 18 more: https://git.openjdk.org/jdk/compare/5725a93c078dac9775ccef04f3624647a8d38e83...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 21, 2022

@tschatzl Pushed as commit 8ecdaa6.

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

@tschatzl tschatzl deleted the submit/8294000-rename-filler-array-klass branch October 14, 2022 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants