Mercurial > hg > graal-jvmci-8

changeset 23676:a6a7657877fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 09 Jun 2016 18:57:51 -0700
parents d995c88d9cd9 (current diff) c4e6710aa7e0 (diff)
children eb166b568645
files
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	Tue Jun 07 17:23:00 2016 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java	Thu Jun 09 18:57:51 2016 -0700
@@ -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	Tue Jun 07 17:23:00 2016 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Thu Jun 09 18:57:51 2016 -0700
@@ -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; \
     }