diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch new file mode 100644 index 0000000..2eba669 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 7cca9e147d9f4b98ffbc6b10e817d2e8dbd686fb Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
3 | Date: Mon, 13 Aug 2018 16:40:34 +0100 | ||
4 | Subject: [PATCH] hotspot: fix -Wreturn-type issues introduced by 8061651 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | |# HG changeset patch | ||
10 | |# User andrew | ||
11 | |# Date 1529475043 -3600 | ||
12 | |# Wed Jun 20 07:10:43 2018 +0100 | ||
13 | |# Node ID f6341f4635dacb56678264d29a88cd052b74036b | ||
14 | |# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de | ||
15 | PR3601: Fix additional -Wreturn-type issues introduced by 8061651 | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
20 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
21 | |||
22 | --- | ||
23 | hotspot/src/share/vm/prims/jvm.cpp | 6 +++--- | ||
24 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp | ||
27 | index c32c98ad..6f2221c4 100644 | ||
28 | --- a/hotspot/src/share/vm/prims/jvm.cpp | ||
29 | +++ b/hotspot/src/share/vm/prims/jvm.cpp | ||
30 | @@ -929,7 +929,7 @@ JVM_END | ||
31 | JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)) | ||
32 | JVMWrapper("JVM_KnownToNotExist"); | ||
33 | #if INCLUDE_CDS | ||
34 | - return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false)); | ||
35 | + return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD); | ||
36 | #else | ||
37 | return false; | ||
38 | #endif | ||
39 | @@ -939,7 +939,7 @@ JVM_END | ||
40 | JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)) | ||
41 | JVMWrapper("JVM_GetResourceLookupCacheURLs"); | ||
42 | #if INCLUDE_CDS | ||
43 | - return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL); | ||
44 | + return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD); | ||
45 | #else | ||
46 | return NULL; | ||
47 | #endif | ||
48 | @@ -949,7 +949,7 @@ JVM_END | ||
49 | JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)) | ||
50 | JVMWrapper("JVM_GetResourceLookupCache"); | ||
51 | #if INCLUDE_CDS | ||
52 | - return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL); | ||
53 | + return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD); | ||
54 | #else | ||
55 | return NULL; | ||
56 | #endif | ||