Mercurial > hg > graal-compiler
diff src/share/vm/runtime/arguments.cpp @ 17810:62c54fcc0a35
Merge
author | kvn |
---|---|
date | Tue, 25 Mar 2014 17:07:36 -0700 |
parents | 752ba2e5f6d0 606acabe7b5c |
children | f42c10a3d4b1 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Tue Mar 25 12:54:21 2014 -0700 +++ b/src/share/vm/runtime/arguments.cpp Tue Mar 25 17:07:36 2014 -0700 @@ -2220,6 +2220,8 @@ "G1ConcRSHotCardLimit"); status = status && verify_interval(G1ConcRSLogCacheSize, 0, 31, "G1ConcRSLogCacheSize"); + status = status && verify_interval(StringDeduplicationAgeThreshold, 1, markOopDesc::max_age, + "StringDeduplicationAgeThreshold"); } if (UseConcMarkSweepGC) { status = status && verify_min_value(CMSOldPLABNumRefills, 1, "CMSOldPLABNumRefills"); @@ -3749,9 +3751,6 @@ #endif // CC_INTERP #ifdef COMPILER2 - if (!UseBiasedLocking || EmitSync != 0) { - UseOptoBiasInlining = false; - } if (!EliminateLocks) { EliminateNestedLocks = false; } @@ -3812,6 +3811,11 @@ UseBiasedLocking = false; } } +#ifdef COMPILER2 + if (!UseBiasedLocking || EmitSync != 0) { + UseOptoBiasInlining = false; + } +#endif // set PauseAtExit if the gamma launcher was used and a debugger is attached // but only if not already set on the commandline