Mercurial > hg > graal-compiler
changeset 12917:ee7a7aa7c6bb
Merge
author | chegar |
---|---|
date | Fri, 09 Aug 2013 14:30:08 +0100 |
parents | 38f9393d1847 (diff) b9a927798f12 (current diff) |
children | 8f3c59225a5c |
files | |
diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Thu Aug 08 10:10:31 2013 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Fri Aug 09 14:30:08 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 08 10:10:31 2013 -0700 +++ b/src/share/vm/services/diagnosticCommand.cpp Fri Aug 09 14:30:08 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