Blame pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch

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