8260467: Move well-known classes from systemDictionary.hpp to vmClasses.hpp

Reviewed-by: dholmes, coleenp
This commit is contained in:
Ioi Lam 2021-01-28 04:24:04 +00:00
parent 62ffe75b1f
commit 396a496f3c
35 changed files with 751 additions and 572 deletions

View file

@ -36,6 +36,7 @@
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmClasses.hpp"
#include "classfile/vmSymbols.hpp"
#include "code/codeBlob.hpp"
#include "code/codeCache.hpp"
@ -459,14 +460,14 @@ typedef HashtableEntry<InstanceKlass*, mtClass> KlassHashtableEntry;
/* SystemDictionary */ \
/********************/ \
\
static_field(SystemDictionary, WK_KLASS(Object_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(String_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(Class_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(ClassLoader_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(System_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(Thread_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), InstanceKlass*) \
static_field(SystemDictionary, WK_KLASS(MethodHandle_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(Object_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(String_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(Class_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(ClassLoader_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(System_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(Thread_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(ThreadGroup_klass), InstanceKlass*) \
static_field(vmClasses, VM_CLASS_AT(MethodHandle_klass), InstanceKlass*) \
\
/*************/ \
/* vmSymbols */ \
@ -1325,6 +1326,7 @@ typedef HashtableEntry<InstanceKlass*, mtClass> KlassHashtableEntry;
declare_type(DictionaryEntry, KlassHashtableEntry) \
declare_toplevel_type(HashtableBucket<mtInternal>) \
declare_toplevel_type(SystemDictionary) \
declare_toplevel_type(vmClasses) \
declare_toplevel_type(vmSymbols) \
\
declare_toplevel_type(GrowableArrayBase) \