On Fri, 14 May 2021 12:40:46 GMT, Zhengyu Gu <[email protected]> wrote:
>> Kim Barrett has updated the pull request with a new target base due to a >> merge or a rebase. The pull request now contains 10 commits: >> >> - Merge branch 'master' into new_dedup2 >> - fix shenandoah merge >> - Merge branch 'master' into new_dedup2 >> - misc cleanups >> - refactor Requests::add >> - fix typo >> - more comment improvements >> - improve naming and comments around injected String flags >> - fix some typos in comments >> - New string deduplication > >> The "merge from master" commit >> ([ccb9951](https://github.com/openjdk/jdk/commit/ccb99515d020785d7fe1cf9a1c247aeed775dc19)) >> doesn't build with Shenandoah. I've asked Zhengyu to take a look. > > Just missing a parameter: > > ```diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp > b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp > index ddaa66ccc14..93a067fa22d 100644 > --- a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp > +++ b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp > @@ -57,7 +57,7 @@ > ShenandoahInitMarkRootsClosure::ShenandoahInitMarkRootsClosure(ShenandoahObjToSc > > template <class T> > void ShenandoahInitMarkRootsClosure::do_oop_work(T* p) { > - ShenandoahMark::mark_through_ref<T, NO_DEDUP>(p, _queue, _mark_context, > false); > + ShenandoahMark::mark_through_ref<T, NO_DEDUP>(p, _queue, _mark_context, > NULL, false); > }``` Thanks @zhengyu123 for the shenandoah merge fix. Thanks @iklam , @coleenp , @tschatzl , @albertnetymk for reviews. > src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp line 314: > >> 312: size_t _bucket_index; >> 313: size_t _shrink_index; >> 314: bool _grow_only; > > Indentation Not sure what this indentation comment is referring to. ------------- PR: https://git.openjdk.java.net/jdk/pull/3662
