From dean.long at oracle.com  Mon Nov 13 17:32:09 2017
From: dean.long at oracle.com (dean.long at oracle.com)
Date: Mon, 13 Nov 2017 09:32:09 -0800
Subject: RFR(S) 8190817: deopt special-case for _return_register_finalizer is
 confusing and leads to bugs
Message-ID: <480ed17b-fae1-8db4-1d12-3319be262d3d@oracle.com>

https://bugs.openjdk.java.net/browse/JDK-8190817

http://cr.openjdk.java.net/~dlong/8190817/webrev/

This fix replaces the problematic use of 
_normal_table.entry(Bytecodes::_return).entry(vtos) as a deoptimization 
entry point with a proper deopt entry point returned by 
deopt_reexecute_return_entry().? This is needed to handle the situation 
where compiled code is calling register_finalizer() and gets deoptimized.

I also noticed that we generate duplicate entry points unnecessarily, so 
I cleaned that up at the same time.

aarch64/ppc64/s390 folks, please check that 
compiler/runtime/Test8168712.java still passes.

dl


From volker.simonis at gmail.com  Mon Nov 27 15:55:19 2017
From: volker.simonis at gmail.com (Volker Simonis)
Date: Mon, 27 Nov 2017 16:55:19 +0100
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
 depend on RewriteControl
Message-ID: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>

Hi,

can I please have a review for the following small, s390-only change
which fixes CDS on s390:

http://cr.openjdk.java.net/~simonis/webrevs/2017/8191863/
https://bugs.openjdk.java.net/browse/JDK-8191863

The problem was that mistakenly rewrote zputfield into fast_zputfield
although the active RewriteControl instance indicated that we
shouldn't rewrite bytecodes.

With this change, all the CDS and upcoming AppCDS jtreg pass on Linux/s390.

Thank you and best regards,
Volker

From martin.doerr at sap.com  Mon Nov 27 16:05:04 2017
From: martin.doerr at sap.com (Doerr, Martin)
Date: Mon, 27 Nov 2017 16:05:04 +0000
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
 depend on RewriteControl
In-Reply-To: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
References: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
Message-ID: <23e5c33654654ed184d1fbc80b54c652@sap.com>

Hi Volker,

looks good. Thanks for fixing.

Best regards,
Martin


-----Original Message-----
From: s390x-port-dev [mailto:s390x-port-dev-bounces at openjdk.java.net] On Behalf Of Volker Simonis
Sent: Montag, 27. November 2017 16:55
To: HotSpot Open Source Developers <hotspot-dev at openjdk.java.net>
Cc: s390x-port-dev at openjdk.java.net
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't depend on RewriteControl

Hi,

can I please have a review for the following small, s390-only change
which fixes CDS on s390:

http://cr.openjdk.java.net/~simonis/webrevs/2017/8191863/
https://bugs.openjdk.java.net/browse/JDK-8191863

The problem was that mistakenly rewrote zputfield into fast_zputfield
although the active RewriteControl instance indicated that we
shouldn't rewrite bytecodes.

With this change, all the CDS and upcoming AppCDS jtreg pass on Linux/s390.

Thank you and best regards,
Volker

From volker.simonis at gmail.com  Mon Nov 27 17:17:26 2017
From: volker.simonis at gmail.com (Volker Simonis)
Date: Mon, 27 Nov 2017 18:17:26 +0100
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
 depend on RewriteControl
In-Reply-To: <23e5c33654654ed184d1fbc80b54c652@sap.com>
References: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
 <23e5c33654654ed184d1fbc80b54c652@sap.com>
Message-ID: <CA+3eh13xVcd-E4tZb31RPxioGxETgdipmTr_BemDKWcr5qbwqg@mail.gmail.com>

Thanks Martin!

Regards,
Volker


On Mon, Nov 27, 2017 at 5:05 PM, Doerr, Martin <martin.doerr at sap.com> wrote:
> Hi Volker,
>
> looks good. Thanks for fixing.
>
> Best regards,
> Martin
>
>
> -----Original Message-----
> From: s390x-port-dev [mailto:s390x-port-dev-bounces at openjdk.java.net] On Behalf Of Volker Simonis
> Sent: Montag, 27. November 2017 16:55
> To: HotSpot Open Source Developers <hotspot-dev at openjdk.java.net>
> Cc: s390x-port-dev at openjdk.java.net
> Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't depend on RewriteControl
>
> Hi,
>
> can I please have a review for the following small, s390-only change
> which fixes CDS on s390:
>
> http://cr.openjdk.java.net/~simonis/webrevs/2017/8191863/
> https://bugs.openjdk.java.net/browse/JDK-8191863
>
> The problem was that mistakenly rewrote zputfield into fast_zputfield
> although the active RewriteControl instance indicated that we
> shouldn't rewrite bytecodes.
>
> With this change, all the CDS and upcoming AppCDS jtreg pass on Linux/s390.
>
> Thank you and best regards,
> Volker

From goetz.lindenmaier at sap.com  Tue Nov 28 07:06:52 2017
From: goetz.lindenmaier at sap.com (Lindenmaier, Goetz)
Date: Tue, 28 Nov 2017 07:06:52 +0000
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
 depend on RewriteControl
In-Reply-To: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
References: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
Message-ID: <8f6e77df23fe4a649f204e11855a3496@sap.com>

Hi Volker, 

change looks good, thanks for fixing!

Best regards,
  Goetz.

> -----Original Message-----
> From: s390x-port-dev [mailto:s390x-port-dev-bounces at openjdk.java.net]
> On Behalf Of Volker Simonis
> Sent: Montag, 27. November 2017 16:55
> To: HotSpot Open Source Developers <hotspot-dev at openjdk.java.net>
> Cc: s390x-port-dev at openjdk.java.net
> Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
> depend on RewriteControl
> 
> Hi,
> 
> can I please have a review for the following small, s390-only change
> which fixes CDS on s390:
> 
> http://cr.openjdk.java.net/~simonis/webrevs/2017/8191863/
> https://bugs.openjdk.java.net/browse/JDK-8191863
> 
> The problem was that mistakenly rewrote zputfield into fast_zputfield
> although the active RewriteControl instance indicated that we
> shouldn't rewrite bytecodes.
> 
> With this change, all the CDS and upcoming AppCDS jtreg pass on Linux/s390.
> 
> Thank you and best regards,
> Volker

From volker.simonis at gmail.com  Tue Nov 28 09:49:48 2017
From: volker.simonis at gmail.com (Volker Simonis)
Date: Tue, 28 Nov 2017 10:49:48 +0100
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
 depend on RewriteControl
In-Reply-To: <8f6e77df23fe4a649f204e11855a3496@sap.com>
References: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
 <8f6e77df23fe4a649f204e11855a3496@sap.com>
Message-ID: <CA+3eh13JeUqRDgopG=aMi9Vge4cc0NQYAL1siwuvmfVZf6nySQ@mail.gmail.com>

Hi Jiangli, Goetz,

thanks for the review!

Regards,
Volker

On Tue, Nov 28, 2017 at 8:06 AM, Lindenmaier, Goetz
<goetz.lindenmaier at sap.com> wrote:
> Hi Volker,
>
> change looks good, thanks for fixing!
>
> Best regards,
>   Goetz.
>
>> -----Original Message-----
>> From: s390x-port-dev [mailto:s390x-port-dev-bounces at openjdk.java.net]
>> On Behalf Of Volker Simonis
>> Sent: Montag, 27. November 2017 16:55
>> To: HotSpot Open Source Developers <hotspot-dev at openjdk.java.net>
>> Cc: s390x-port-dev at openjdk.java.net
>> Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
>> depend on RewriteControl
>>
>> Hi,
>>
>> can I please have a review for the following small, s390-only change
>> which fixes CDS on s390:
>>
>> http://cr.openjdk.java.net/~simonis/webrevs/2017/8191863/
>> https://bugs.openjdk.java.net/browse/JDK-8191863
>>
>> The problem was that mistakenly rewrote zputfield into fast_zputfield
>> although the active RewriteControl instance indicated that we
>> shouldn't rewrite bytecodes.
>>
>> With this change, all the CDS and upcoming AppCDS jtreg pass on Linux/s390.
>>
>> Thank you and best regards,
>> Volker

From jiangli.zhou at oracle.com  Mon Nov 27 19:54:50 2017
From: jiangli.zhou at oracle.com (Jiangli Zhou)
Date: Mon, 27 Nov 2017 19:54:50 -0000
Subject: RFR(S): 8191863: [s390] Fix CDS: some bytecode rewriting doesn't
 depend on RewriteControl
In-Reply-To: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
References: <CA+3eh13ava70LX9vSFxkZikobzrAMpEGDqp04DmZAwq+k5+OXQ@mail.gmail.com>
Message-ID: <ABCAE396-C2EB-43CD-B813-2250DFF66541@oracle.com>

This change matches with other platforms. Looks good.

Thanks,
Jiangli

> On Nov 27, 2017, at 7:55 AM, Volker Simonis <volker.simonis at gmail.com> wrote:
> 
> Hi,
> 
> can I please have a review for the following small, s390-only change
> which fixes CDS on s390:
> 
> http://cr.openjdk.java.net/~simonis/webrevs/2017/8191863/
> https://bugs.openjdk.java.net/browse/JDK-8191863
> 
> The problem was that mistakenly rewrote zputfield into fast_zputfield
> although the active RewriteControl instance indicated that we
> shouldn't rewrite bytecodes.
> 
> With this change, all the CDS and upcoming AppCDS jtreg pass on Linux/s390.
> 
> Thank you and best regards,
> Volker