Mercurial > hg > graal-compiler
comparison src/share/vm/classfile/systemDictionary.cpp @ 993:54b3b351d6f9
Merge
author | jrose |
---|---|
date | Wed, 23 Sep 2009 23:56:15 -0700 |
parents | 148e5441d916 ad6585fd4087 |
children | 987e948ebbc8 |
comparison
equal
deleted
inserted
replaced
992:6a8ccac44f41 | 993:54b3b351d6f9 |
---|---|
968 class_loader, | 968 class_loader, |
969 protection_domain, | 969 protection_domain, |
970 host_klass, | 970 host_klass, |
971 cp_patches, | 971 cp_patches, |
972 parsed_name, | 972 parsed_name, |
973 true, | |
973 THREAD); | 974 THREAD); |
974 | 975 |
975 | 976 |
976 // We don't redefine the class, so we just need to clean up whether there | 977 // We don't redefine the class, so we just need to clean up whether there |
977 // was an error or not (don't want to modify any system dictionary | 978 // was an error or not (don't want to modify any system dictionary |
1023 | 1024 |
1024 klassOop SystemDictionary::resolve_from_stream(symbolHandle class_name, | 1025 klassOop SystemDictionary::resolve_from_stream(symbolHandle class_name, |
1025 Handle class_loader, | 1026 Handle class_loader, |
1026 Handle protection_domain, | 1027 Handle protection_domain, |
1027 ClassFileStream* st, | 1028 ClassFileStream* st, |
1029 bool verify, | |
1028 TRAPS) { | 1030 TRAPS) { |
1029 | 1031 |
1030 // Classloaders that support parallelism, e.g. bootstrap classloader, | 1032 // Classloaders that support parallelism, e.g. bootstrap classloader, |
1031 // or all classloaders with UnsyncloadClass do not acquire lock here | 1033 // or all classloaders with UnsyncloadClass do not acquire lock here |
1032 bool DoObjectLock = true; | 1034 bool DoObjectLock = true; |
1053 | 1055 |
1054 instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name, | 1056 instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name, |
1055 class_loader, | 1057 class_loader, |
1056 protection_domain, | 1058 protection_domain, |
1057 parsed_name, | 1059 parsed_name, |
1060 verify, | |
1058 THREAD); | 1061 THREAD); |
1059 | 1062 |
1060 const char* pkg = "java/"; | 1063 const char* pkg = "java/"; |
1061 if (!HAS_PENDING_EXCEPTION && | 1064 if (!HAS_PENDING_EXCEPTION && |
1062 !class_loader.is_null() && | 1065 !class_loader.is_null() && |