RFC: Pick up 11.0.5+1 to sh/jdk11
Aleksey Shipilev
shade at redhat.com
Thu Aug 1 17:08:35 UTC 2019
Upstream had published 11.0.5+1 to jdk-updates/jdk11u. Let's pick that up to sh/jdk11!
There are many incoming changes, so webrev is not practical:
49022 lines changed: 14616 ins; 6021 del; 28385 mod; 652850 unchg
List of changes:
https://cr.openjdk.java.net/~shade/shenandoah/merges/jdk11-11.0.5%2b1/changesets.txt
I had to additionally pick up the leftover change from here:
https://bugs.openjdk.java.net/browse/JDK-8223244
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Wed May 08 08:15:04
2019 +0100
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp Wed May 08 11:59:14
2019 +0200
@@ -53,12 +53,14 @@
if (type == T_OBJECT || type == T_ARRAY) {
#ifdef _LP64
- if (!checkcast && !obj_int) {
- // Save count for barrier
- __ movptr(r11, count);
- } else if (disjoint && obj_int) {
- // Save dst in r11 in the disjoint case
- __ movq(r11, dst);
+ if (!checkcast) {
+ if (!obj_int) {
+ // Save count for barrier
+ __ movptr(r11, count);
+ } else if (disjoint) {
+ // Save dst in r11 in the disjoint case
+ __ movq(r11, dst);
+ }
}
#else
if (disjoint) {
@@ -123,13 +125,15 @@
if (type == T_OBJECT || type == T_ARRAY) {
#ifdef _LP64
- if (!checkcast && !obj_int) {
- // Save count for barrier
- count = r11;
- } else if (disjoint && obj_int) {
- // Use the saved dst in the disjoint case
- dst = r11;
- } else if (checkcast) {
+ if (!checkcast) {
+ if (!obj_int) {
+ // Save count for barrier
+ count = r11;
+ } else if (disjoint && obj_int) {
+ // Use the saved dst in the disjoint case
+ dst = r11;
+ }
+ } else {
tmp = rscratch1;
}
#else
Testing: hotspot_gc_shenandoah {fastdebug,release}
--
Thanks,
-Aleksey
More information about the shenandoah-dev
mailing list