# HG changeset patch
# User rkennke
# Date 1556894560 -7200
#      Fri May 03 16:42:40 2019 +0200
# Node ID f5c9d4ff794afac5692eec23f486a4fc00f56461
# Parent  32d81b0ed99c5c65f4986b1e6fa9488df74a759e
Implement ShenandoahBarrierSetC2::step_over_gc_barrier() to fix lock elimination bug with Shenandoah

diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -710,8 +710,7 @@
 }
 
 Node* ShenandoahBarrierSetC2::step_over_gc_barrier(Node* c) const {
-  // Currently not needed.
-  return c;
+  return ShenandoahBarrierNode::skip_through_barrier(c);
 }
 
 bool ShenandoahBarrierSetC2::array_copy_requires_gc_barriers(BasicType type) const {