Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/ci/ciKlass.cpp	Tue Oct 08 07:08:27 2013 -0700
     1.2 +++ b/src/share/vm/ci/ciKlass.cpp	Tue Oct 08 19:57:28 2013 -0700
     1.3 @@ -66,7 +66,9 @@
     1.4  // ------------------------------------------------------------------
     1.5  // ciKlass::is_subtype_of
     1.6  bool ciKlass::is_subtype_of(ciKlass* that) {
     1.7 -  assert(is_loaded() && that->is_loaded(), "must be loaded");
     1.8 +  assert(this->is_loaded(), err_msg("must be loaded: %s", this->name()->as_quoted_ascii()));
     1.9 +  assert(that->is_loaded(), err_msg("must be loaded: %s", that->name()->as_quoted_ascii()));
    1.10 +
    1.11    // Check to see if the klasses are identical.
    1.12    if (this == that) {
    1.13      return true;
    1.14 @@ -83,8 +85,8 @@
    1.15  // ------------------------------------------------------------------
    1.16  // ciKlass::is_subclass_of
    1.17  bool ciKlass::is_subclass_of(ciKlass* that) {
    1.18 -  assert(is_loaded() && that->is_loaded(), "must be loaded");
    1.19 -  // Check to see if the klasses are identical.
    1.20 +  assert(this->is_loaded(), err_msg("must be loaded: %s", this->name()->as_quoted_ascii()));
    1.21 +  assert(that->is_loaded(), err_msg("must be loaded: %s", that->name()->as_quoted_ascii()));
    1.22  
    1.23    VM_ENTRY_MARK;
    1.24    Klass* this_klass = get_Klass();

     2.1 --- a/src/share/vm/opto/escape.cpp	Tue Oct 08 07:08:27 2013 -0700
     2.2 +++ b/src/share/vm/opto/escape.cpp	Tue Oct 08 19:57:28 2013 -0700
     2.3 @@ -780,6 +780,7 @@
     2.4        }
     2.5      } else {  // Allocate instance
     2.6        if (cik->is_subclass_of(_compile->env()->Thread_klass()) ||
     2.7 +          cik->is_subclass_of(_compile->env()->Reference_klass()) ||
     2.8           !cik->is_instance_klass() || // StressReflectiveCode
     2.9            cik->as_instance_klass()->has_finalizer()) {
    2.10          es = PointsToNode::GlobalEscape;