Skip to content
Permalink
Browse files
8263455: NMT: assert on registering a region which completely engulfs…
… an existing region

Reviewed-by: zgu, coleenp
  • Loading branch information
tstuefe committed Mar 18, 2021
1 parent 2b93ae0 commit 444a80b920f7cb61b4607d9d245d410bf872b27f
Showing with 1 addition and 2 deletions.
  1. +1 −2 src/hotspot/share/services/virtualMemoryTracker.hpp
@@ -205,8 +205,7 @@ class VirtualMemoryRegion {
inline bool overlap_region(address addr, size_t sz) const {
assert(sz > 0, "Invalid size");
assert(size() > 0, "Invalid size");
return contain_address(addr) ||
contain_address(addr + sz - 1);
return MAX2(addr, base()) < MIN2(addr + sz, end());
}

inline bool adjacent_to(address addr, size_t sz) const {

3 comments on commit 444a80b

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot replied Mar 18, 2021

@tstuefe

This comment has been minimized.

Copy link
Member Author

@tstuefe tstuefe replied Jun 30, 2021

/backport jdk11u-dev

@openjdk

This comment has been minimized.

Copy link

@openjdk openjdk bot replied Jun 30, 2021

@tstuefe could not automatically backport 444a80b9 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/hotspot/share/services/virtualMemoryTracker.hpp

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b tstuefe-backport-444a80b9
$ git fetch --no-tags https://git.openjdk.java.net/jdk 444a80b920f7cb61b4607d9d245d410bf872b27f
$ git cherry-pick --no-commit 444a80b920f7cb61b4607d9d245d410bf872b27f
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 444a80b920f7cb61b4607d9d245d410bf872b27f'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 444a80b920f7cb61b4607d9d245d410bf872b27f.

Please sign in to comment.