--- old/src/hotspot/share/ci/ciMethod.cpp	2019-05-01 16:15:28.000000000 -0700
+++ new/src/hotspot/share/ci/ciMethod.cpp	2019-05-01 16:15:28.000000000 -0700
@@ -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