Blame SOURCES/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch

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