stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8309753: Include array classes in the output of -XX:+PrintSharedArchiveAndExit

Browse Source 
Reviewed-by: iklam, matsaave
This commit is contained in:
Calvin Cheung 2023-06-13 15:54:31 +00:00
parent e138685648
commit 14010876dc
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/classfile/systemDictionaryShared.cpp
View File

@ -1357,6 +1357,10 @@ public:
ResourceMark rm; ResourceMark rm;
_st->print_cr("%4d: %s %s", _index++, record->_klass->external_name(), _st->print_cr("%4d: %s %s", _index++, record->_klass->external_name(),
class_loader_name_for_shared(record->_klass)); class_loader_name_for_shared(record->_klass));
if (record->_klass->array_klasses() != nullptr) {
record->_klass->array_klasses()->cds_print_value_on(_st);
_st->cr();
}
} }
int index() const { return _index; } int index() const { return _index; }
}; };

10
src/hotspot/share/oops/arrayKlass.cpp
View File

@ -183,6 +183,16 @@ void ArrayKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle p
ak->restore_unshareable_info(loader_data, protection_domain, CHECK); ak->restore_unshareable_info(loader_data, protection_domain, CHECK);
} }
} }
void ArrayKlass::cds_print_value_on(outputStream* st) const {
assert(is_klass(), "must be klass");
st->print(" - array: %s", internal_name());
if (_higher_dimension != nullptr) {
ArrayKlass* ak = ArrayKlass::cast(higher_dimension());
st->cr();
ak->cds_print_value_on(st);
}
}
#endif // INCLUDE_CDS #endif // INCLUDE_CDS
// Printing // Printing

1
src/hotspot/share/oops/arrayKlass.hpp
View File

@ -119,6 +119,7 @@ class ArrayKlass: public Klass {
virtual void remove_unshareable_info(); virtual void remove_unshareable_info();
virtual void remove_java_mirror(); virtual void remove_java_mirror();
void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS); void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS);
void cds_print_value_on(outputStream* st) const;
#endif #endif
// Printing // Printing

8
test/hotspot/jtreg/runtime/cds/PrintSharedArchiveAndExit.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -43,21 +43,23 @@ public class PrintSharedArchiveAndExit {
// (1) With a valid archive // (1) With a valid archive
opts = (new CDSOptions()) opts = (new CDSOptions())
.setUseVersion(false) .setUseVersion(false)
.addSuffix( "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName, .addSuffix("-XX:SharedArchiveFile=./" + archiveName,
"-XX:+PrintSharedArchiveAndExit", "-version"); "-XX:+PrintSharedArchiveAndExit", "-version");
CDSTestUtils.run(opts) CDSTestUtils.run(opts)
.assertNormalExit(output -> { .assertNormalExit(output -> {
output.shouldContain("archive is valid"); output.shouldContain("archive is valid");
output.shouldContain("[Ljava.lang.Object;");
output.shouldNotContain("java version"); // Should not print JVM version output.shouldNotContain("java version"); // Should not print JVM version
}); });
opts = (new CDSOptions()) opts = (new CDSOptions())
.setUseVersion(false) .setUseVersion(false)
.addSuffix( "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName, .addSuffix("-XX:SharedArchiveFile=./" + archiveName,
"-XX:+PrintSharedArchiveAndExit"); "-XX:+PrintSharedArchiveAndExit");
CDSTestUtils.run(opts) CDSTestUtils.run(opts)
.assertNormalExit(output -> { .assertNormalExit(output -> {
output.shouldContain("archive is valid"); output.shouldContain("archive is valid");
output.shouldContain("[Ljava.lang.Object;");
output.shouldNotContain("Usage:"); // Should not print JVM help message output.shouldNotContain("Usage:"); // Should not print JVM help message
}); });
} }