--- old/src/share/vm/ci/ciEnv.cpp	2014-03-24 17:11:59.000000000 -0700
+++ new/src/share/vm/ci/ciEnv.cpp	2014-03-24 17:11:59.000000000 -0700
@@ -1038,15 +1038,15 @@
                                frame_words, oop_map_set,
                                handler_table, inc_table,
                                compiler, comp_level);
-#if INCLUDE_RTM_OPT
-    nm->set_rtm_state(rtm_state);
-#endif
     // Free codeBlobs
     code_buffer->free_blob();
 
     if (nm != NULL) {
       nm->set_has_unsafe_access(has_unsafe_access);
       nm->set_has_wide_vectors(has_wide_vectors);
+#if INCLUDE_RTM_OPT
+      nm->set_rtm_state(rtm_state);
+#endif
 
       // Record successful registration.
       // (Put nm into the task handle *before* publishing to the Java heap.)