Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
14269:2a8891e0a082 | 14456:abec000618bf |
---|---|
199 // be converted to an implicit check based on profile information. | 199 // be converted to an implicit check based on profile information. |
200 // However currently the conversion to implicit null checks in | 200 // However currently the conversion to implicit null checks in |
201 // Block::implicit_null_check() only looks for loads and stores, not calls. | 201 // Block::implicit_null_check() only looks for loads and stores, not calls. |
202 ciMethod *caller = kit.method(); | 202 ciMethod *caller = kit.method(); |
203 ciMethodData *caller_md = (caller == NULL) ? NULL : caller->method_data(); | 203 ciMethodData *caller_md = (caller == NULL) ? NULL : caller->method_data(); |
204 if (!UseInlineCaches || !ImplicitNullChecks || | 204 if (!UseInlineCaches || !ImplicitNullChecks || !os::zero_page_read_protected() || |
205 ((ImplicitNullCheckThreshold > 0) && caller_md && | 205 ((ImplicitNullCheckThreshold > 0) && caller_md && |
206 (caller_md->trap_count(Deoptimization::Reason_null_check) | 206 (caller_md->trap_count(Deoptimization::Reason_null_check) |
207 >= (uint)ImplicitNullCheckThreshold))) { | 207 >= (uint)ImplicitNullCheckThreshold))) { |
208 // Make an explicit receiver null_check as part of this call. | 208 // Make an explicit receiver null_check as part of this call. |
209 // Since we share a map with the caller, his JVMS gets adjusted. | 209 // Since we share a map with the caller, his JVMS gets adjusted. |