Mercurial > hg > truffle

comparison src/share/vm/classfile/dictionary.cpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 90273fc0a981
children 1f9994892f89
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
578 guarantee(e->oop_is_instance(), 578 guarantee(e->oop_is_instance(),
579 "Verify of system dictionary failed"); 579 "Verify of system dictionary failed");
580 // class loader must be present; a null class loader is the 580 // class loader must be present; a null class loader is the
581 // boostrap loader 581 // boostrap loader
582 guarantee(loader_data != NULL || DumpSharedSpaces || 582 guarantee(loader_data != NULL || DumpSharedSpaces ||
583 loader_data->is_the_null_class_loader_data() || 583 loader_data->class_loader() == NULL ||
584 loader_data->class_loader()->is_instance(), 584 loader_data->class_loader()->is_instance(),
585 "checking type of class_loader"); 585 "checking type of class_loader");
586 e->verify(); 586 e->verify();
587 probe->verify_protection_domain_set(); 587 probe->verify_protection_domain_set();
588 element_count++; 588 element_count++;