comparison src/share/vm/runtime/arguments.cpp @ 14282:8254553994b9

Merge
author hseigel
date Sun, 19 Jan 2014 20:23:46 -0500
parents 234d576115b5 8cdf3f43f63e
children 2c95095271e9 b59507f713e0
comparison
equal deleted inserted replaced
14281:00c48a8ca160 14282:8254553994b9
3725 } 3725 }
3726 if (UseTypeSpeculation && FLAG_IS_DEFAULT(ReplaceInParentMaps)) { 3726 if (UseTypeSpeculation && FLAG_IS_DEFAULT(ReplaceInParentMaps)) {
3727 // Doing the replace in parent maps helps speculation 3727 // Doing the replace in parent maps helps speculation
3728 FLAG_SET_DEFAULT(ReplaceInParentMaps, true); 3728 FLAG_SET_DEFAULT(ReplaceInParentMaps, true);
3729 } 3729 }
3730 #ifndef X86
3731 // Only on x86 for now
3732 FLAG_SET_DEFAULT(TypeProfileLevel, 0);
3733 #endif
3734 #endif 3730 #endif
3735 3731
3736 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) { 3732 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
3737 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output"); 3733 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
3738 DebugNonSafepoints = true; 3734 DebugNonSafepoints = true;