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

8171809: Remove unused CDS code from JDK 9

Browse Source 
Reviewed-by: jiangli, ccheung, mseledtsov
This commit is contained in:
Ioi Lam 2016-12-15 19:26:41 -08:00
parent 8e29aab602
commit 37f332b8ee
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/classfile/classLoaderData.cpp
View File

@ -94,7 +94,7 @@ ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_anonymous, Depen
_metaspace(NULL), _unloading(false), _klasses(NULL), _metaspace(NULL), _unloading(false), _klasses(NULL),
_modules(NULL), _packages(NULL), _modules(NULL), _packages(NULL),
_claimed(0), _jmethod_ids(NULL), _handles(NULL), _deallocate_list(NULL), _claimed(0), _jmethod_ids(NULL), _handles(NULL), _deallocate_list(NULL),
_next(NULL), _dependencies(dependencies), _shared_class_loader_id(-1), _next(NULL), _dependencies(dependencies),
_metaspace_lock(new Mutex(Monitor::leaf+1, "Metaspace allocation lock", true, _metaspace_lock(new Mutex(Monitor::leaf+1, "Metaspace allocation lock", true,
Monitor::_safepoint_check_never)) { Monitor::_safepoint_check_never)) {
TRACE_INIT_ID(this); TRACE_INIT_ID(this);

12
hotspot/src/share/vm/classfile/classLoaderData.hpp
View File

@ -204,9 +204,6 @@ class ClassLoaderData : public CHeapObj<mtClass> {
// Support for walking class loader data objects // Support for walking class loader data objects
ClassLoaderData* _next; /// Next loader_datas created ClassLoaderData* _next; /// Next loader_datas created
// CDS
int _shared_class_loader_id;
// ReadOnly and ReadWrite metaspaces (static because only on the null // ReadOnly and ReadWrite metaspaces (static because only on the null
// class loader for now). // class loader for now).
static Metaspace* _ro_metaspace; static Metaspace* _ro_metaspace;
@ -338,15 +335,6 @@ class ClassLoaderData : public CHeapObj<mtClass> {
Metaspace* rw_metaspace(); Metaspace* rw_metaspace();
void initialize_shared_metaspaces(); void initialize_shared_metaspaces();
int shared_class_loader_id() const {
return _shared_class_loader_id;
}
void set_shared_class_loader_id(int id) {
assert(id >= 0, "sanity");
assert(_shared_class_loader_id <0, "cannot be assigned more than once");
_shared_class_loader_id = id;
}
TRACE_DEFINE_TRACE_ID_METHODS; TRACE_DEFINE_TRACE_ID_METHODS;
}; };

3
hotspot/src/share/vm/classfile/systemDictionaryShared.hpp
View File

@ -29,7 +29,6 @@
#include "classfile/dictionary.hpp" #include "classfile/dictionary.hpp"
class ClassFileStream; class ClassFileStream;
class SerializeClosure;
class SystemDictionaryShared: public SystemDictionary { class SystemDictionaryShared: public SystemDictionary {
public: public:
@ -79,8 +78,6 @@ public:
return NULL; return NULL;
} }
static void serialize(SerializeClosure* soc) {}
// The (non-application) CDS implementation supports only classes in the boot // The (non-application) CDS implementation supports only classes in the boot
// class loader, which ensures that the verification constraints are the same // class loader, which ensures that the verification constraints are the same
// during archive creation time and runtime. Thus we can do the constraint checks // during archive creation time and runtime. Thus we can do the constraint checks

4
hotspot/src/share/vm/memory/metaspaceShared.cpp
View File

@ -145,10 +145,6 @@ void MetaspaceShared::serialize(SerializeClosure* soc, GrowableArray<MemRegion>
StringTable::serialize(soc, string_space, space_size); StringTable::serialize(soc, string_space, space_size);
soc->do_tag(--tag); soc->do_tag(--tag);
// Dump/restore the misc information for system dictionary
SystemDictionaryShared::serialize(soc);
soc->do_tag(--tag);
soc->do_tag(666); soc->do_tag(666);
} }