src/hotspot/share/opto/bytecodeInfo.cpp

@@ -204,11 +204,11 @@
   // First check all inlining restrictions which are required for correctness
   if ( callee_method->is_abstract()) {
     fail_msg = "abstract method"; // // note: we allow ik->is_abstract()
   } else if (!callee_method->holder()->is_initialized() &&
              // access allowed in the context of static initializer
-             !C->is_compiling_clinit_for(callee_method->holder())) {
+             C->needs_clinit_barrier(callee_method, caller_method)) {
     fail_msg = "method holder not initialized";
   } else if ( callee_method->is_native()) {
     fail_msg = "native method";
   } else if ( callee_method->dont_inline()) {
     fail_msg = "don't inline by annotation";

@@ -479,11 +479,11 @@
   if( callee_method == NULL )            return false;
   // Check if klass of callee_method is loaded
   if( !callee_holder->is_loaded() )      return false;
   if( !callee_holder->is_initialized() &&
       // access allowed in the context of static initializer
-      !C->is_compiling_clinit_for(callee_holder)) {
+      C->needs_clinit_barrier(callee_method, caller_method)) {
     return false;
   }
   if( !UseInterpreter ) /* running Xcomp */ {
     // Checks that constant pool's call site has been visited
     // stricter than callee_holder->is_initialized()