view patches/hotspot/aarch32/pr3601.patch @ 2986:2ba4051a8442

Bump shenandoah to aarch64-shenandoah-jdk8u282-b08. 2021-02-03 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump shenandoah to aarch64-shenandoah-jdk8u282-b08. * patches/hotspot/shenandoah/8062808-pr3548.patch, * patches/hotspot/shenandoah/8197981-pr3548.patch, * patches/hotspot/shenandoah/pr1869.patch, * patches/hotspot/shenandoah/pr3519-return_value-02.patch, * patches/hotspot/shenandoah/pr3601.patch: Remove patches included upstream. * Makefile.am: (ICEDTEA_PATCHES): Make PR1869, 8062808/PR3548, 8197981/PR3548 and PR3601 patches AArch32 only as they are now upstream in the new Shenandoah bundle. Remove Shenandoah-only PR3519 altogether. * NEWS: Updated. * hotspot.map.in: Bump shenandoah to aarch64-shenandoah-jdk8u282-b08. * patches/hotspot/aarch32/8062808-pr3548.patch: Replace symlink to Shenandoah version with a regenerated version that does not assume PR1748 is applied first. * patches/hotspot/aarch32/8143245-pr3548.patch, * patches/hotspot/aarch32/8197981-pr3548.patch: Replace symlinks to Shenandoah versions with copies, as the Shenandoah versions have been removed. * patches/hotspot/aarch32/pr1748.patch: Replace symlink to Shenandoah version with a regenerated version that applies after JDK-8062808, but without JDK-8036122 being applied as in the Shenandoah version. * patches/hotspot/aarch32/pr1869.patch, * patches/hotspot/aarch32/pr3601.patch, * patches/hotspot/aarch32/werror.patch: Replace symlinks to Shenandoah versions with copies, as the Shenandoah versions are either removed or modified to apply against 8u282-b08. * patches/hotspot/shenandoah/8143245-pr3548.patch: Regenerated against new context in cppInterpreter_zero.cpp due to JDK-8254166. * patches/hotspot/shenandoah/pr1748.patch: Regenerated against new context in linux/makefiles/gcc.make due to JDK-8062808 being upstreamed. * patches/hotspot/shenandoah/werror.patch: Regenerated against new context in solaris/makefiles/gcc.make due to JDK-8036122.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 04 Feb 2021 06:19:03 +0000
parents patches/hotspot/shenandoah/pr3601.patch@f5cd9c9a0586
children
line wrap: on
line source

# 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