mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 23:04:50 +02:00
8260471: Change SystemDictionary::X_klass calls to vmClasses::X_klass
Reviewed-by: lfoltan, hseigel, dholmes, stuefe
This commit is contained in:
parent
9af333923b
commit
ffbcf1b0a7
191 changed files with 739 additions and 712 deletions
|
@ -25,7 +25,6 @@
|
|||
#ifndef SHARE_CLASSFILE_JAVACLASSES_HPP
|
||||
#define SHARE_CLASSFILE_JAVACLASSES_HPP
|
||||
|
||||
#include "classfile/systemDictionary.hpp"
|
||||
#include "classfile/vmClasses.hpp"
|
||||
#include "oops/oop.hpp"
|
||||
#include "oops/instanceKlass.hpp"
|
||||
|
@ -946,7 +945,7 @@ class java_lang_invoke_MethodHandle: AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::MethodHandle_klass());
|
||||
return klass->is_subclass_of(vmClasses::MethodHandle_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -973,7 +972,7 @@ class java_lang_invoke_DirectMethodHandle: AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_klass());
|
||||
return klass->is_subclass_of(vmClasses::DirectMethodHandle_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -1001,8 +1000,8 @@ class java_lang_invoke_LambdaForm: AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return SystemDictionary::LambdaForm_klass() != NULL &&
|
||||
klass->is_subclass_of(SystemDictionary::LambdaForm_klass());
|
||||
return vmClasses::LambdaForm_klass() != NULL &&
|
||||
klass->is_subclass_of(vmClasses::LambdaForm_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -1041,8 +1040,8 @@ class jdk_internal_invoke_NativeEntryPoint: AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return SystemDictionary::NativeEntryPoint_klass() != NULL &&
|
||||
klass->is_subclass_of(SystemDictionary::NativeEntryPoint_klass());
|
||||
return vmClasses::NativeEntryPoint_klass() != NULL &&
|
||||
klass->is_subclass_of(vmClasses::NativeEntryPoint_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -1135,7 +1134,7 @@ class java_lang_invoke_MemberName: AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::MemberName_klass());
|
||||
return klass->is_subclass_of(vmClasses::MemberName_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -1231,7 +1230,7 @@ public:
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::CallSite_klass());
|
||||
return klass->is_subclass_of(vmClasses::CallSite_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -1257,7 +1256,7 @@ public:
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::ConstantCallSite_klass());
|
||||
return klass->is_subclass_of(vmClasses::ConstantCallSite_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
};
|
||||
|
@ -1286,7 +1285,7 @@ public:
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::Context_klass());
|
||||
return klass->is_subclass_of(vmClasses::Context_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
};
|
||||
|
@ -1354,7 +1353,7 @@ class java_lang_ClassLoader : AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::ClassLoader_klass());
|
||||
return klass->is_subclass_of(vmClasses::ClassLoader_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
|
||||
|
@ -1598,7 +1597,7 @@ class vector_VectorPayload : AllStatic {
|
|||
|
||||
// Testers
|
||||
static bool is_subclass(Klass* klass) {
|
||||
return klass->is_subclass_of(SystemDictionary::vector_VectorPayload_klass());
|
||||
return klass->is_subclass_of(vmClasses::vector_VectorPayload_klass());
|
||||
}
|
||||
static bool is_instance(oop obj);
|
||||
};
|
||||
|
@ -1718,7 +1717,7 @@ class java_lang_InternalError : AllStatic {
|
|||
|
||||
class InjectedField {
|
||||
public:
|
||||
const VMClassID klass_id;
|
||||
const vmClassID klass_id;
|
||||
const vmSymbolID name_index;
|
||||
const vmSymbolID signature_index;
|
||||
const bool may_be_java;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue