equal
deleted
inserted
replaced
36 #include "memory/allocation.hpp" |
36 #include "memory/allocation.hpp" |
37 #include "memory/gcLocker.hpp" |
37 #include "memory/gcLocker.hpp" |
38 #include "memory/metadataFactory.hpp" |
38 #include "memory/metadataFactory.hpp" |
39 #include "memory/oopFactory.hpp" |
39 #include "memory/oopFactory.hpp" |
40 #include "memory/referenceType.hpp" |
40 #include "memory/referenceType.hpp" |
|
41 #include "memory/resourceArea.hpp" |
41 #include "memory/universe.inline.hpp" |
42 #include "memory/universe.inline.hpp" |
42 #include "oops/constantPool.hpp" |
43 #include "oops/constantPool.hpp" |
43 #include "oops/fieldStreams.hpp" |
44 #include "oops/fieldStreams.hpp" |
44 #include "oops/instanceKlass.hpp" |
45 #include "oops/instanceKlass.hpp" |
45 #include "oops/instanceMirrorKlass.hpp" |
46 #include "oops/instanceMirrorKlass.hpp" |
57 #include "runtime/timer.hpp" |
58 #include "runtime/timer.hpp" |
58 #include "services/classLoadingService.hpp" |
59 #include "services/classLoadingService.hpp" |
59 #include "services/threadService.hpp" |
60 #include "services/threadService.hpp" |
60 #include "utilities/array.hpp" |
61 #include "utilities/array.hpp" |
61 #include "utilities/globalDefinitions.hpp" |
62 #include "utilities/globalDefinitions.hpp" |
|
63 #include "utilities/exceptions.hpp" |
62 #include "utilities/macros.hpp" |
64 #include "utilities/macros.hpp" |
63 #include "utilities/ostream.hpp" |
65 #include "utilities/ostream.hpp" |
64 #include "utilities/resourceHash.hpp" |
66 #include "utilities/resourceHash.hpp" |
65 #if INCLUDE_CDS |
67 #if INCLUDE_CDS |
66 #include "classfile/systemDictionaryShared.hpp" |
68 #include "classfile/systemDictionaryShared.hpp" |
310 if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8()) |
312 if (valid_cp_range(index, cp->length()) && cp->tag_at(index).is_utf8()) |
311 return cp->symbol_at(index); |
313 return cp->symbol_at(index); |
312 else |
314 else |
313 return NULL; |
315 return NULL; |
314 } |
316 } |
|
317 |
|
318 PRAGMA_DIAG_PUSH |
|
319 PRAGMA_FORMAT_NONLITERAL_IGNORED |
|
320 void ClassFileParser::report_assert_property_failure(const char* msg, TRAPS) { |
|
321 ResourceMark rm(THREAD); |
|
322 fatal(err_msg(msg, _class_name->as_C_string())); |
|
323 } |
|
324 |
|
325 void ClassFileParser::report_assert_property_failure(const char* msg, int index, TRAPS) { |
|
326 ResourceMark rm(THREAD); |
|
327 fatal(err_msg(msg, index, _class_name->as_C_string())); |
|
328 } |
|
329 PRAGMA_DIAG_POP |
315 |
330 |
316 constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { |
331 constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { |
317 ClassFileStream* cfs = stream(); |
332 ClassFileStream* cfs = stream(); |
318 constantPoolHandle nullHandle; |
333 constantPoolHandle nullHandle; |
319 |
334 |