Mercurial > hg > truffle
changeset 6758:46b3b2dd84db
Merge
| author | jmasa |
|---|---|
| date | Thu, 20 Sep 2012 13:49:27 -0700 |
| parents | b2ef234911c9 (current diff) e861d44e0c9c (diff) |
| children | 145ffab733e7 |
| files | |
| diffstat | 3 files changed, 0 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoaderData.hpp Thu Sep 20 09:52:56 2012 -0700 +++ b/src/share/vm/classfile/classLoaderData.hpp Thu Sep 20 13:49:27 2012 -0700 @@ -204,15 +204,6 @@ void classes_do(KlassClosure* klass_closure); - bool has_defined(Klass* klass) { - for (Klass* k = _klasses; k != NULL; k = k->next_link()) { - if (klass == k) { - return true; - } - } - return false; - } - JNIMethodBlock* jmethod_ids() const { return _jmethod_ids; } void set_jmethod_ids(JNIMethodBlock* new_block) { _jmethod_ids = new_block; }
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Sep 20 09:52:56 2012 -0700 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Sep 20 13:49:27 2012 -0700 @@ -2392,8 +2392,6 @@ void PSParallelCompact::follow_klass(ParCompactionManager* cm, Klass* klass) { ClassLoaderData* cld = klass->class_loader_data(); - assert(cld->has_defined(klass), "inconsistency!"); - // The actual processing of the klass is done when we // traverse the list of Klasses in the class loader data. PSParallelCompact::follow_class_loader(cm, cld); @@ -2401,8 +2399,6 @@ void PSParallelCompact::adjust_klass(ParCompactionManager* cm, Klass* klass) { ClassLoaderData* cld = klass->class_loader_data(); - assert(cld->has_defined(klass), "inconsistency!"); - // The actual processing of the klass is done when we // traverse the list of Klasses in the class loader data. PSParallelCompact::adjust_class_loader(cm, cld);
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp Thu Sep 20 09:52:56 2012 -0700 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Thu Sep 20 13:49:27 2012 -0700 @@ -84,8 +84,6 @@ void MarkSweep::follow_klass(Klass* klass) { ClassLoaderData* cld = klass->class_loader_data(); - assert(cld->has_defined(klass), "inconsistency!"); - // The actual processing of the klass is done when we // traverse the list of Klasses in the class loader data. MarkSweep::follow_class_loader(cld); @@ -93,8 +91,6 @@ void MarkSweep::adjust_klass(Klass* klass) { ClassLoaderData* cld = klass->class_loader_data(); - assert(cld->has_defined(klass), "inconsistency!"); - // The actual processing of the klass is done when we // traverse the list of Klasses in the class loader data. MarkSweep::adjust_class_loader(cld);