comparison src/share/vm/runtime/arguments.cpp @ 17795:a9becfeecd1b

Merge
author kvn
date Wed, 22 Jan 2014 17:42:23 -0800
parents add2caa66e7e 2da20f966936
children 45467c53f178 f040cf9fc9c0
comparison
equal deleted inserted replaced
17794:3514ee402842 17795:a9becfeecd1b
3728 } 3728 }
3729 if (UseTypeSpeculation && FLAG_IS_DEFAULT(ReplaceInParentMaps)) { 3729 if (UseTypeSpeculation && FLAG_IS_DEFAULT(ReplaceInParentMaps)) {
3730 // Doing the replace in parent maps helps speculation 3730 // Doing the replace in parent maps helps speculation
3731 FLAG_SET_DEFAULT(ReplaceInParentMaps, true); 3731 FLAG_SET_DEFAULT(ReplaceInParentMaps, true);
3732 } 3732 }
3733 #ifndef X86
3734 // Only on x86 for now
3735 FLAG_SET_DEFAULT(TypeProfileLevel, 0);
3736 #endif
3737 #endif 3733 #endif
3738 3734
3739 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) { 3735 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
3740 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output"); 3736 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
3741 DebugNonSafepoints = true; 3737 DebugNonSafepoints = true;