# HG changeset patch
# User coleenp
# Date 1412281035 0
# Node ID 7dcde22f261f8d8fcd3d04515fd8a3beeef45b71
# Parent  7d68a5b1069d57c211b3dad3655de5408ada9d6d# Parent  43ce58b4717b44a3069744c3ab4741f080d519da
Merge

diff -r 7d68a5b1069d -r 7dcde22f261f src/share/vm/runtime/deoptimization.hpp
--- a/src/share/vm/runtime/deoptimization.hpp	Fri Sep 26 12:50:30 2014 -0400
+++ b/src/share/vm/runtime/deoptimization.hpp	Thu Oct 02 20:17:15 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