Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/arguments.cpp @ 23705:1051fbaca88b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
the client VM build is broken when INCLUDE_JVMCI is defined (JDK-8159888)
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Jun 2016 17:16:26 +0200
parents c4e6710aa7e0
children f6de9aff9991
comparison
equal deleted inserted replaced
23704:8a7b88cb7f22 23705:1051fbaca88b
2448 JVMCI_FLAGS(JVMCI_CHECK4, JVMCI_CHECK3, JVMCI_CHECK4, JVMCI_CHECK3, JVMCI_CHECK4) 2448 JVMCI_FLAGS(JVMCI_CHECK4, JVMCI_CHECK3, JVMCI_CHECK4, JVMCI_CHECK3, JVMCI_CHECK4)
2449 #undef JVMCI_CHECK3 2449 #undef JVMCI_CHECK3
2450 #undef JVMCI_CHECK4 2450 #undef JVMCI_CHECK4
2451 #undef JVMCI_CHECK_FLAG 2451 #undef JVMCI_CHECK_FLAG
2452 } else { 2452 } else {
2453 #ifndef TIERED
2454 // JVMCI is only usable as a jit compiler if the VM supports tiered compilation.
2455 #define JVMCI_CHECK_FLAG(FLAG) \
2456 if (!FLAG_IS_DEFAULT(FLAG)) { \
2457 jio_fprintf(defaultStream::error_stream(), "VM option '%s' cannot be set in non-tiered VM\n", #FLAG); \
2458 status = false; \
2459 }
2460 JVMCI_CHECK_FLAG(UseJVMCICompiler)
2461 JVMCI_CHECK_FLAG(BootstrapJVMCI)
2462 JVMCI_CHECK_FLAG(PrintBootstrap)
2463 JVMCI_CHECK_FLAG(JVMCIThreads)
2464 JVMCI_CHECK_FLAG(JVMCIHostThreads)
2465 JVMCI_CHECK_FLAG(JVMCICountersExcludeCompiler)
2466 #undef JVMCI_CHECK_FLAG
2467 #endif
2453 if (BootstrapJVMCI && !UseJVMCICompiler) { 2468 if (BootstrapJVMCI && !UseJVMCICompiler) {
2454 warning("BootstrapJVMCI has no effect if UseJVMCICompiler is disabled"); 2469 warning("BootstrapJVMCI has no effect if UseJVMCICompiler is disabled");
2455 } 2470 }
2456 if (!ScavengeRootsInCode) { 2471 if (!ScavengeRootsInCode) {
2457 warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled"); 2472 warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled");