39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User andrew
|
||
|
|
# Date 1529475043 -3600
|
||
|
|
# Wed Jun 20 07:10:43 2018 +0100
|
||
|
|
# Node ID f6341f4635dacb56678264d29a88cd052b74036b
|
||
|
|
# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
|
||
|
|
PR3601: Fix additional -Wreturn-type issues introduced by 8061651
|
||
|
|
|
||
|
|
diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
|
||
|
|
--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
|
||
|
|
+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
|
||
|
|
@@ -835,7 +835,7 @@
|
||
|
|
JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
|
||
|
|
JVMWrapper("JVM_KnownToNotExist");
|
||
|
|
#if INCLUDE_CDS
|
||
|
|
- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
|
||
|
|
+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
|
||
|
|
#else
|
||
|
|
return false;
|
||
|
|
#endif
|
||
|
|
@@ -845,7 +845,7 @@
|
||
|
|
JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
|
||
|
|
JVMWrapper("JVM_GetResourceLookupCacheURLs");
|
||
|
|
#if INCLUDE_CDS
|
||
|
|
- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
|
||
|
|
+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
|
||
|
|
#else
|
||
|
|
return NULL;
|
||
|
|
#endif
|
||
|
|
@@ -855,7 +855,7 @@
|
||
|
|
JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
|
||
|
|
JVMWrapper("JVM_GetResourceLookupCache");
|
||
|
|
#if INCLUDE_CDS
|
||
|
|
- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
|
||
|
|
+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
|
||
|
|
#else
|
||
|
|
return NULL;
|
||
|
|
#endif
|