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

[Andrew John Hughes]

On 05/05/2020 10:38, Aleksey Shipilev wrote:
> On 5/5/20 7:39 AM, Andrew John Hughes wrote:

snip...

> 
> Not sure about this change:
> 
> diff --git a/src/share/vm/gc_implementation/shenandoah/shenandoahGCTraceTime.cpp
> b/src/share/vm/gc_implementation/shenandoah/shenandoahGCTraceTime.cpp
> --- a/src/share/vm/gc_implementation/shenandoah/shenandoahGCTraceTime.cpp
> +++ b/src/share/vm/gc_implementation/shenandoah/shenandoahGCTraceTime.cpp
> @@ -33,7 +33,7 @@
>  #include "runtime/thread.inline.hpp"
>  #include "runtime/timer.hpp"
>  #include "utilities/ostream.hpp"
> -#include "utilities/ticks.inline.hpp"
> +#include "utilities/ticks.hpp"
> 
> It looks to me that .inline.hpp is always safe to include instead of .hpp. Changing it the other way
> around may introduce build failures?
> 
> Otherwise looks fine.

Not when it doesn't exist :-)

With all the AArch64 changes, I forgot about this one which turned up on
the local build. ticks.inline.hpp is removed by 8223147: "JFR Backport"
and this same change is made there in the shared GC code e.g.

https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/b985cbb00e68#l113.7

-- 
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