Skip to content

Commit 7afbf29

Browse files
author
Matias Saavedra Silva
committed
8353303: Configuring with --disable-cds causes cdsConfig.hpp compilation errors
Reviewed-by: coleenp
1 parent b006b05 commit 7afbf29

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/hotspot/share/oops/objArrayKlass.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ void ObjArrayKlass::metaspace_pointers_do(MetaspaceClosure* it) {
306306
}
307307
}
308308

309+
#if INCLUDE_CDS
309310
void ObjArrayKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
310311
ArrayKlass::restore_unshareable_info(loader_data, protection_domain, CHECK);
311312
if (_next_refined_array_klass != nullptr) {
@@ -328,6 +329,7 @@ void ObjArrayKlass::remove_java_mirror() {
328329
_next_refined_array_klass->remove_java_mirror();
329330
}
330331
}
332+
#endif // INCLUDE_CDS
331333

332334
u2 ObjArrayKlass::compute_modifier_flags() const {
333335
// The modifier for an objectArray is the same as its element

src/hotspot/share/oops/objArrayKlass.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,12 @@ class ObjArrayKlass : public ArrayKlass {
101101
oop protection_domain() const { return bottom_klass()->protection_domain(); }
102102

103103
virtual void metaspace_pointers_do(MetaspaceClosure* iter);
104+
105+
#if INCLUDE_CDS
104106
virtual void remove_unshareable_info();
105107
virtual void remove_java_mirror();
106108
void restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS);
109+
#endif
107110

108111
public:
109112
static ObjArrayKlass* cast(Klass* k) {

0 commit comments

Comments
 (0)