Mercurial > hg > truffle

diff src/cpu/x86/vm/globals_x86.hpp @ 14518:d8041d695d19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with jdk9/dev/hotspot changeset 3812c088b945
author twisti
date Tue, 11 Mar 2014 18:45:59 -0700
parents fbcdae53b17e 41b780b43b74
children b51e29501f30 4ca6dc0799b6
line wrap: on
line diff
--- a/src/cpu/x86/vm/globals_x86.hpp	Wed Mar 12 00:00:05 2014 +0100
+++ b/src/cpu/x86/vm/globals_x86.hpp	Tue Mar 11 18:45:59 2014 -0700
@@ -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