src/hotspot/cpu/x86/x86.ad

@@ -1884,11 +1884,11 @@
    int framesize = C->output()->frame_size_in_bytes();
    int bangsize = C->output()->bang_size_in_bytes();
  
    if (C->clinit_barrier_on_entry()) {
      assert(VM_Version::supports_fast_class_init_checks(), "sanity");
-     assert(!C->method()->holder()->is_not_initialized(), "initialization should have been started");
+     assert(!C->method()->holder()->is_not_initialized() || C->do_clinit_barriers(), "initialization should have been started");
  
      Label L_skip_barrier;
      Register klass = rscratch1;
  
      __ mov_metadata(klass, C->method()->holder()->constant_encoding());