29 lines
905 B
Diff
29 lines
905 B
Diff
|
# HG changeset patch
|
||
|
|
# User goetz
|
||
|
|
# Date 1415873641 -3600
|
||
|
|
# Thu Nov 13 11:14:01 2014 +0100
|
||
|
|
# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
|
||
|
|
# Parent 533473c67de6ff767710594639033c8e83523fe5
|
||
|
|
8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
|
||
|
|
Reviewed-by: stefank, tschatzl
|
||
|
|
|
||
|
|
diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
|
||
|
|
--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
|
||
|
|
+++ openjdk/hotspot/src/share/vm/prims/jni.cpp
|
||
|
|
@@ -708,6 +708,7 @@
|
||
|
|
|
||
|
|
THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
|
||
|
|
ShouldNotReachHere();
|
||
|
|
+ return 0; // Mute compiler.
|
||
|
|
JNI_END
|
||
|
|
|
||
|
|
#ifndef USDT2
|
||
|
|
@@ -734,6 +735,7 @@
|
||
|
|
Handle protection_domain (THREAD, k->protection_domain());
|
||
|
|
THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
|
||
|
|
ShouldNotReachHere();
|
||
|
|
+ return 0; // Mute compiler.
|
||
|
|
JNI_END
|
||
|
|
|
||
|
|
|