Mercurial > hg > openjdk > lambda > hotspot
changeset 5595:6171eb9da4fd
8007923: Tests on references fails
Reviewed-by: kvn, iveresov
| author | twisti |
|---|---|
| date | Tue, 08 Oct 2013 19:57:28 -0700 |
| parents | 17cda06bcb7d |
| children | 4e7f99b70d9d |
| files | src/share/vm/ci/ciKlass.cpp src/share/vm/opto/escape.cpp |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/ci/ciKlass.cpp Tue Oct 08 07:08:27 2013 -0700 +++ b/src/share/vm/ci/ciKlass.cpp Tue Oct 08 19:57:28 2013 -0700 @@ -66,7 +66,9 @@ // ------------------------------------------------------------------ // 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; @@ -83,8 +85,8 @@ // ------------------------------------------------------------------ // 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();
--- a/src/share/vm/opto/escape.cpp Tue Oct 08 07:08:27 2013 -0700 +++ b/src/share/vm/opto/escape.cpp Tue Oct 08 19:57:28 2013 -0700 @@ -780,6 +780,7 @@ } } else { // Allocate instance if (cik->is_subclass_of(_compile->env()->Thread_klass()) || + cik->is_subclass_of(_compile->env()->Reference_klass()) || !cik->is_instance_klass() || // StressReflectiveCode cik->as_instance_klass()->has_finalizer()) { es = PointsToNode::GlobalEscape;