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

8266497: Remove unnecessary EMCP liveness indication #3852

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented May 4, 2021

Marking running_emcp for Method* is unnecessary. We can set/clear breakpoints in all old emcp methods because they're not deallocated until none are running. See longer explanation in the CR.

Tested with tier1-6, tiers 7,8 are running and 98% passing.


Progress

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

Issue

  • JDK-8266497: Remove unnecessary EMCP liveness indication

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3852

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 4, 2021

👋 Welcome back coleenp! 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 rfr Pull request is ready for review label May 4, 2021
@openjdk
Copy link

openjdk bot commented May 4, 2021

@coleenp The following labels will be automatically applied to this pull request:

  • hotspot
  • 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 pull request command.

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels May 4, 2021
@mlbridge
Copy link

mlbridge bot commented May 4, 2021

Webrevs

@coleenp
Copy link
Contributor Author

coleenp commented May 4, 2021

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot hotspot-dev@openjdk.org label May 4, 2021
@openjdk
Copy link

openjdk bot commented May 4, 2021

@coleenp
The hotspot label was successfully removed.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label May 4, 2021
@openjdk
Copy link

openjdk bot commented May 4, 2021

@coleenp
The hotspot-runtime label was successfully added.

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

@openjdk
Copy link

openjdk bot commented May 4, 2021

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

8266497: Remove unnecessary EMCP liveness indication

Reviewed-by: iklam, dholmes, sspitsyn

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 14 new commits pushed to the master 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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 4, 2021
@coleenp
Copy link
Contributor Author

coleenp commented May 4, 2021

Thanks Ioi, and thanks for updating the description.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Hi Coleen,

Seems reasonable. Nice simplification too!

Thanks,
David

Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

Hi Coleen,

This looks good to me in general.
I'm a little bit puzzled why the check emcp_method_count != 0 is needed at the line:
4005 if (emcp_method_count != 0 && obsolete_method_count != 0 &&

Suppose, the emcp_method_count is equal to 0.
Then do we really want to skip marking all the methods of this InstanceKlass as obsolete?
Most likely, I'm missing something.

Thanks,
Serguei

@coleenp
Copy link
Contributor Author

coleenp commented May 5, 2021

@sspitsyn I think you're right here. If all the newly old methods are obsolete, then we should mark all the methods in the previous versions as obsolete and not skip this. I'll file an issue to investigate this because it's always been this way (and could use a test also). It's too risky to change here. Thanks for the code review!

@coleenp
Copy link
Contributor Author

coleenp commented May 5, 2021

Thanks for the code review, David.
/integrate

@openjdk openjdk bot closed this May 5, 2021
@openjdk 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 May 5, 2021
@openjdk
Copy link

openjdk bot commented May 5, 2021

@coleenp Since your change was applied there have been 25 commits pushed to the master branch:

  • 6ba911d: 8266498: Make debug ps() call print_stack
  • ef0f693: 8266499: Delete dead code in aarch64.ad
  • 71d0858: 8266522: Shenandoah: Shenandoah LRB calls wrong runtime barrier on aarch64
  • 0ac84d1: 8266506: [aix] Treat mapping attempt too close to BRK as a mapping error
  • 02cdd6e: 8266419: [aix] in mmap mode, os::attempt_reserve_memory_at() fails to handle wrong mapping address
  • 250b45a: 8266222: [aix] In mmap-mode, partial releases with os::release_memory may trash internal bookkeeping
  • 65ce4d2: 8266491: Remove resolve and obj_equals leftovers from BarrierSetAssembler
  • a8046c9: 8266436: Synthetic constructor trees have non-null return type
  • c9873c4: 8260621: (jrtfs) ThreadLocal memory leak in ImageBufferCache when using jrtfs
  • 82768d9: 8221503: vmTestbase/nsk/jdb/eval/eval001/eval001.java fails with: com.sun.jdi.InvalidTypeException: Can't assign double[][][] to double[][][]
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/05e601748a35de02a33721199a00a3d6c335c6d9...master

Your commit was automatically rebased without conflicts.

Pushed as commit a05e8e2.

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

@coleenp coleenp deleted the redef-bug branch May 5, 2021 13:27
@sspitsyn
Copy link
Contributor

sspitsyn commented May 6, 2021

Thanks, Coleen! I agree, it is better to file a new bug.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
4 participants