infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8343218: Add option to disable allocating interface and abstract classes in non-class metaspace

Browse Source 
Reviewed-by: shade, kvn, yzheng, stuefe, dholmes
This commit is contained in:
Coleen Phillimore 2025-08-04 20:13:03 +00:00
parent 0d0d93e8f6
commit da3a5da81b
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/oops/instanceKlass.cpp
View File

@ -472,7 +472,7 @@ InstanceKlass* InstanceKlass::allocate_instance_klass(const ClassFileParser& par
assert(loader_data != nullptr, "invariant");
InstanceKlass* ik;
const bool use_class_space = parser.klass_needs_narrow_id();
const bool use_class_space = UseClassMetaspaceForAllClasses || parser.klass_needs_narrow_id();
// Allocation
if (parser.is_instance_ref_klass()) {

4
src/hotspot/share/oops/klass.inline.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -182,6 +182,6 @@ inline bool Klass::needs_narrow_id() const {
// never instantiated classes out of class space lessens the class space pressure.
// For more details, see JDK-8338526.
// Note: don't call this function before access flags are initialized.
return !is_abstract() && !is_interface();
return UseClassMetaspaceForAllClasses || (!is_abstract() && !is_interface());
}
#endif // SHARE_OOPS_KLASS_INLINE_HPP

4
src/hotspot/share/runtime/globals.hpp
View File

@ -1998,6 +1998,10 @@ const int ObjectAlignmentInBytes = 8;
develop(uint, BinarySearchThreshold, 16, \
"Minimal number of elements in a sorted collection to prefer" \
"binary search over simple linear search." ) \
\
product(bool, UseClassMetaspaceForAllClasses, false, DIAGNOSTIC, \
"Use the class metaspace for all classes including " \
"abstract and interface classes.") \
// end of RUNTIME_FLAGS

4
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -95,7 +95,7 @@ final class HotSpotMetaspaceConstantImpl implements HotSpotMetaspaceConstant, VM
}
private boolean canBeStoredInCompressibleMetaSpace() {
if (metaspaceObject instanceof HotSpotResolvedJavaType t && !t.isArray()) {
if (!HotSpotVMConfig.config().useClassMetaspaceForAllClasses && metaspaceObject instanceof HotSpotResolvedJavaType t && !t.isArray()) {
// As of JDK-8338526, interface and abstract types are not stored
// in compressible metaspace.
return !t.isInterface() && !t.isAbstract();

4
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -67,6 +67,8 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
final boolean useClassMetaspaceForAllClasses = getFlag("UseClassMetaspaceForAllClasses", Boolean.class);
final int objectAlignment = getFlag("ObjectAlignmentInBytes", Integer.class);
final int klassOffsetInBytes = getFieldValue("CompilerToVM::Data::oopDesc_klass_offset_in_bytes", Integer.class, "int");