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

dcubed-ojdk · 2020-09-10T16:56:17Z

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

Robbin Ehn (@robehn - Reviewer) ⚠️ Review applies to 3664936
Coleen Phillimore (@coleenp - Reviewer) ⚠️ Review applies to 3664936
Erik Österlund (@fisk - Reviewer) ⚠️ Review applies to 3664936

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

…247281

dcubed-ojdk · 2020-09-10T16:57:55Z

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

bridgekeeper · 2020-09-10T16:58:14Z

👋 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 · 2020-09-10T16:59:12Z

@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 · 2020-09-10T16:59:29Z

@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 · 2020-09-10T17:00:05Z

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

dcubed-ojdk · 2020-09-10T17:00:56Z

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

openjdk · 2020-09-10T17:01:02Z

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

openjdk · 2020-09-10T17:01:22Z

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

dcubed-ojdk · 2020-09-10T17:02:21Z

/label remove hotspot,serviceability

openjdk · 2020-09-10T17:03:01Z

@dcubed-ojdk
The hotspot label was successfully removed.

The serviceability label was successfully removed.

dcubed-ojdk · 2020-09-10T18:12:31Z

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

mlbridge · 2020-09-10T18:16:23Z

Webrevs

src/hotspot/share/runtime/synchronizer.cpp

…K-8252126.

dcubed-ojdk · 2020-09-10T18:31:51Z

/sponsor

openjdk · 2020-09-10T18:32:11Z

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

shipilev

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.

src/hotspot/share/runtime/objectMonitor.inline.hpp

fisk · 2020-09-10T20:03:51Z

Looks good to me.

dcubed-ojdk · 2020-09-10T20:53:29Z

/integrate

openjdk · 2020-09-10T20:54:33Z

@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 · 2020-09-10T21:04:08Z

/integrate

openjdk · 2020-09-10T21:05:13Z

@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 · 2020-09-10T21:15:40Z

/reviewers 2

openjdk · 2020-09-10T21:16:24Z

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

dcubed-ojdk · 2020-09-10T21:21:07Z

/integrate

openjdk · 2020-09-10T21:21:39Z

@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 · 2020-09-11T13:32:06Z

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

dcubed-ojdk · 2020-09-11T13:34:32Z

/integrate

openjdk · 2020-09-11T13:35:53Z

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

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

4fe77e0

…247281

openjdk bot added serviceability serviceability-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Sep 10, 2020

openjdk bot removed hotspot hotspot-dev@openjdk.org serviceability serviceability-dev@openjdk.org labels Sep 10, 2020

dcubed-ojdk marked this pull request as ready for review September 10, 2020 18:12

openjdk bot added the rfr Pull request is ready for review label Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

View reviewed changes

src/hotspot/share/runtime/synchronizer.cpp Outdated Show resolved Hide resolved

Remove left over setting of GVars.stw_random; fixed separately via JD…

3664936

…K-8252126.

shipilev reviewed Sep 10, 2020

View reviewed changes

src/hotspot/share/runtime/objectMonitor.inline.hpp Show resolved Hide resolved

src/hotspot/share/runtime/objectMonitor.inline.hpp Show resolved Hide resolved

robehn approved these changes Sep 10, 2020

View reviewed changes

coleenp approved these changes Sep 10, 2020

View reviewed changes

src/hotspot/share/runtime/objectMonitor.inline.hpp Show resolved Hide resolved

fisk approved these changes Sep 10, 2020

View reviewed changes

Merge branch 'master' into JDK-8252981

2b018ee

openjdk bot added the ready Pull request is ready to be integrated label Sep 11, 2020

openjdk bot closed this Sep 11, 2020

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 11, 2020

dcubed-ojdk deleted the JDK-8252981 branch September 11, 2020 13:51

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

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

dcubed-ojdk commented Sep 10, 2020 •

edited by openjdk bot

dcubed-ojdk commented Sep 10, 2020

bridgekeeper bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

mlbridge bot commented Sep 10, 2020 •

edited

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

shipilev left a comment

fisk commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 11, 2020

dcubed-ojdk commented Sep 11, 2020

openjdk bot commented Sep 11, 2020

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

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

Conversation

dcubed-ojdk commented Sep 10, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Contributors

Download

dcubed-ojdk commented Sep 10, 2020

bridgekeeper bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

mlbridge bot commented Sep 10, 2020 • edited

Webrevs

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

shipilev left a comment

Choose a reason for hiding this comment

fisk commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

dcubed-ojdk commented Sep 10, 2020

openjdk bot commented Sep 10, 2020

openjdk bot commented Sep 11, 2020

dcubed-ojdk commented Sep 11, 2020

openjdk bot commented Sep 11, 2020

dcubed-ojdk commented Sep 10, 2020 •

edited by openjdk bot

mlbridge bot commented Sep 10, 2020 •

edited