Mercurial > hg > truffle
changeset 12918:8f3c59225a5c
Merge
author | chegar |
---|---|
date | Thu, 15 Aug 2013 21:33:37 +0100 |
parents | ee7a7aa7c6bb (diff) 0bbd1c775bef (current diff) |
children | 7638e35cabc6 |
files | test/runtime/7196045/Test7196045.java test/runtime/8000968/Test8000968.sh |
diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Thu Aug 15 09:25:33 2013 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Thu Aug 15 21:33:37 2013 +0100 @@ -4474,9 +4474,8 @@ for (int index = 0; index < num_methods; index++) { Method* m = methods->at(index); - // skip private, static and <init> methods - if ((!m->is_private()) && - (!m->is_static()) && + // skip static and <init> methods + if ((!m->is_static()) && (m->name() != vmSymbols::object_initializer_name())) { Symbol* name = m->name();
--- a/src/share/vm/services/diagnosticCommand.cpp Thu Aug 15 09:25:33 2013 -0700 +++ b/src/share/vm/services/diagnosticCommand.cpp Thu Aug 15 21:33:37 2013 +0100 @@ -48,7 +48,7 @@ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false)); #if INCLUDE_SERVICES // Heap dumping/inspection supported - DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(full_export, true, false)); + DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false)); DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassStatsDCmd>(full_export, true, false)); #endif // INCLUDE_SERVICES