Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/arguments.cpp @ 18104:eaf39a954227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u25-b17
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 16 Oct 2014 11:57:39 +0200
parents 52b4284cb496 ca6d25be853b
children 9ee881900cf5
comparison
equal deleted inserted replaced
18044:42de29c9ffbc 18104:eaf39a954227
2426 2426
2427 if (!FLAG_IS_DEFAULT(CICompilerCount) && !FLAG_IS_DEFAULT(CICompilerCountPerCPU) && CICompilerCountPerCPU) { 2427 if (!FLAG_IS_DEFAULT(CICompilerCount) && !FLAG_IS_DEFAULT(CICompilerCountPerCPU) && CICompilerCountPerCPU) {
2428 warning("The VM option CICompilerCountPerCPU overrides CICompilerCount."); 2428 warning("The VM option CICompilerCountPerCPU overrides CICompilerCount.");
2429 } 2429 }
2430 2430
2431 #ifdef COMPILER1
2432 status &= verify_interval(SafepointPollOffset, 0, os::vm_page_size() - BytesPerWord, "SafepointPollOffset");
2433 #endif
2434
2431 return status; 2435 return status;
2432 } 2436 }
2433 2437
2434 bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore, 2438 bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
2435 const char* option_type) { 2439 const char* option_type) {
3647 SharedArchivePath = get_shared_archive_path(); 3651 SharedArchivePath = get_shared_archive_path();
3648 if (SharedArchivePath == NULL) { 3652 if (SharedArchivePath == NULL) {
3649 return JNI_ENOMEM; 3653 return JNI_ENOMEM;
3650 } 3654 }
3651 3655
3656 // Set up VerifySharedSpaces
3657 if (FLAG_IS_DEFAULT(VerifySharedSpaces) && SharedArchiveFile != NULL) {
3658 VerifySharedSpaces = true;
3659 }
3660
3652 // Delay warning until here so that we've had a chance to process 3661 // Delay warning until here so that we've had a chance to process
3653 // the -XX:-PrintWarnings flag 3662 // the -XX:-PrintWarnings flag
3654 if (needs_hotspotrc_warning) { 3663 if (needs_hotspotrc_warning) {
3655 warning("%s file is present but has been ignored. " 3664 warning("%s file is present but has been ignored. "
3656 "Run with -XX:Flags=%s to load the file.", 3665 "Run with -XX:Flags=%s to load the file.",