Mercurial > hg > truffle
diff src/share/vm/opto/callGenerator.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | de6a9e811145 b0133e4187d3 |
children | 45467c53f178 |
line wrap: on
line diff
--- a/src/share/vm/opto/callGenerator.cpp Tue Jan 28 11:21:43 2014 -0800 +++ b/src/share/vm/opto/callGenerator.cpp Tue Jan 28 12:25:34 2014 -0800 @@ -201,7 +201,7 @@ // Block::implicit_null_check() only looks for loads and stores, not calls. ciMethod *caller = kit.method(); ciMethodData *caller_md = (caller == NULL) ? NULL : caller->method_data(); - if (!UseInlineCaches || !ImplicitNullChecks || + if (!UseInlineCaches || !ImplicitNullChecks || !os::zero_page_read_protected() || ((ImplicitNullCheckThreshold > 0) && caller_md && (caller_md->trap_count(Deoptimization::Reason_null_check) >= (uint)ImplicitNullCheckThreshold))) {