Skip to content

8384061: [lworld] VM_PrintClassLayout uses the wrong VMOp_Type #2401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xmas92 wants to merge 5 commits into
base: lworld
Choose a base branch
from
Open

8384061: [lworld] VM_PrintClassLayout uses the wrong VMOp_Type #2401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
092b35c
VM_PrintClassLayout uses the wrong VMOp_Type
xmas92 May 6, 2026
617c434
Fix the VMOp name
xmas92 May 7, 2026
29ba040
Merge remote-tracking branch 'upstream_valhalla/lworld' into lworld-w…
xmas92 May 11, 2026
733b60d
Revert "Fix the VMOp name"
xmas92 May 11, 2026
3b24de1
Rename symbols to be consistent with the CMD `VM.class_print_layout`
xmas92 May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hotspot/share/memory/heapInspection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ static void print_flat_field(outputStream* st, int level, int offset, InstanceKl
}
}

void PrintClassLayout::print_class_layout(outputStream* st, char* class_name) {
void ClassPrintLayout::class_print_layout(outputStream* st, char* class_name) {
KlassInfoTable cit(true);
if (cit.allocation_failed()) {
st->print_cr("ERROR: Ran out of C-heap; hierarchy not generated");
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/memory/heapInspection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ class KlassInfoHisto : public StackObj {
void sort();
};

class PrintClassLayout : AllStatic {
class ClassPrintLayout : AllStatic {
public:
static void print_class_layout(outputStream* st, char* classname);
static void class_print_layout(outputStream* st, char* classname);
};

#endif // INCLUDE_SERVICES
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/vmOperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ void VM_PrintClassHierarchy::doit() {
KlassHierarchy::print_class_hierarchy(_out, _print_interfaces, _print_subclasses, _classname);
}

void VM_PrintClassLayout::doit() {
PrintClassLayout::print_class_layout(_out, _class_name);
void VM_ClassPrintLayout::doit() {
ClassPrintLayout::class_print_layout(_out, _class_name);
}
#endif
6 changes: 3 additions & 3 deletions src/hotspot/share/runtime/vmOperations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,13 @@ class VM_PrintCompileQueue: public VM_Operation {
void doit();
};

class VM_PrintClassLayout: public VM_Operation {
class VM_ClassPrintLayout: public VM_Operation {
private:
outputStream* _out;
char* _class_name;
public:
VM_PrintClassLayout(outputStream* st, char* class_name): _out(st), _class_name(class_name) {}
VMOp_Type type() const { return VMOp_PrintClassHierarchy; }
VM_ClassPrintLayout(outputStream* st, char* class_name): _out(st), _class_name(class_name) {}
VMOp_Type type() const { return VMOp_ClassPrintLayout; }
void doit();
};

Expand Down
14 changes: 7 additions & 7 deletions src/hotspot/share/services/diagnosticCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void DCmd::register_dcmds() {
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SymboltableDCmd>(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<StringtableDCmd>(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<metaspace::MetaspaceDCmd>(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintClassLayoutDCmd>(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassPrintLayoutDCmd>(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<EventLogDCmd>(full_export));
#if INCLUDE_JVMTI // Both JVMTI and SERVICES have to be enabled to have this dcmd
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIAgentLoadDCmd>(full_export));
Expand Down Expand Up @@ -946,21 +946,21 @@ void ClassHierarchyDCmd::execute(DCmdSource source, TRAPS) {
VMThread::execute(&printClassHierarchyOp);
}

PrintClassLayoutDCmd::PrintClassLayoutDCmd(outputStream* output, bool heap) :
ClassPrintLayoutDCmd::ClassPrintLayoutDCmd(outputStream* output, bool heap) :
DCmdWithParser(output, heap),
Copy link
Copy Markdown
Member

@jsikstro jsikstro May 11, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pre-existing: The indentation here is inconsistent, but so is this file in general.

_classname("classname", "Name of class whose layout should be printed. ",
"STRING", true) {
_dcmdparser.add_dcmd_argument(&_classname);
}

void PrintClassLayoutDCmd::execute(DCmdSource source, TRAPS) {
VM_PrintClassLayout printClassLayoutOp(output(), _classname.value());
VMThread::execute(&printClassLayoutOp);
void ClassPrintLayoutDCmd::execute(DCmdSource source, TRAPS) {
VM_ClassPrintLayout classPrintLayoutOp(output(), _classname.value());
VMThread::execute(&classPrintLayoutOp);
}

int PrintClassLayoutDCmd::num_arguments() {
int ClassPrintLayoutDCmd::num_arguments() {
ResourceMark rm;
PrintClassLayoutDCmd* dcmd = new PrintClassLayoutDCmd(nullptr, false);
ClassPrintLayoutDCmd* dcmd = new ClassPrintLayoutDCmd(nullptr, false);
if (dcmd != nullptr) {
DCmdMark mark(dcmd);
return dcmd->_dcmdparser.num_arguments();
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/services/diagnosticCommand.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,11 @@ class ClassHierarchyDCmd : public DCmdWithParser {
virtual void execute(DCmdSource source, TRAPS);
};

class PrintClassLayoutDCmd : public DCmdWithParser {
class ClassPrintLayoutDCmd : public DCmdWithParser {
protected:
DCmdArgument<char*> _classname; // Class name whose layout should be printed.
public:
PrintClassLayoutDCmd(outputStream* output, bool heap);
ClassPrintLayoutDCmd(outputStream* output, bool heap);
static const char* name() {
return "VM.class_print_layout";
}
Expand Down