--- a/src/hotspot/share/ci/ciMethod.cpp	Thu May 30 11:42:53 2019 +0200
+++ b/src/hotspot/share/ci/ciMethod.cpp	Thu May 30 13:39:13 2019 +0300
@@ -933,6 +933,13 @@
   return get_Method()->is_ignored_by_security_stack_walk();
 }
 
+// ------------------------------------------------------------------
+// ciMethod::needs_clinit_barrier
+//
+bool ciMethod::needs_clinit_barrier() const {
+  check_is_loaded();
+  return is_static() && !holder()->is_initialized();
+}
 
 // ------------------------------------------------------------------
 // invokedynamic support