*** old/src/share/vm/ci/ciKlass.cpp	Tue Oct  8 13:53:14 2013
--- new/src/share/vm/ci/ciKlass.cpp	Tue Oct  8 13:53:14 2013

*** 64,74 ****
--- 64,76 ----
  }
  
  // ------------------------------------------------------------------
  // ciKlass::is_subtype_of
  bool ciKlass::is_subtype_of(ciKlass* that) {
!   assert(is_loaded() && that->is_loaded(), "must be loaded");
!   assert(this->is_loaded(), err_msg("must be loaded: %s", this->name()->as_quoted_ascii()));
+   assert(that->is_loaded(), err_msg("must be loaded: %s", that->name()->as_quoted_ascii()));
+ 
    // Check to see if the klasses are identical.
    if (this == that) {
      return true;
    }
  

*** 81,92 ****
--- 83,94 ----
  }
  
  // ------------------------------------------------------------------
  // ciKlass::is_subclass_of
  bool ciKlass::is_subclass_of(ciKlass* that) {
!   assert(is_loaded() && that->is_loaded(), "must be loaded");
    // Check to see if the klasses are identical.
!   assert(this->is_loaded(), err_msg("must be loaded: %s", this->name()->as_quoted_ascii()));
+   assert(that->is_loaded(), err_msg("must be loaded: %s", that->name()->as_quoted_ascii()));
  
    VM_ENTRY_MARK;
    Klass* this_klass = get_Klass();
    Klass* that_klass = that->get_Klass();
    bool result = this_klass->is_subclass_of(that_klass);