comparison src/share/vm/oops/instanceKlass.cpp @ 8714:35ef86296a5d

Merge
author dcubed
date Fri, 08 Mar 2013 17:49:52 -0800
parents 3efdfd6ddbf2 872b3feace55
children c8b31b461e1a
comparison
equal deleted inserted replaced
8712:3efdfd6ddbf2 8714:35ef86296a5d
2176 if (ClassUnloading) { 2176 if (ClassUnloading) {
2177 Klass* impl = implementor(); 2177 Klass* impl = implementor();
2178 if (impl != NULL) { 2178 if (impl != NULL) {
2179 if (!impl->is_loader_alive(is_alive)) { 2179 if (!impl->is_loader_alive(is_alive)) {
2180 // remove this guy 2180 // remove this guy
2181 *adr_implementor() = NULL; 2181 Klass** klass = adr_implementor();
2182 assert(klass != NULL, "null klass");
2183 if (klass != NULL) {
2184 *klass = NULL;
2185 }
2182 } 2186 }
2183 } 2187 }
2184 } 2188 }
2185 } 2189 }
2186 } 2190 }
3157 guarantee(constants()->is_constantPool(), "should be constant pool"); 3161 guarantee(constants()->is_constantPool(), "should be constant pool");
3158 } 3162 }
3159 if (protection_domain() != NULL) { 3163 if (protection_domain() != NULL) {
3160 guarantee(protection_domain()->is_oop(), "should be oop"); 3164 guarantee(protection_domain()->is_oop(), "should be oop");
3161 } 3165 }
3162 if (host_klass() != NULL) { 3166 const Klass* host = host_klass();
3163 guarantee(host_klass()->is_metadata(), "should be in metaspace"); 3167 if (host != NULL) {
3164 guarantee(host_klass()->is_klass(), "should be klass"); 3168 guarantee(host->is_metadata(), "should be in metaspace");
3169 guarantee(host->is_klass(), "should be klass");
3165 } 3170 }
3166 if (signers() != NULL) { 3171 if (signers() != NULL) {
3167 guarantee(signers()->is_objArray(), "should be obj array"); 3172 guarantee(signers()->is_objArray(), "should be obj array");
3168 } 3173 }
3169 } 3174 }