RFC: Pick up 11.0.8+1 to sh/jdk11
Aleksey Shipilev
shade at redhat.com
Mon May 4 10:01:37 UTC 2020
On 5/4/20 11:50 AM, Roland Westrelin wrote:
>
>> This is the src/hotspot subset of the merge:
>> https://cr.openjdk.java.net/~shade/shenandoah/merges/jdk11-11.0.8%2b1/webrev.01/
>>
>>>> Upstream had published 11.0.8+1, let's pick it up to sh/jdk11.
>>>>
>>>> The merge was simple, except one thing. I had to apply the missing Shenandoah hunk from 8231550 to
>>>> unbreak the tests:
>>>> https://hg.openjdk.java.net/jdk/jdk/rev/bada0782842a
>>
>> ...for this, I resolved the conflict in src/hotspot/share/opto/loopnode.cpp by accepting the
>> upstream side, and then applied a hunk in src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
>> cleanly. There were no other conflicts.
>>
>> Without doing the above, gc/shenandoah/compiler/CallMultipleCatchProjs.java fails.
>
> That looks good to me.
Thanks, pushed the whole merge to sh/jdk11.
--
Thanks,
-Aleksey
More information about the shenandoah-dev
mailing list