1.1 --- a/src/cpu/x86/vm/globals_x86.hpp Tue Nov 26 18:38:19 2013 -0800 1.2 +++ b/src/cpu/x86/vm/globals_x86.hpp Wed Nov 27 16:16:21 2013 -0800 1.3 @@ -37,7 +37,8 @@ 1.4 define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this 1.5 1.6 define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks 1.7 -define_pd_global(bool, UncommonNullCast, true); // Uncommon-trap NULLs past to check cast 1.8 +define_pd_global(bool, TrapBasedNullChecks, false); // Not needed on x86. 1.9 +define_pd_global(bool, UncommonNullCast, true); // Uncommon-trap NULLs passed to check cast 1.10 1.11 // See 4827828 for this change. There is no globals_core_i486.hpp. I can't 1.12 // assign a different value for C2 without touching a number of files. Use