1.1 --- a/src/share/vm/prims/jni.cpp Thu Nov 05 11:42:42 2015 +0100
1.2 +++ b/src/share/vm/prims/jni.cpp Tue May 07 20:38:26 2019 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
1.7 * Copyright (c) 2012 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 @@ -709,6 +709,7 @@
1.11
1.12 THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
1.13 ShouldNotReachHere();
1.14 + return 0; // Mute compiler.
1.15 JNI_END
1.16
1.17 #ifndef USDT2
1.18 @@ -735,6 +736,7 @@
1.19 Handle protection_domain (THREAD, k->protection_domain());
1.20 THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
1.21 ShouldNotReachHere();
1.22 + return 0; // Mute compiler.
1.23 JNI_END
1.24
1.25
1.26 @@ -1140,8 +1142,7 @@
1.27 inline void get_long() { _arguments->push_long(va_arg(_ap, jlong)); }
1.28 inline void get_float() { _arguments->push_float((jfloat)va_arg(_ap, jdouble)); } // float is coerced to double w/ va_arg
1.29 inline void get_double() { _arguments->push_double(va_arg(_ap, jdouble)); }
1.30 - inline void get_object() { jobject l = va_arg(_ap, jobject);
1.31 - _arguments->push_oop(Handle((oop *)l, false)); }
1.32 + inline void get_object() { _arguments->push_jobject(va_arg(_ap, jobject)); }
1.33
1.34 inline void set_ap(va_list rap) {
1.35 #ifdef va_copy
1.36 @@ -1235,7 +1236,7 @@
1.37 inline void get_long() { _arguments->push_long((_ap++)->j); }
1.38 inline void get_float() { _arguments->push_float((_ap++)->f); }
1.39 inline void get_double() { _arguments->push_double((_ap++)->d);}
1.40 - inline void get_object() { _arguments->push_oop(Handle((oop *)(_ap++)->l, false)); }
1.41 + inline void get_object() { _arguments->push_jobject((_ap++)->l); }
1.42
1.43 inline void set_ap(const jvalue *rap) { _ap = rap; }
1.44
