Skip to content

8260048: Shenandoah: ShenandoahMarkingContext asserts are unnecessary#2164

Closed
shipilev wants to merge 2 commits intoopenjdk:masterfrom
shipilev:JDK-8260048-shenandoah-unnecessary-asserts
Closed

8260048: Shenandoah: ShenandoahMarkingContext asserts are unnecessary#2164
shipilev wants to merge 2 commits intoopenjdk:masterfrom
shipilev:JDK-8260048-shenandoah-unnecessary-asserts

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Jan 20, 2021

There are two shenandoah_assert_not_forwarded asserts that are not necessary in mark_{strong,weak}, because the only caller already asserts this higher-level invariant. There is no need to check it in ShenandoahMarkingContext once again. This simplifies the fastpath in fastdebug builds.

Additional testing:

  • hotspot_gc_shenandoah
  • tier1, tier2 with Shenandoah

Progress

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

Issue

  • JDK-8260048: Shenandoah: ShenandoahMarkingContext asserts are unnecessary

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 20, 2021

👋 Welcome back shade! 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 Jan 20, 2021
@openjdk
Copy link

openjdk bot commented Jan 20, 2021

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

  • hotspot-gc
  • shenandoah

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 hotspot-gc hotspot-gc-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Jan 20, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 20, 2021

Webrevs

Copy link
Contributor

@zhengyu123 zhengyu123 left a comment

Choose a reason for hiding this comment

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

Looks good and trivial.

@openjdk
Copy link

openjdk bot commented Jan 20, 2021

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

8260048: Shenandoah: ShenandoahMarkingContext asserts are unnecessary

Reviewed-by: zgu, rkennke

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

  • 0785147: 8259949: x86 32-bit build fails when -fcf-protection is passed in the compiler flags
  • 5891509: 8259947: (fs) Optimize UnixPath.encode implementation
  • 69f90b5: 8259843: initialize dli_fname array before calling dll_address_to_library_name
  • 52ed2aa: 8259786: initialize last parameter of getpwuid_r
  • 70b5b31: 8257664: HTMLEditorKit: Wrong CSS relative font sizes
  • 0b01d69: 8260005: Shenandoah: Remove unused AlwaysTrueClosure in ShenandoahConcurrentRootScanner::roots_do()
  • 0529480: 8259867: Move encoding checks into ZipCoder
  • 7c32ffe: 8258383: vmTestbase/gc/g1/unloading/tests/unloading_compilation_level[1,2,3] time out without TieredCompilation
  • 9f21bb6: 8259983: do not use uninitialized expand_ms value in G1CollectedHeap::expand_heap_after_young_collection
  • cf25383: Merge
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/a9519c83b8f118f62190a3956fca6c45387c7d6b...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 the ready Pull request is ready to be integrated label Jan 20, 2021
Copy link
Contributor

@rkennke rkennke left a comment

Choose a reason for hiding this comment

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

Ok.

@shipilev
Copy link
Member Author

/integrate

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

openjdk bot commented Jan 21, 2021

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

Your commit was automatically rebased without conflicts.

Pushed as commit 5940287.

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

@shipilev shipilev deleted the JDK-8260048-shenandoah-unnecessary-asserts branch January 21, 2021 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

3 participants