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

8318324: Drop redundant default methods from FFM API #16224

Closed
wants to merge 4 commits into from

Conversation

mcimadamore
Copy link
Contributor

@mcimadamore mcimadamore commented Oct 17, 2023

This PR moves turns default methods in MemorySegment and MemoryLayout into ordinary abstract methods.
These interfaces cannot be subclasses by developers (they are sealed), so there is no reson for having default methods there. Also, default methods can have some detrimental effects, as they cause the interfaces to be initialized more eagerly.


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
  • Change requires CSR request JDK-8318325 to be approved

Issues

  • JDK-8318324: Drop redundant default methods from FFM API (Bug - P3)
  • JDK-8318325: Drop redundant default methods from FFM API (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16224

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 17, 2023

👋 Welcome back mcimadamore! 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 csr Pull request needs approved CSR before integration label Oct 17, 2023
@openjdk
Copy link

openjdk bot commented Oct 17, 2023

@mcimadamore 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 core-libs-dev@openjdk.org label Oct 17, 2023
@@ -140,4 +150,72 @@ private static long requirePowerOfTwoAndGreaterOrEqualToOne(long value) {
return value;
}

public long scale(long offset, long index) {
Copy link
Member

Choose a reason for hiding this comment

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

Could you add @Override to these as well? I think it makes it clearer that these methods might be accessed through a super type.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would be nice - but note that AbstractLayoutImpl does not extend MemoryLayout.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, right...

import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
Copy link
Member

Choose a reason for hiding this comment

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

There are quite a few new imports here. Is it possible some imports in MemoryLayout are now unused?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No unused import here - these are just the imports required for the overrides to compile successfully.

Copy link
Member

Choose a reason for hiding this comment

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

I mean in MemoryLayout from which these overrides were moved.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 18, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 18, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 19, 2023

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

8318324: Drop redundant default methods from FFM API

Reviewed-by: jvernee

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

  • 24bc5bd: 8318104: macOS 10.13 check in TabButtonAccessibility.m can be removed
  • e25a49a: 8318471: ProblemList compiler/sharedstubs/SharedTrampolineTest.java
  • ce8ebeb: 8317979: Use TZ database style abbreviations in the CLDR locale provider
  • ab13568: 8318029: Minor improvement to logging output in container at-requires
  • 278de7a: 8318458: Update javac and java manpages with restricted method options
  • 6fc3514: 8318363: Foreign benchmarks fail to build on some platforms
  • 31ef400: 8318183: C2: VM may crash after hitting node limit
  • 4e77b3c: 8315974: Make fields final in 'com.sun.crypto.provider' package
  • 8dd8096: 8317886: Add @sealedGraph to ByteBuffer
  • 9843c97: 8318365: Test runtime/cds/appcds/sharedStrings/InternSharedString.java fails after JDK-8311538
  • ... and 21 more: https://git.openjdk.org/jdk/compare/a949824e98a8872645f292c9cc9ed2fe1cccadce...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 ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Oct 19, 2023
@mcimadamore
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 19, 2023

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

  • 1a09835: 8317358: G1: Make TestMaxNewSize use createTestJvm
  • 47bb1a1: 8318415: Adjust describing comment of os_getChildren after 8315026
  • 80bd22d: 8316144: Remove unused field jdk.internal.util.xml.impl.XMLStreamWriterImpl.Element._Depth
  • c0e154c: 8318089: Class space not marked as such with NMT when CDS is off
  • 24bc5bd: 8318104: macOS 10.13 check in TabButtonAccessibility.m can be removed
  • e25a49a: 8318471: ProblemList compiler/sharedstubs/SharedTrampolineTest.java
  • ce8ebeb: 8317979: Use TZ database style abbreviations in the CLDR locale provider
  • ab13568: 8318029: Minor improvement to logging output in container at-requires
  • 278de7a: 8318458: Update javac and java manpages with restricted method options
  • 6fc3514: 8318363: Foreign benchmarks fail to build on some platforms
  • ... and 25 more: https://git.openjdk.org/jdk/compare/a949824e98a8872645f292c9cc9ed2fe1cccadce...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 19, 2023

@mcimadamore Pushed as commit 15acf4b.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants