# HG changeset patch
# User kvn
# Date 1395708267 25200
# Node ID 18f752639eb215e7f5349a0165d6246d2ac25476
# Parent  52b37289e3bee5ea9042325596c9457a69ad59d1
8038286: nm->set_rtm_state() should be called after (nm != NULL) check
Summary: move set_rtm_state() call after (nm != NULL) check
Reviewed-by: iveresov, twisti

diff -r 52b37289e3be -r 18f752639eb2 src/share/vm/ci/ciEnv.cpp
--- a/src/share/vm/ci/ciEnv.cpp	Fri Mar 21 18:03:11 2014 -0700
+++ b/src/share/vm/ci/ciEnv.cpp	Mon Mar 24 17:44:27 2014 -0700
@@ -1009,15 +1009,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.)