[8u] RFR: 8143925 : enhancing CounterMode.crypt() for AESCrypt.implEncryptBlock() + 8146581 : Minor corrections to the patch submitted for earlier bug id - 8143925

[Anton Kozlov]

On 22.01.2020 23:31, Martin Balao wrote:
>>>  * src/cpu/x86/vm/vm_version_x86.cpp
>>>   * 3rd hook does not apply cleanly because 8134553 [5] is not in 8u.
>>> Manually applied changes. Re-ordered the hooks and added conditionals to
>>> keep the semantics.
>>
>> You created a separate if/else. Although this is IMHO cleaner than the original patch, I think it will create difficulties applying following JDK-8146581.
>>
>> Similar minor comment: you fixed indentation issue in original patch [1]. The cosmetic difference in code doesn't affect any jdk8u user. So there is no reason to deviate from original code, making further backports more complicated.
> 
> Yes, I re-worked that part because it was a bit confusing and hard to
> reason about.
> 
> What I had taken into account was the following:
> 
> 1) In baseline, the whole block is under "supports_aes()" and "UseAES"
> --> looks good in your patch
> 
> 2) UseAESIntrinsics was previously set --> looks good in your patch
> 
> 3) UseAESCTRIntrinsics was not already used/set in the file --> looks
> good in your patch


I can agree with you, original code may be organized better. 

Thanks for checking!

-- Anton