[aarch64-port-dev ] [RFR] [8u] 8u232-b01 Upstream Sync

[Andrew John Hughes]

On 01/08/2019 18:19, Aleksey Shipilev wrote:
> The links to changesets below are broken, they are not "b09.changeset", but rather "$project.patch".

Knew I shouldn't have copied from the joint e-mail.
No, they should be merge.changeset. The others are the webrev patch
files, which there's no point in linking to separately.


http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/corba/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/jaxp/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/jaxws/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/jdk/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/hotspot/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/langtools/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/nashorn/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/root/merge.changeset

> Anyway:
> 
> On 8/1/19 6:47 PM, Andrew John Hughes wrote:
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/corba/b09.changeset
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/jaxp/b09.changeset
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/jaxws/b09.changeset
> 
> Look trivially good.
> 
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/jdk/b09.changeset
> 
> Looks good.
> 
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/hotspot/b09.changeset
> 
> I don't understand where change to chaitin.hpp is coming from, really:
> 
> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/hotspot/src/share/vm/opto/chaitin.hpp.sdiff.html
> 
> It seems both sides of the merge have the "if" branch removed:
>   http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/bfff0a0ccb0e/src/share/vm/opto/chaitin.hpp#l323
> 
> http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/file/7570e7d49957/src/share/vm/opto/chaitin.hpp#l323
> 
> Maybe I don't understand how webrev was generated.
> 

There isn't one in this merge:

https://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/hotspot/merge.changeset

diffstat for hotspot
 b/.hgtags
      |    3
 b/agent/src/os/linux/ps_core.c
      |   51
 b/make/aix/makefiles/jsig.make
      |    7
 b/make/bsd/makefiles/jsig.make
      |    7
 b/make/linux/makefiles/jsig.make
      |    7
 b/make/solaris/makefiles/jsig.make
      |    7
 b/src/cpu/ppc/vm/assembler_ppc.hpp
      |    7
 b/src/cpu/ppc/vm/assembler_ppc.inline.hpp
      |   19
 b/src/cpu/ppc/vm/macroAssembler_ppc.hpp
      |   34
 b/src/cpu/ppc/vm/macroAssembler_ppc_sha.cpp
      | 1136 ++++++++++
 b/src/cpu/ppc/vm/stubGenerator_ppc.cpp
      |   31
 b/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
      |    2
 b/src/cpu/ppc/vm/vm_version_ppc.cpp
      |   41
 b/src/cpu/ppc/vm/vm_version_ppc.hpp
      |    3
 b/src/os/aix/vm/os_aix.cpp
      |    3
 b/src/os/aix/vm/os_aix.inline.hpp
      |   35
 b/src/os/aix/vm/perfMemory_aix.cpp
      |   13
 b/src/os/bsd/vm/os_bsd.cpp
      |    3
 b/src/os/bsd/vm/os_bsd.inline.hpp
      |   33
 b/src/os/bsd/vm/perfMemory_bsd.cpp
      |   13
 b/src/os/linux/vm/os_linux.cpp
      |    3
 b/src/os/linux/vm/os_linux.inline.hpp
      |   33
 b/src/os/linux/vm/perfMemory_linux.cpp
      |   14
 b/src/os/posix/vm/os_posix.cpp
      |   15
 b/src/os/solaris/vm/os_solaris.cpp
      |    4
 b/src/os/solaris/vm/os_solaris.inline.hpp
      |   31
 b/src/os/solaris/vm/perfMemory_solaris.cpp
      |   13
 b/src/os/windows/vm/os_windows.cpp
      |    8
 b/src/os/windows/vm/os_windows.inline.hpp
      |    8
 b/src/os/windows/vm/perfMemory_windows.cpp
      |   12
 b/src/share/vm/c1/c1_Optimizer.cpp
      |    8
 b/src/share/vm/oops/instanceKlass.cpp
      |    4
 b/src/share/vm/oops/klass.hpp
      |    3
 b/src/share/vm/opto/ifnode.cpp
      |    2
 b/src/share/vm/opto/library_call.cpp
      |   20
 b/src/share/vm/opto/runtime.cpp
      |   22
 b/src/share/vm/runtime/arguments.cpp
      |   12
 b/src/share/vm/runtime/os.hpp
      |    3
 b/src/share/vm/services/classLoadingService.cpp
      |    4
 b/test/compiler/c1/TestGotoIf.jasm
      |  171 +
 b/test/compiler/c1/TestGotoIfMain.java
      |   46
 b/test/compiler/c2/TestIfWithDeadRegion.java
      |   57
 b/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java |    3
 b/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
      |   23
 44 files changed, 1719 insertions(+), 255 deletions(-)

This is precisely why I provide the merge changesets and diffstat info.
webrev is probably confused by some previous merge or other.

> Otherwise looks good.
> 
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/langtools/b09.changeset
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/nashorn/b09.changeset
> 
> Look trivially good.
> 
>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u232-b01/root/b09.changeset
> Looks good.
> 

-- 
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
https://keybase.io/gnu_andrew