--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	Thu May 23 10:13:29 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	Thu May 23 12:12:04 2019 +0200
@@ -3123,7 +3123,11 @@
         break;
       }
       case Op_CallStaticJava: {
-        strength = STRONG;
+        // If it's an deopt-call we don't need barriers because
+        // the LRB will be applied when unpacking the deopt frame.
+        if (n->as_CallStaticJava()->uncommon_trap_request() == 0) {
+          strength = STRONG;
+        }
         break;
       }
       case Op_CallDynamicJava: