Mercurial > hg > truffle
changeset 20510:dc8637067fc1
Merge
author | coleenp |
---|---|
date | Thu, 02 Oct 2014 20:12:53 +0000 |
parents | 1ff288f0dae4 (current diff) 43ce58b4717b (diff) |
children | ff0986dac06d |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.hpp Thu Sep 25 07:52:32 2014 -0400 +++ b/src/share/vm/runtime/deoptimization.hpp Thu Oct 02 20:12:53 2014 +0000 @@ -60,8 +60,8 @@ Reason_predicate, // compiler generated predicate failed Reason_loop_limit_check, // compiler generated loop limits check failed Reason_speculate_class_check, // saw unexpected object class from type speculation + Reason_rtm_state_change, // rtm state change detected Reason_unstable_if, // a branch predicted always false was taken - Reason_rtm_state_change, // rtm state change detected Reason_LIMIT, // Note: Keep this enum in sync. with _trap_reason_name. Reason_RECORDED_LIMIT = Reason_bimorphic // some are not recorded per bc