8304069: ClassFileParser has ad-hoc hashtables #13141

matias9927 · 2023-03-22T14:56:55Z

The ClassFileParser has ad-hoc hash tables for checking for duplicate names for fields, methods and interfaces. ResourceHashtable will now be used instead. Verified with tier1-4 tests.

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-8304069: ClassFileParser has ad-hoc hashtables

Reviewers

Coleen Phillimore (@coleenp - Reviewer)
David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13141

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

Using diff file

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

bridgekeeper · 2023-03-22T14:57:57Z

👋 Welcome back matsaave! 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 · 2023-03-22T15:01:21Z

@matias9927 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.

mlbridge · 2023-03-22T16:36:03Z

Webrevs

coleenp

I have some suggestions for improving this.

src/hotspot/share/classfile/classFileParser.cpp

coleenp

This looks great.

openjdk · 2023-03-22T21:33:35Z

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

8304069: ClassFileParser has ad-hoc hashtables

Reviewed-by: coleenp, 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 61 new commits pushed to the master branch:

9a8a60f: 8304833: (fc) Remove dead code in sun.nio.ch.FileChannelImpl::implCloseChannel
f96aee7: 8291154: Create a non static nested class without enclosing class throws VerifyError
4ec720d: 8297977: vmTestbase/nsk/stress/except/except012.java fails with unexpected Exception
13dd19a: 8304802: After JDK-8297639 the flag G1UsePreventiveGC needs to be added to the obsoletion table
d61de14: 8303508: Vector.lane() gets wrong value on x86
941a7ac: 8304301: Remove the global option SuperWordMaxVectorSize
ac6af6a: 7176515: ExceptionInInitializerError for an enum with multiple switch statements
dd23ee9: 8303917: Update ISO 639 language codes table
6f67abd: 8304557: java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java times out
568dd57: 8304716: Clean up G1Policy::calc_max_old_cset_length()
... and 51 more: https://git.openjdk.org/jdk/compare/c396f1ed8b91b799fdd6a9a849d7407e606227d5...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 (@coleenp, @dholmes-ora) 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).

dholmes-ora

This conversion looks good but I was confused by the way the original code was doing things. Once we have this conversion I think we could clean things up further:

Interfaces don't need NameSigHash, all we need is a map of names, so we should be able to directly have a RHT of Symbol* for the interface_name_table.
NameSigHash is the wrong terminology - we are checking names and descriptors [JVMS 4.3], not names and signatures [JVMS4.7.9.1]! (And a Java Language "signature" is something different again [JLS 8.4.2]!

Unfortunately I think we misuse "signature" throughout the VM, so maybe fixing it here will serve little purpose.

coleenp

Every cleanup suggests more cleanups.

src/hotspot/share/classfile/classFileParser.cpp

coleenp

Looks good to me!

dholmes-ora

Looks good! Thanks for the additional cleanups/simplifications.

matias9927 · 2023-03-24T15:08:40Z

Thank you for the reviews @coleenp and @dholmes-ora!
/integrate

openjdk · 2023-03-24T15:10:15Z

@matias9927
Your change (at version 2c89b16) is now ready to be sponsored by a Committer.

coleenp · 2023-03-24T15:42:58Z

/sponsor

openjdk · 2023-03-24T15:45:26Z

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

9a8a60f: 8304833: (fc) Remove dead code in sun.nio.ch.FileChannelImpl::implCloseChannel
f96aee7: 8291154: Create a non static nested class without enclosing class throws VerifyError
4ec720d: 8297977: vmTestbase/nsk/stress/except/except012.java fails with unexpected Exception
13dd19a: 8304802: After JDK-8297639 the flag G1UsePreventiveGC needs to be added to the obsoletion table
d61de14: 8303508: Vector.lane() gets wrong value on x86
941a7ac: 8304301: Remove the global option SuperWordMaxVectorSize
ac6af6a: 7176515: ExceptionInInitializerError for an enum with multiple switch statements
dd23ee9: 8303917: Update ISO 639 language codes table
6f67abd: 8304557: java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java times out
568dd57: 8304716: Clean up G1Policy::calc_max_old_cset_length()
... and 51 more: https://git.openjdk.org/jdk/compare/c396f1ed8b91b799fdd6a9a849d7407e606227d5...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-03-24T15:45:46Z

@coleenp @matias9927 Pushed as commit d8ba227.

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

8304069: ClassFileParser has ad-hoc hashtables

dd0a660

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Mar 22, 2023

Made hashtable type

3b19b76

matias9927 marked this pull request as ready for review March 22, 2023 16:29

openjdk bot added the rfr Pull request is ready for review label Mar 22, 2023

coleenp suggested changes Mar 22, 2023

View reviewed changes

src/hotspot/share/classfile/classFileParser.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/classFileParser.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/classFileParser.cpp Outdated Show resolved Hide resolved

Coleen comments

17f7d8f

coleenp approved these changes Mar 22, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2023

dholmes-ora reviewed Mar 23, 2023

View reviewed changes

Interface uses normal ResourceHashtable

5492f5e

coleenp suggested changes Mar 23, 2023

View reviewed changes

src/hotspot/share/classfile/classFileParser.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/classFileParser.cpp Outdated Show resolved Hide resolved

src/hotspot/share/classfile/classFileParser.cpp Outdated Show resolved Hide resolved

openjdk bot removed the ready Pull request is ready to be integrated label Mar 23, 2023

matias9927 added 2 commits March 23, 2023 19:35

Moved declarations into for loop

20a2006

Removed default constructor and changed declarations

2c89b16

coleenp approved these changes Mar 23, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 23, 2023

dholmes-ora approved these changes Mar 23, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 24, 2023

openjdk bot added the integrated Pull request has been integrated label Mar 24, 2023

openjdk bot closed this Mar 24, 2023

openjdk bot removed the ready Pull request is ready to be integrated label Mar 24, 2023

openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8304069: ClassFileParser has ad-hoc hashtables #13141

8304069: ClassFileParser has ad-hoc hashtables #13141

matias9927 commented Mar 22, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 22, 2023

openjdk bot commented Mar 22, 2023

mlbridge bot commented Mar 22, 2023 •

edited

Loading

coleenp left a comment

coleenp left a comment

openjdk bot commented Mar 22, 2023 •

edited

Loading

dholmes-ora left a comment

coleenp left a comment

coleenp left a comment

dholmes-ora left a comment

matias9927 commented Mar 24, 2023

openjdk bot commented Mar 24, 2023

coleenp commented Mar 24, 2023

openjdk bot commented Mar 24, 2023

openjdk bot commented Mar 24, 2023

8304069: ClassFileParser has ad-hoc hashtables #13141

8304069: ClassFileParser has ad-hoc hashtables #13141

Conversation

matias9927 commented Mar 22, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Mar 22, 2023

openjdk bot commented Mar 22, 2023

mlbridge bot commented Mar 22, 2023 • edited Loading

Webrevs

coleenp left a comment

Choose a reason for hiding this comment

coleenp left a comment

Choose a reason for hiding this comment

openjdk bot commented Mar 22, 2023 • edited Loading

dholmes-ora left a comment

Choose a reason for hiding this comment

coleenp left a comment

Choose a reason for hiding this comment

coleenp left a comment

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

matias9927 commented Mar 24, 2023

openjdk bot commented Mar 24, 2023

coleenp commented Mar 24, 2023

openjdk bot commented Mar 24, 2023

openjdk bot commented Mar 24, 2023

matias9927 commented Mar 22, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 22, 2023 •

edited

Loading

openjdk bot commented Mar 22, 2023 •

edited

Loading