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

8286807: Revert experimental special treatment given to new Object() instantiation. #691

Closed
wants to merge 1 commit into from

Conversation

sadayapalam
Copy link
Collaborator

@sadayapalam sadayapalam commented May 18, 2022

Revert the changes made for:
JDK-8237073 - Need special handling of jlO constructor invocation
JDK-8281026 - Allow for compiler.note.cant.instantiate.object.directly to be suppressed via an option
JDK-8280456 - javac should allow compilation with abstract java.lang.Object class

The revert of JDK-8283573 - a hotspot fix for "Make Object an abstract class" will need to happen on its own.

The current commit makes j.l.O concrete again, but leaves in the method java.util.Objects.newIdentity() and the class java.lang.Identity intact and these will have to be removed by a separate follow up patch from the core libraries component.

Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8286807: Revert experimental special treatment given to new Object() instantiation.

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/691/head:pull/691
$ git checkout pull/691

Update a local copy of the PR:
$ git checkout pull/691
$ git pull https://git.openjdk.java.net/valhalla pull/691/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 691

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/691.diff

…instantiation.

This calls for reverting the following fixes:
JDK-8237073 - Need special handling of jlO constructor invocation
JDK-8281026 - Allow for compiler.note.cant.instantiate.object.directly to be suppressed via an option
JDK-8280456 - javac should allow compilation with abstract java.lang.Object class
@bridgekeeper
Copy link

bridgekeeper bot commented May 18, 2022

👋 Welcome back sadayapalam! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented May 18, 2022

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

8286807: Revert experimental special treatment given to new Object() instantiation.

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 2 new commits pushed to the lworld branch:

  • 4165ca0: 8286864: [lworld] runtime/valhalla/inlinetypes/testSupers/TestSuperClasses.java refers to IdentityObject interface
  • 104d6d9: 8286877: [lworld] remove interface injection tests runtime/valhalla/inlinetypes/identityObject/TestIdentityObject.java & runtime/valhalla/inlinetypes/primitiveObject/TestPrimitiveObject.java

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld branch.
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 lworld branch, type /integrate in a new comment.

@sadayapalam
Copy link
Collaborator Author

sadayapalam commented May 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 18, 2022

Going to push as commit b4f0a6e.
Since your change was applied there have been 2 commits pushed to the lworld branch:

  • 4165ca0: 8286864: [lworld] runtime/valhalla/inlinetypes/testSupers/TestSuperClasses.java refers to IdentityObject interface
  • 104d6d9: 8286877: [lworld] remove interface injection tests runtime/valhalla/inlinetypes/identityObject/TestIdentityObject.java & runtime/valhalla/inlinetypes/primitiveObject/TestPrimitiveObject.java

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label May 18, 2022
@openjdk openjdk bot closed this May 18, 2022
@openjdk openjdk bot removed the ready label May 18, 2022
@sadayapalam sadayapalam deleted the JDK-8286807 branch May 18, 2022
@openjdk openjdk bot removed the rfr label May 18, 2022
@openjdk
Copy link

openjdk bot commented May 18, 2022

@sadayapalam Pushed as commit b4f0a6e.

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

@mlbridge
Copy link

mlbridge bot commented May 18, 2022

Webrevs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
1 participant