--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	Mon May 27 13:29:11 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp	Mon May 27 14:57:26 2019 +0200
@@ -3123,11 +3123,7 @@
         break;
       }
       case Op_CallStaticJava: {
-        // 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;
-        }
+        strength = STRONG;
         break;
       }
       case Op_CallDynamicJava: