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

8252981: ObjectMonitor::object() cleanup changes extracted from JDK-8247281 #114

Closed
wants to merge 3 commits into from

Conversation

dcubed-ojdk
Copy link
Member

@dcubed-ojdk dcubed-ojdk commented Sep 10, 2020

This is a trivial review request. This changeset was tested with Mach5 Tier[1-3],4,5,6,7,8
testing along with JDK-8252980 and JDK-8247281.

Since Erik and I are both contributors, we will need one other reviewer.

This sub-task is tracking ObjectMonitor::object() cleanup changes
extracted from Erik's work on JDK-8247281. This extraction is done
to ease the code review for the JDK-8247281 changes.

Here's the core cleanup:

diff -r fd7f6a424cd1 src/hotspot/share/runtime/objectMonitor.hpp
--- a/src/hotspot/share/runtime/objectMonitor.hpp Fri Aug 28 16:43:09 2020 -0400
+++ b/src/hotspot/share/runtime/objectMonitor.hpp Wed Sep 02 17:22:56 2020 -0400
@@ -328,9 +328,9 @@

public:

  • void* object() const;
  • void* object_addr();
  • void set_object(void* obj);
  • oop object() const;
  • oop* object_addr();
  • void set_object(oop obj);
    void release_set_allocation_state(AllocationState s);
    void set_allocation_state(AllocationState s);
    AllocationState allocation_state() const;

and those type changes ripple into the other files.

Note: The type for the ObjectMonitor::_object field is intentionally not
being changed from "void*" in this changeset. That will be done in JDK-8247281.


Progress

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

Issue

  • JDK-8252981: ObjectMonitor::object() cleanup changes extracted from JDK-8247281

Reviewers

Contributors

  • Erik Österlund <erik.osterlund@oracle.com>
  • Daniel Daugherty <daniel.daugherty@oracle.com>

Download

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

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/contributor add erik.osterlund@oracle.com
/contributor add daniel.daugherty@oracle.com

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 10, 2020

👋 Welcome back dcubed! 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
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk Could not parse erik.osterlund@oracle.com as a valid contributor.
Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

  • /contributor add @openjdk-bot
  • /contributor add duke
  • /contributor add J. Duke <duke@openjdk.org>

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk Could not parse daniel.daugherty@oracle.com as a valid contributor.
Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

  • /contributor add @openjdk-bot
  • /contributor add duke
  • /contributor add J. Duke <duke@openjdk.org>

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk The following labels will be automatically applied to this pull request: hotspot hotspot-runtime serviceability.

When this pull request is ready to be reviewed, an RFR email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label (add|remove) "label" command.

@openjdk openjdk bot added serviceability hotspot-runtime hotspot labels Sep 10, 2020
@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/contributor add Erik Österlund erik.osterlund@oracle.com
/contributor add Daniel Daugherty daniel.daugherty@oracle.com

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk
Contributor Erik Österlund <erik.osterlund@oracle.com> successfully added.

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk
Contributor Daniel Daugherty <daniel.daugherty@oracle.com> successfully added.

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/label remove hotspot,serviceability

@openjdk openjdk bot removed hotspot serviceability labels Sep 10, 2020
@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk
The hotspot label was successfully removed.

The serviceability label was successfully removed.

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

@fisk - Please chime in on this review when you get the chance.

@dcubed-ojdk dcubed-ojdk marked this pull request as ready for review Sep 10, 2020
@openjdk openjdk bot added the rfr label Sep 10, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 10, 2020

Webrevs

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk This change does not need sponsoring - the author is allowed to integrate it.

Copy link
Contributor

@shipilev shipilev left a comment

Looks okay to me (but it's late and I don't want to formally review it yet). Building with all three {release,fastdebug,slowdebug} is usually useful to catch oop conversion problems early.

robehn
robehn approved these changes Sep 10, 2020
@fisk
Copy link
Contributor

fisk commented Sep 10, 2020

Looks good to me.

fisk
fisk approved these changes Sep 10, 2020
@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk Your merge request cannot be fulfilled at this time, as your changes failed the final jcheck:

  • Too few reviewers with at least role reviewer found (have 0, need at least 1)

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk Your merge request cannot be fulfilled at this time, as your changes failed the final jcheck:

  • Too few reviewers with at least role reviewer found (have 0, need at least 1)

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/reviewers 2

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 10, 2020

/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2020

@dcubed-ojdk Your merge request cannot be fulfilled at this time, as your changes failed the final jcheck:

  • Too few reviewers with at least role reviewer found (have 0, need at least 1)

@openjdk
Copy link

openjdk bot commented Sep 11, 2020

@dcubed-ojdk This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8252981: ObjectMonitor::object() cleanup changes extracted from JDK-8247281

Co-authored-by: Erik Österlund <erik.osterlund@oracle.com>
Co-authored-by: Daniel Daugherty <daniel.daugherty@oracle.com>
Reviewed-by: rehn, coleenp, eosterlund
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 5 commits pushed to the master branch:

  • 040c8f5: 8250914: Matcher::stack_direction() is unused
  • 9687dca: 8252494: C2: TypeAryPtr::cast_to_autobox_cache does not use ptr_type
  • 8777ded: 8253008: Remove develop flags TraceLongCompiles/LongCompileThreshold
  • c7062dc: 8253026: Remove dummy call to gc alot from VM Thread
  • 5144190: 8243208: Clean up JVMFlag implementation

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 040c8f58e54a6d08be513deb50b157e8e64137da.

➡️ 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 label Sep 11, 2020
@dcubed-ojdk
Copy link
Member Author

dcubed-ojdk commented Sep 11, 2020

/integrate

@openjdk openjdk bot closed this Sep 11, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 11, 2020
@openjdk
Copy link

openjdk bot commented Sep 11, 2020

@dcubed-ojdk Since your change was applied there have been 5 commits pushed to the master branch:

  • 040c8f5: 8250914: Matcher::stack_direction() is unused
  • 9687dca: 8252494: C2: TypeAryPtr::cast_to_autobox_cache does not use ptr_type
  • 8777ded: 8253008: Remove develop flags TraceLongCompiles/LongCompileThreshold
  • c7062dc: 8253026: Remove dummy call to gc alot from VM Thread
  • 5144190: 8243208: Clean up JVMFlag implementation

Your commit was automatically rebased without conflicts.

Pushed as commit e7a1b9b.

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

@dcubed-ojdk dcubed-ojdk deleted the JDK-8252981 branch Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
5 participants