src/share/vm/ci/ciObjectFactory.cpp

rev 9067 : 8139040: Fix initializations before ShouldNotReachHere()

*** 405,427 ****
  
  #if INCLUDE_ALL_GCS
    if (!UseG1GC) {
      return;
    }
!   Klass* metadata_owner_klass;
    if (m->is_klass()) {
      metadata_owner_klass = m->as_klass()->get_Klass();
    } else if (m->is_method()) {
      metadata_owner_klass = m->as_method()->get_Method()->constants()->pool_holder();
    } else {
      fatal("Not implemented for other types of metadata");
    }
  
    oop metadata_holder = metadata_owner_klass->klass_holder();
    if (metadata_holder != NULL) {
      G1SATBCardTableModRefBS::enqueue(metadata_holder);
    }
  
  #endif
  }
  
  //------------------------------------------------------------------
--- 405,429 ----
  
  #if INCLUDE_ALL_GCS
    if (!UseG1GC) {
      return;
    }
!   Klass* metadata_owner_klass = NULL;
    if (m->is_klass()) {
      metadata_owner_klass = m->as_klass()->get_Klass();
    } else if (m->is_method()) {
      metadata_owner_klass = m->as_method()->get_Method()->constants()->pool_holder();
    } else {
      fatal("Not implemented for other types of metadata");
    }
  
+   if (metadata_owner_klass != NULL) {
      oop metadata_holder = metadata_owner_klass->klass_holder();
      if (metadata_holder != NULL) {
        G1SATBCardTableModRefBS::enqueue(metadata_holder);
      }
+   }
  
  #endif
  }
  
  //------------------------------------------------------------------