< prev index next >

src/share/vm/classfile/classFileParser.cpp

Print this page
rev 7856 : 8073389: Remove the include of resourceArea.hpp from classFileParser.hpp

*** 36,45 **** --- 36,46 ---- #include "memory/allocation.hpp" #include "memory/gcLocker.hpp" #include "memory/metadataFactory.hpp" #include "memory/oopFactory.hpp" #include "memory/referenceType.hpp" + #include "memory/resourceArea.hpp" #include "memory/universe.inline.hpp" #include "oops/constantPool.hpp" #include "oops/fieldStreams.hpp" #include "oops/instanceKlass.hpp" #include "oops/instanceMirrorKlass.hpp"
*** 57,66 **** --- 58,68 ---- #include "runtime/timer.hpp" #include "services/classLoadingService.hpp" #include "services/threadService.hpp" #include "utilities/array.hpp" #include "utilities/globalDefinitions.hpp" + #include "utilities/exceptions.hpp" #include "utilities/macros.hpp" #include "utilities/ostream.hpp" #include "utilities/resourceHash.hpp" #if INCLUDE_CDS #include "classfile/systemDictionaryShared.hpp"
*** 311,320 **** --- 313,335 ---- return cp->symbol_at(index); else return NULL; } + PRAGMA_DIAG_PUSH + PRAGMA_FORMAT_NONLITERAL_IGNORED + void ClassFileParser::report_assert_property_failure(const char* msg, TRAPS) { + ResourceMark rm(THREAD); + fatal(err_msg(msg, _class_name->as_C_string())); + } + + void ClassFileParser::report_assert_property_failure(const char* msg, int index, TRAPS) { + ResourceMark rm(THREAD); + fatal(err_msg(msg, index, _class_name->as_C_string())); + } + PRAGMA_DIAG_POP + constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) { ClassFileStream* cfs = stream(); constantPoolHandle nullHandle; cfs->guarantee_more(3, CHECK_(nullHandle)); // length, first cp tag
< prev index next >