src/share/vm/ci/ciEnv.cpp

*** 1036,1054 ****
                                 orig_pc_offset,
                                 debug_info(), dependencies(), code_buffer,
                                 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);
  
        // Record successful registration.
        // (Put nm into the task handle *before* publishing to the Java heap.)
        if (task() != NULL) {
          task()->set_code(nm);
--- 1036,1054 ----
                                 orig_pc_offset,
                                 debug_info(), dependencies(), code_buffer,
                                 frame_words, oop_map_set,
                                 handler_table, inc_table,
                                 compiler, comp_level);
      // 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.)
        if (task() != NULL) {
          task()->set_code(nm);