[aarch64-port-dev ] RFR: 2020-06-04, Bulk integration of Shenandoah 8u to aarch64-port/jdk8u-shenandoah

[Andrew Hughes]

On 04/06/2020 18:52, Aleksey Shipilev wrote:
> On 6/4/20 7:07 PM, Aleksey Shipilev wrote:
>> On 6/4/20 7:01 PM, Andrew Hughes wrote:
>>> Is it possible to get the merge changeset itself, exported in git diff
>>> format? What webrev has produced shows moved files as huge diffs of one
>>> file being removed and another being added.
>>
>> Sure, here it is:
>>   https://cr.openjdk.java.net/~shade/shenandoah/merges/aarch64-port-8u-20200604/merge.01.changeset
>>
>> I would have to redo the merge anyway, but I expect it would be the same. It was fully automatic.
> 
> Redid the merge after recent 8u sync:
>   https://cr.openjdk.java.net/~shade/shenandoah/merges/aarch64-port-8u-20200604/webrev.02/
>   https://cr.openjdk.java.net/~shade/shenandoah/merges/aarch64-port-8u-20200604/merge.02.changeset
> 
> AFAIU, it is pretty much the same. Just added the tags:
>   aarch64-shenandoah-jdk8u262-b05-shenandoah-merge-2020-06-04
> 

Thanks! This is a lot shorter and things like:

diff --git a/src/share/vm/gc_implementation/shared/parallelCleaning.cpp
b/src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.cpp
rename from src/share/vm/gc_implementation/shared/parallelCleaning.cpp
rename to
src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.cpp
--- a/src/share/vm/gc_implementation/shared/parallelCleaning.cpp
+++
b/src/share/vm/gc_implementation/shenandoah/shenandoahParallelCleaning.cpp
@@ -23,6 +23,6 @@
  */

 #include "precompiled.hpp"
-#include "gc_implementation/shared/parallelCleaning.hpp"
+#include "gc_implementation/shenandoah/shenandoahParallelCleaning.hpp"

are much easier to read than two long diffs :)

Push it and I'll do builds of the new tags.

Thanks,
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222