comparison src/share/vm/classfile/systemDictionary.cpp @ 9088:89e4d67fdd2a

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 12 Apr 2013 14:05:42 +0200
parents b9a918201d47 68fe50d4f1d5
children 836a62f43af9
comparison
equal deleted inserted replaced
9037:b008f40b67d0 9088:89e4d67fdd2a
1590 1590
1591 1591
1592 // Used for assertions and verification only 1592 // Used for assertions and verification only
1593 Klass* SystemDictionary::find_class(Symbol* class_name, ClassLoaderData* loader_data) { 1593 Klass* SystemDictionary::find_class(Symbol* class_name, ClassLoaderData* loader_data) {
1594 #ifndef ASSERT 1594 #ifndef ASSERT
1595 guarantee(VerifyBeforeGC || 1595 guarantee(VerifyBeforeGC ||
1596 VerifyDuringGC || 1596 VerifyDuringGC ||
1597 VerifyBeforeExit || 1597 VerifyBeforeExit ||
1598 VerifyDuringStartup ||
1598 VerifyAfterGC, "too expensive"); 1599 VerifyAfterGC, "too expensive");
1599 #endif 1600 #endif
1600 assert_locked_or_safepoint(SystemDictionary_lock); 1601 assert_locked_or_safepoint(SystemDictionary_lock);
1601 1602
1602 // First look in the loaded class array 1603 // First look in the loaded class array