Mercurial > hg > graal-jvmci-8
changeset 22615:e96c6a52aff2
made JVMCIRuntime::save_options a void function
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 25 Sep 2015 08:58:37 +0200 |
| parents | 0851eafff5c9 |
| children | 8a837db73b92 |
| files | src/share/vm/jvmci/jvmciRuntime.cpp src/share/vm/jvmci/jvmciRuntime.hpp src/share/vm/runtime/arguments.cpp |
| diffstat | 3 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciRuntime.cpp Thu Sep 24 20:51:57 2015 -0700 +++ b/src/share/vm/jvmci/jvmciRuntime.cpp Fri Sep 25 08:58:37 2015 +0200 @@ -944,7 +944,7 @@ _compiler = compiler; } -jint JVMCIRuntime::save_options(SystemProperty* props) { +void JVMCIRuntime::save_options(SystemProperty* props) { int count = 0; SystemProperty* first = NULL; for (SystemProperty* p = props; p != NULL; p = p->next()) { @@ -968,7 +968,6 @@ } assert (insert_pos - _options == count, "must be"); } - return JNI_OK; } Handle JVMCIRuntime::create_Service(const char* name, TRAPS) {
--- a/src/share/vm/jvmci/jvmciRuntime.hpp Thu Sep 24 20:51:57 2015 -0700 +++ b/src/share/vm/jvmci/jvmciRuntime.hpp Fri Sep 25 08:58:37 2015 +0200 @@ -92,9 +92,8 @@ * when JVMCI is initialized. * * @param props the head of the system property list - * @return JNI_ERR if a JVMCI option has a zero length value, JNI_OK otherwise */ - static jint save_options(SystemProperty* props); + static void save_options(SystemProperty* props); /** * Ensures that the JVMCI class loader is initialized and the well known JVMCI classes are loaded.
--- a/src/share/vm/runtime/arguments.cpp Thu Sep 24 20:51:57 2015 -0700 +++ b/src/share/vm/runtime/arguments.cpp Fri Sep 25 08:58:37 2015 +0200 @@ -3570,10 +3570,7 @@ scp_p->expand_endorsed(); #if INCLUDE_JVMCI - jint res = JVMCIRuntime::save_options(_system_properties); - if (res != JNI_OK) { - return res; - } + JVMCIRuntime::save_options(_system_properties); if (!UseJVMCIClassLoader) { // Append lib/jvmci/*.jar to boot class path