Mercurial > hg > graal-jvmci-8
changeset 23669:c4e6710aa7e0
ignore EnableJVMCI when checking JVMCI options
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 08 Jun 2016 01:06:48 +0200 |
parents | 098c16f6e0b5 |
children | a6a7657877fe |
files | jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java src/share/vm/runtime/arguments.cpp |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java Mon Jun 06 12:41:03 2016 -0700 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java Wed Jun 08 01:06:48 2016 +0200 @@ -81,7 +81,7 @@ return getClass().getSimpleName(); } - public HotSpotVMConfig(CompilerToVM compilerToVm) { + HotSpotVMConfig(CompilerToVM compilerToVm) { compilerToVm.initializeConfiguration(this); assert verifyInitialization();
--- a/src/share/vm/runtime/arguments.cpp Mon Jun 06 12:41:03 2016 -0700 +++ b/src/share/vm/runtime/arguments.cpp Wed Jun 08 01:06:48 2016 +0200 @@ -2441,7 +2441,7 @@ #define JVMCI_CHECK3(type, name, doc) JVMCI_CHECK_FLAG(name) #define JVMCI_CHECK4(type, name, value, doc) JVMCI_CHECK_FLAG(name) #define JVMCI_CHECK_FLAG(FLAG) \ - if (!FLAG_IS_DEFAULT(FLAG)) { \ + if (strcmp(#FLAG, "EnableJVMCI") && !FLAG_IS_DEFAULT(FLAG)) { \ jio_fprintf(defaultStream::error_stream(), "EnableJVMCI must be enabled to use VM option '%s'\n", #FLAG); \ status = false; \ }