mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 11:34:38 +02:00
6914300: ciEnv should export all well known classes
Reviewed-by: kvn, twisti
This commit is contained in:
parent
6c0af1575c
commit
98449cf2c2
64 changed files with 361 additions and 443 deletions
|
@ -133,7 +133,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread thread, void** data_ptr) {
|
|||
if (thread_oop == NULL) {
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
}
|
||||
if (!thread_oop->is_a(SystemDictionary::thread_klass())) {
|
||||
if (!thread_oop->is_a(SystemDictionary::Thread_klass())) {
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
}
|
||||
JavaThread* java_thread = java_lang_Thread::thread(thread_oop);
|
||||
|
@ -199,7 +199,7 @@ JvmtiEnv::RetransformClasses(jint class_count, const jclass* classes) {
|
|||
if (k_mirror == NULL) {
|
||||
return JVMTI_ERROR_INVALID_CLASS;
|
||||
}
|
||||
if (!k_mirror->is_a(SystemDictionary::class_klass())) {
|
||||
if (!k_mirror->is_a(SystemDictionary::Class_klass())) {
|
||||
return JVMTI_ERROR_INVALID_CLASS;
|
||||
}
|
||||
|
||||
|
@ -266,7 +266,7 @@ JvmtiEnv::GetObjectSize(jobject object, jlong* size_ptr) {
|
|||
oop mirror = JNIHandles::resolve_external_guard(object);
|
||||
NULL_CHECK(mirror, JVMTI_ERROR_INVALID_OBJECT);
|
||||
|
||||
if (mirror->klass() == SystemDictionary::class_klass()) {
|
||||
if (mirror->klass() == SystemDictionary::Class_klass()) {
|
||||
if (!java_lang_Class::is_primitive(mirror)) {
|
||||
mirror = java_lang_Class::as_klassOop(mirror);
|
||||
assert(mirror != NULL, "class for non-primitive mirror must exist");
|
||||
|
@ -327,7 +327,7 @@ JvmtiEnv::SetEventNotificationMode(jvmtiEventMode mode, jvmtiEvent event_type, j
|
|||
if (thread_oop == NULL) {
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
}
|
||||
if (!thread_oop->is_a(SystemDictionary::thread_klass())) {
|
||||
if (!thread_oop->is_a(SystemDictionary::Thread_klass())) {
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
}
|
||||
java_thread = java_lang_Thread::thread(thread_oop);
|
||||
|
@ -620,7 +620,7 @@ JvmtiEnv::GetThreadState(jthread thread, jint* thread_state_ptr) {
|
|||
thread_oop = JNIHandles::resolve_external_guard(thread);
|
||||
}
|
||||
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) {
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) {
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
}
|
||||
|
||||
|
@ -858,7 +858,7 @@ JvmtiEnv::StopThread(JavaThread* java_thread, jobject exception) {
|
|||
jvmtiError
|
||||
JvmtiEnv::InterruptThread(jthread thread) {
|
||||
oop thread_oop = JNIHandles::resolve_external_guard(thread);
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass()))
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass()))
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
|
||||
JavaThread* current_thread = JavaThread::current();
|
||||
|
@ -895,7 +895,7 @@ JvmtiEnv::GetThreadInfo(jthread thread, jvmtiThreadInfo* info_ptr) {
|
|||
} else {
|
||||
thread_oop = JNIHandles::resolve_external_guard(thread);
|
||||
}
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass()))
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass()))
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
|
||||
Handle thread_obj(current_thread, thread_oop);
|
||||
|
@ -1061,7 +1061,7 @@ JvmtiEnv::GetCurrentContendedMonitor(JavaThread* java_thread, jobject* monitor_p
|
|||
jvmtiError
|
||||
JvmtiEnv::RunAgentThread(jthread thread, jvmtiStartFunction proc, const void* arg, jint priority) {
|
||||
oop thread_oop = JNIHandles::resolve_external_guard(thread);
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::thread_klass())) {
|
||||
if (thread_oop == NULL || !thread_oop->is_a(SystemDictionary::Thread_klass())) {
|
||||
return JVMTI_ERROR_INVALID_THREAD;
|
||||
}
|
||||
if (priority < JVMTI_THREAD_MIN_PRIORITY || priority > JVMTI_THREAD_MAX_PRIORITY) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue