[11u] RFR 8218468: Load barrier slow path node should be MachTypeNode

Aleksey Shipilev shade at redhat.com
Mon Sep 2 15:14:25 UTC 2019


Original bug:
  https://bugs.openjdk.java.net/browse/JDK-8218468
  https://hg.openjdk.java.net/jdk/jdk/rev/b36e68b34be3

Original change does not apply to 11u cleanly, because there is no Shenandoah. The change is already
in 11.0.6-oracle, in some form. Nils, is it like below?

11u patch:

diff -r cb90ceb87071 src/hotspot/share/adlc/formssel.cpp
--- a/src/hotspot/share/adlc/formssel.cpp       Tue Nov 06 23:03:05 2018 +0100
+++ b/src/hotspot/share/adlc/formssel.cpp       Mon Sep 02 17:12:54 2019 +0200
@@ -791,4 +791,8 @@
        !strcmp(_matrule->_rChild->_opType,"GetAndSetP")   ||
        !strcmp(_matrule->_rChild->_opType,"GetAndSetN")   ||
+#if INCLUDE_ZGC
+       !strcmp(_matrule->_rChild->_opType,"LoadBarrierSlowReg") ||
+       !strcmp(_matrule->_rChild->_opType,"LoadBarrierWeakSlowReg") ||
+#endif
        !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeP") ||
        !strcmp(_matrule->_rChild->_opType,"CompareAndExchangeN")))  return true;

Testing: Linux x86_64, tier1, tier2

-- 
Thanks,
-Aleksey



More information about the jdk-updates-dev mailing list