[16] RFR(XS) 8248347: windows build broken by JDK-8243114

[Daniel D. Daugherty]

Thumbs up! This is a trivial fix and does not need to wait 24 hours.

Dan


On 6/25/20 6:47 PM, Vladimir Kozlov wrote:
> Resending to groups mailing lists since hotspot-dev is behaving 
> strangely today.
>
> https://bugs.openjdk.java.net/browse/JDK-8248347
>
> I used ULLONG_MAX instead of -1ULL [1].
>
> I ran tier1. Tests still run on MacOS. Linux and Win are finished.
> Builds passed on all our supported x64 OSs: Linux, Win, MacOS.
> Tier1 runs MontgomeryMultiplyTest.java test - it passed on Win.
>
> Thanks,
> Vladimir
>
> [1] fix
>
> diff -r 315169f1f73a src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
> --- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
> +++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
> @@ -3770,7 +3770,7 @@
>    julong t0 = 0, t1 = 0, t2 = 0; // Triple-precision accumulator
>    int i;
>
> -  assert(inv * n[0] == -1ULL, "broken inverse in Montgomery multiply");
> +  assert(inv * n[0] == ULLONG_MAX, "broken inverse in Montgomery 
> multiply");
>
>    for (i = 0; i < len; i++) {
>      int j;
> @@ -3812,7 +3812,7 @@
>    julong t0 = 0, t1 = 0, t2 = 0; // Triple-precision accumulator
>    int i;
>
> -  assert(inv * n[0] == -1ULL, "broken inverse in Montgomery square");
> +  assert(inv * n[0] == ULLONG_MAX, "broken inverse in Montgomery 
> square");
>
>    for (i = 0; i < len; i++) {
>      int j;