[aarch64-port-dev ] [RFR] [8u] 8u222-b04 Upstream Sync

[Andrew John Hughes]

On 28/05/2019 18:44, Aleksey Shipilev wrote:
> On 5/28/19 7:42 PM, Andrew John Hughes wrote:
>>>> http://cr.openjdk.java.net/~andrew/shenandoah-8/u222-b04/hotspot/merge.changeset
>>>
>>> Looks good.
>>>
>>> Is the copyright year adjustment in src/share/vm/prims/jni.cpp worthwhile? We can fix it along with
>>> other minor things that differ from upstream later.
>>
>> I don't follow you. It's from upstream:
>>
>> https://hg.openjdk.java.net//jdk8u/jdk8u/hotspot/rev/2afa5ff125ac24f372
> 
> Ah. I thought some "real change" was reverted, and only copyright line remained. But it is fine if
> that was the intentional change.
> 

It's part of one backport taking three changesets over multiple tags...

So b02 had:

changeset:   11216:32bc598624bd
tag:         jdk8u222-b02
user:        phh
date:        Tue May 07 20:38:26 2019 +0000
summary:     8176100: [REDO][REDO] G1 Needs pre barrier on dereference
of weak JNI handles

b03 then had:

changeset:   11221:e86bc9786d83
parent:      11216:32bc598624bd
user:        phh
date:        Fri May 10 18:50:40 2019 +0000
summary:     8223664: Add jtreg tests for 8223528, backport to jdk8u of
8176100

and b04 had:

changeset:   11232:2afa5ff125ac
parent:      11227:af43bab3c5d0
user:        phh
date:        Mon May 20 14:37:33 2019 +0000
summary:     8223883: Fix jni.cpp copyright date after 8223528

which reverts the following bad change in the 8176100 original:

diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp
+++ b/src/share/vm/prims/jni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights
reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights
reserved.
  * Copyright (c) 2012 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
-- 
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