diff src/cpu/x86/vm/globals_x86.hpp @ 14456:abec000618bf

Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents 41b780b43b74
children d8041d695d19 9e9af3aa4278 62c54fcc0a35
line wrap: on
line diff
--- a/src/cpu/x86/vm/globals_x86.hpp	Tue Jan 28 11:21:43 2014 -0800
+++ b/src/cpu/x86/vm/globals_x86.hpp	Tue Jan 28 12:25:34 2014 -0800
@@ -37,7 +37,8 @@
 define_pd_global(bool, NeedsDeoptSuspend,        false); // only register window machines need this
 
 define_pd_global(bool, ImplicitNullChecks,       true);  // Generate code for implicit null checks
-define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap NULLs past to check cast
+define_pd_global(bool, TrapBasedNullChecks,      false); // Not needed on x86.
+define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap NULLs passed to check cast
 
 // See 4827828 for this change. There is no globals_core_i486.hpp. I can't
 // assign a different value for C2 without touching a number of files. Use