[8u] RFR: Protect lir_shenandoah_wb with INCLUDE_ALL_GCS

Aleksey Shipilev shade at redhat.com
Fri Jul 19 09:55:52 UTC 2019


Continuing to scrub the differences against 8u upstream. Missing Shenandoah protection here:

diff -r 16898268d728 src/share/vm/c1/c1_LIR.cpp
--- a/src/share/vm/c1/c1_LIR.cpp        Thu Jul 18 18:22:24 2019 +0200
+++ b/src/share/vm/c1/c1_LIR.cpp        Fri Jul 19 11:20:59 2019 +0200
@@ -1852,5 +1852,7 @@
      // LIR_OpProfileType
      case lir_profile_type:          s = "profile_type";  break;
+#if INCLUDE_ALL_GCS
      case lir_shenandoah_wb:         s = "shenandoah_wb"; break;
+#endif
      // LIR_OpAssert
 #ifdef ASSERT
diff -r 16898268d728 src/share/vm/c1/c1_LIR.hpp
--- a/src/share/vm/c1/c1_LIR.hpp        Thu Jul 18 18:22:24 2019 +0200
+++ b/src/share/vm/c1/c1_LIR.hpp        Fri Jul 19 11:20:59 2019 +0200
@@ -941,5 +941,7 @@
       , lir_unpack64
       , lir_unwind
+#if INCLUDE_ALL_GCS
       , lir_shenandoah_wb
+#endif
   , end_op1
   , begin_op2

Testing: hotspot_gc_shenandoah, minimal1 build (which does C1 without most GCs)

-- 
Thanks,
-Aleksey



More information about the shenandoah-dev mailing list