# HG changeset patch
# User rkennke
# Date 1531152208 -7200
#      Mon Jul 09 18:03:28 2018 +0200
# Node ID 0691037d6ceebff9e3e7dddf8bfc8bf1301e5361
# Parent  266e6a543eaacfaf90e9c7b9276a06e845c30522
[mq]: remove-c2-wb.patch

diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -6664,26 +6664,6 @@
   ins_pipe(ialu_reg_mem);
 %}
 
-instruct shenandoahWB(rRegP dst, rRegP src, rFlagsReg cr) %{
-  match(Set dst (ShenandoahWriteBarrier src));
-  effect(DEF dst, USE src, KILL cr);
-  ins_cost(300); // XXX
-  format %{ "shenandoah_wb $dst,$src" %}
-  ins_encode %{
-#if INCLUDE_SHENANDOAHGC
-    Register s = $src$$Register;
-    Register d = $dst$$Register;
-    // We need that first read barrier in order to trigger a SEGV/NPE on incoming NULL.
-    // Also, it brings s into d in preparation for the call to shenandoah_write_barrier().
-    __ movptr(d, Address(s, BrooksPointer::byte_offset()));
-    __ shenandoah_write_barrier(d);
-#else
-    ShouldNotReachHere();
-#endif
-  %}
-  ins_pipe(pipe_slow);
-%}
-
 // Convert oop pointer into compressed form
 instruct encodeHeapOop(rRegN dst, rRegP src, rFlagsReg cr) %{
   predicate(n->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull);
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -567,7 +567,7 @@
 }
 
 bool ShenandoahWriteBarrierNode::expand(Compile* C, PhaseIterGVN& igvn, int& loop_opts_cnt) {
-  if (UseShenandoahGC && ShenandoahWriteBarrierToIR) {
+  if (UseShenandoahGC) {
     if (ShenandoahBarrierSetC2::bsc2()->state()->shenandoah_barriers_count() > 0 || (!ShenandoahWriteBarrier && ShenandoahStoreValEnqueueBarrier)) {
       bool attempt_more_loopopts = ShenandoahLoopOptsAfterExpansion;
       C->clear_major_progress();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -237,9 +237,6 @@
           "Common 2 WriteBarriers or WriteBarrier and a ReadBarrier only "  \
           "if the resulting WriteBarrier isn't executed more frequently")   \
                                                                             \
-  experimental(bool, ShenandoahWriteBarrierToIR, true,                      \
-          "Convert write barrier to IR instead of using assembly blob")     \
-                                                                            \
   experimental(bool, ShenandoahWriteBarrierCsetTestInIR, true,              \
           "Perform cset test in IR rather than in the stub")                \
                                                                             \
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -3400,7 +3400,7 @@
   case Op_ShenandoahReadBarrier:
     break;
   case Op_ShenandoahWriteBarrier:
-    assert(!ShenandoahWriteBarrierToIR, "should have been expanded already");
+    assert(false, "should have been expanded already");
     break;
 #endif
   case Op_RangeCheck: {